Revert "Reassigning local variables to prevent fft duplicate configuration" Subtracting mean from the signal

Author: krzywonos

src-tauri/src/main.rs

@@ -272,8 +272,11 @@ fn rpc_controls(args: &[String], column_names: Vec<String>) -> Vec<(String, bool
 
 fn calc_fft(signals: Option<&Vec<f32>>, fs: f32 ) -> (Vec<f32>, Vec<f32>) {
     if let Some(signal) = signals{
+        let mean = signal.iter().sum::<f32>() / signal.len() as f32;
+        let mean_adjusted_signal: Vec<f32> = signal.iter().map(|x| x - mean).collect();
+
         let welch: SpectralDensity<f32> =
-            SpectralDensity::<f32>::builder(signal, fs).build();
+            SpectralDensity::<f32>::builder(&mean_adjusted_signal, fs).build();
 
         let result = std::panic::catch_unwind(|| {welch.periodogram();});
         if result.is_err(){
@@ -473,15 +476,16 @@ fn fft_data(window: Window) {
                             if let Some(columns) = sorted_columns.get(name){
                                 if spectrum_data.len() == columns.len() + 1{
                                     let averaged_spec_data: Vec<Vec<f32>> = spectrum_data
-                                        .iter()
-                                        .map(|col| {
-                                            let chunk_size = (col.len() as f32/ (fs as f32/20.0)).ceil() as usize;
-                                            col.chunks(chunk_size)
-                                                .map(|chunk| chunk.iter().sum::<f32>() /chunk.len() as f32)
-                                                .collect()
-                                        })
-                                        .collect();
-                                    let _ = window.emit(&name.clone(), averaged_spec_data);
+                                    .iter()
+                                    .map(|col| {
+                                        let chunk_size = (col.len() as f32/ (fs as f32/20.0)).ceil() as usize;
+                                        col.chunks(chunk_size)
+                                            .map(|chunk| chunk.iter().sum::<f32>() /chunk.len() as f32)
+                                            .collect()
+                                    })
+                                    .collect();
+                                    
+                                    let _ = window.emit(&name.clone(), spectrum_data);
                                 }
                             }
                         }

src/main.js

@@ -315,8 +315,6 @@ window.onload = () => {
     }); 
 };
 
-var seriesConfig  = [{label: "Frequency (Hz)"}];
-let gotSeries = false;
 function createFFT(eventName, containerId, labels) {
     const template = document.getElementById('fft-template');
     const clone = template.content.cloneNode(true);
@@ -349,9 +347,9 @@ function createFFT(eventName, containerId, labels) {
                 }
             }, 100);
         }).then(() => {
-            for (let i = 0; i < spectrum.length; i++) {
+            /*for (let i = 0; i < spectrum.length; i++) {
                 fftPlot.data[i] = [];
-            }
+            }*/
 
             for (let i = 0; i< spectrum[0].length; i++){
                 for (let j = 0; j< spectrum.length; j++){
@@ -360,6 +358,12 @@ function createFFT(eventName, containerId, labels) {
                     }
                 }
             }
+
+            while (fftPlot.data[0].length > 500){
+                for (let i = 0; i < fftPlot.data.length; i++){
+                    fftPlot.data[i].shift();
+                }
+            }
             fftPlot.setData(fftPlot.data, true);
         })