The simple PSD spectrum comparison of one log file data

src/graph_imported_curves.js

@@ -6,63 +6,86 @@ export function ImportedCurves(curvesChanged) {
   this.maxX = -Number.MAX_VALUE;
   this.minY = Number.MAX_VALUE;
   this.maxY = -Number.MAX_VALUE;
-  
+
   this.curvesCount = function() {
     return this._curvesData.length;
   };
 
   this.importCurvesFromCSV = function(files) {
-      let importsLeft = maxImportCount - this._curvesData.length;
-
-      for (const file of files) {
-        if (importsLeft-- == 0) {
-          break;
-        }
-        const reader = new FileReader();
-        reader.onload = function (e) {
-          try {
-            const stringRows = e.target.result.split("\n");
+    let importsLeft = maxImportCount - this._curvesData.length;
 
-            const header = stringRows[0].split(",");
-            if (header.length != 2 || header[0] != "x" || header[1] != "y") {
-              throw new SyntaxError("Wrong curves CSV data format");
-            }
+    for (const file of files) {
+      if (importsLeft-- == 0) {
+        break;
+      }
+      const reader = new FileReader();
+      reader.onload = function (e) {
+        try {
+          const stringRows = e.target.result.split("\n");
 
-            stringRows.shift();
-            //remove bad last row
-            if (stringRows.at(-1) == "") {
-              stringRows.pop();
-            }
+          const header = stringRows[0].split(",");
+          if (header.length != 2 || header[0] != "x" || header[1] != "y") {
+            throw new SyntaxError("Wrong curves CSV data format");
+          }
 
-            const curvesData = stringRows.map( function(row) {
-              const data = row.split(","),
-                    x = parseFloat(data[0]),
-                    y = parseFloat(data[1]);
-              _that.minX = Math.min(x, _that.minX);
-              _that.maxX = Math.max(x, _that.maxX);
-              _that.minY = Math.min(y, _that.minY);
-              _that.maxY = Math.max(y, _that.maxY);
-              return {
-                x: x,
-                y: y,
-              };
-            });
+          stringRows.shift();
+          //remove bad last row
+          if (stringRows.at(-1) == "") {
+            stringRows.pop();
+          }
 
-            const curve = {
-              name: file.name.split('.')[0],
-              points: curvesData,
+          const curvesData = stringRows.map( function(row) {
+            const data = row.split(","),
+                  x = parseFloat(data[0]),
+                  y = parseFloat(data[1]);
+            _that.minX = Math.min(x, _that.minX);
+            _that.maxX = Math.max(x, _that.maxX);
+            _that.minY = Math.min(y, _that.minY);
+            _that.maxY = Math.max(y, _that.maxY);
+            return {
+              x: x,
+              y: y,
             };
-            _that._curvesData.push(curve);
-            curvesChanged();
-          } catch (e) {
-            alert('Curves data import error: ' + e.message);
-            return;
-          }
-        };
+          });
 
-        reader.readAsText(file);
+          const curve = {
+            name: file.name.split('.')[0],
+            points: curvesData,
+          };
+          _that._curvesData.push(curve);
+          curvesChanged();
+        } catch (e) {
+          alert('Curves data import error: ' + e.message);
+          return;
+        }
+      };
+
+      reader.readAsText(file);
+    }
+  };
+
+  this.addCurve = function(points, name) {
+    this._curvesData.push({
+      name: name,
+      points: points,
+    });
+    for (const point of points) {
+      this.minX = Math.min(point.x, _that.minX);
+      this.maxX = Math.max(point.x, _that.maxX);
+      this.minY = Math.min(point.y, _that.minY);
+      this.maxY = Math.max(point.y, _that.maxY);
+    }
+    curvesChanged();
+  };
+
+  this.isNewCurve = function(name) {
+    for (const curve of this._curvesData) {
+      if (curve.name == name) {
+        return false;
       }
-    };
+    }
+    return true;
+  };
 
   this.removeCurves = function() {
     this._curvesData.length = 0;

src/graph_spectrum.js

@@ -438,6 +438,10 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
       return fileName;
     };
 
+    this.addCurrentSpectrumIntoImport = function() {
+      GraphSpectrumPlot.addCurrentSpectrumIntoImport();
+    };
+
   } catch (e) {
     console.error(`Failed to create analyser... error: ${e}`);
   }

src/graph_spectrum_plot.js

@@ -431,7 +431,7 @@ GraphSpectrumPlot._drawPowerSpectralDensityGraph = function (canvasCtx) {
 };
 
 GraphSpectrumPlot._drawLegend = function (canvasCtx, WIDTH, HEIGHT, importedCurves) {
-  if (!userSettings?.analyser_legend) {
+  if (!userSettings?.analyser_legend?.left || !userSettings?.analyser_legend?.top || !userSettings?.analyser_legend?.width) {
     return;
   }
   const spectrumCount =  importedCurves.length,
@@ -452,7 +452,7 @@ GraphSpectrumPlot._drawLegend = function (canvasCtx, WIDTH, HEIGHT, importedCurv
   canvasCtx.textAlign = "left";
   for (let row = 0; row < spectrumCount; row++) {
     const curvesName = importedCurves[row].name;
-    const Y = legendPosY + padding + rowHeight * (row + 1);
+    const Y = legendPosY + padding + rowHeight * row + rowHeight/2; // Center text vertically
     canvasCtx.strokeStyle = this.curvesColors[row];
     canvasCtx.strokeText(curvesName, legendPosX + padding, Y);
   }
@@ -1799,3 +1799,21 @@ GraphSpectrumPlot.removeImportedCurves = function() {
       break;
   }
 };
+
+GraphSpectrumPlot.addCurrentSpectrumIntoImport = function() {
+  if (this._spectrumType === SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY &&
+      this._importedPSD.isNewCurve(this._fftData.fieldName)) {
+    const fftLength = this._fftData.fftLength;
+    const frequencyStep = 0.5 * this._fftData.blackBoxRate / fftLength;
+    const points = [];
+    for (let index = 0; index < fftLength; index++) {
+      const frequency = frequencyStep * index;
+      points.push({
+        x: frequency,
+        y: this._fftData.fftOutput[index],
+      });
+    }
+    this._importedPSD.addCurve(points, this._fftData.fieldName);
+  }
+};
+

src/main.js

@@ -2454,6 +2454,12 @@ function BlackboxLogViewer() {
             logJumpEnd();
             e.preventDefault();
             break;
+          case 45:  // Insert key - add current spectrum PSD curve into import list
+            if (hasAnalyser) {
+              graph.getAnalyser().addCurrentSpectrumIntoImport();
+            }
+            e.preventDefault();
+            break;
         }
       }
     });