Added points per segment count change from html input

Author: demvlad

src/graph_spectrum.js

@@ -17,7 +17,8 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
   const that = this,
     prefs = new PrefStorage(),
     DEFAULT_PSD_HEATMAP_MIN = -40,
-    DEFAULT_PSD_HEATMAP_MAX = 10;
+    DEFAULT_PSD_HEATMAP_MAX = 10,
+    DEFAULT_PSD_SEGMENT_LENGTH = 512;
   let analyserZoomX = 1.0 /* 100% */,
     analyserZoomY = 1.0 /* 100% */,
     dataReload = false,
@@ -122,7 +123,7 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
         left: `${newSize.width - 150}px`,
       });
       $("#analyserSegmentLengthPSDLabel", parentElem).css({
-        left: `${newSize.width - 150}px`,
+        left: `${newSize.width - 170}px`,
       });
     };
 
@@ -297,30 +298,41 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
       })
       .val(analyserMinPSD.val());
 
-    let previousSegLenValue = 512;
+    let segmentLenghtPSD = DEFAULT_PSD_SEGMENT_LENGTH;
+    GraphSpectrumCalc.setPointsPerSegmentPSD(segmentLenghtPSD);
     analyserSegmentLengthPSD
       .on(
         "input",
         function () {
           const currentValue = parseInt($(this).val());
-          if (currentValue > previousSegLenValue) {
-            previousSegLenValue *= 2;
-          } else {
-            previousSegLenValue /= 2;
+          if (currentValue > segmentLenghtPSD) {
+            segmentLenghtPSD *= 2;
+          } else if (currentValue < segmentLenghtPSD){
+            segmentLenghtPSD /= 2;
           }
-          $(this).val(previousSegLenValue);
+          $(this).val(segmentLenghtPSD);
           // Recalculate PSD with updated samples per segment count
+          GraphSpectrumCalc.setPointsPerSegmentPSD(segmentLenghtPSD);
           dataLoad();
           GraphSpectrumPlot.setData(fftData, userSettings.spectrumType);
           that.refresh();
         },
       )
       .dblclick(function (e) {
         if (e.ctrlKey) {
-          $(this).val(userSettings.psdHeatmapMax).trigger("input");
+          segmentLenghtPSD = DEFAULT_PSD_SEGMENT_LENGTH;
+          $(this).val(DEFAULT_PSD_SEGMENT_LENGTH).trigger("input");
         }
       })
-      .val(512);
+      .val(DEFAULT_PSD_SEGMENT_LENGTH);
+
+    analyserSegmentLengthPSD
+      .on(
+        "keydown",
+        function (e) {
+          e.preventDefault();
+        }
+      );
 
     // Spectrum type to show
     userSettings.spectrumType =

src/graph_spectrum_calc.js

@@ -35,6 +35,7 @@ export const GraphSpectrumCalc = {
   _flightLog : null,
   _sysConfig : null,
   _motorPoles : null,
+  _pointsPerSegmentPSD : 0,
 };
 
 GraphSpectrumCalc.initialize = function(flightLog, sysConfig) {
@@ -112,16 +113,18 @@ GraphSpectrumCalc.dataLoadFrequency = function() {
   return fftData;
 };
 
+GraphSpectrumCalc.setPointsPerSegmentPSD = function(pointsCount) {
+  this._pointsPerSegmentPSD = pointsCount;
+};
+
 GraphSpectrumCalc.dataLoadPSD = function(analyserZoomY) {
   const flightSamples = this._getFlightSamplesFreq(false);
-  const multiplier = Math.floor(1 / analyserZoomY); // 0. ... 10
-  let pointsPerSegment = 2 ** (8 + multiplier); //256, 512, 1024 ...
-
-  let overlapCount;
-  if (pointsPerSegment > flightSamples.samples.length) {
-      pointsPerSegment = flightSamples.samples.length;  // Use actual sample length. It will transform to power at 2 value inside the _psd() - fft_segmented
-      overlapCount = 0;
+  let pointsPerSegment, overlapCount;
+  if (this._pointsPerSegmentPSD > flightSamples.samples.length) {
+    pointsPerSegment = flightSamples.samples.length; // Use actual sample length. It will transform to power at 2 value inside the _psd() - fft_segmented
+    overlapCount = 0;
   } else {
+    pointsPerSegment = this._pointsPerSegmentPSD;
     overlapCount = pointsPerSegment / 2;
   }