Fix FFT and BandPower widget dropdowns linked settings on frontend

Author: retiutut

OpenBCI_GUI/FFTEnums.pde

@@ -77,7 +77,7 @@ public enum FFTSmoothingFactor implements IndexingInterface {
 // Used by FFT Widget and Band Power Widget
 public enum FFTFilteredEnum implements IndexingInterface {
     FILTERED (0, "Filtered"),
-    UNFILTERED (1, "Unfiltered");
+    UNFILTERED (1, "Unfilt.");
 
     private final int index;
     private final String label;

OpenBCI_GUI/W_BandPower.pde

@@ -255,6 +255,16 @@ class W_BandPower extends Widget {
             normalizedBandPowers[i] = activePower[i] / normalizingSum;
         }
     }
+
+    public void setSmoothingDropdownFrontend(FFTSmoothingFactor _smoothingFactor) {
+        String s = _smoothingFactor.getString();
+        cp5_widget.getController("bandPowerSmoothingDropdown").getCaptionLabel().setText(s);
+    }
+
+    public void setFilteringDropdownFrontend(FFTFilteredEnum _filteredEnum) {
+        String s = _filteredEnum.getString();
+        cp5_widget.getController("bandPowerDataFilteringDropdown").getCaptionLabel().setText(s);
+    }
 };
 
 public void bandPowerAutoCleanDropdown(int n) {
@@ -271,10 +281,12 @@ public void bandPowerAutoCleanTimerDropdown(int n) {
 
 public void bandPowerSmoothingDropdown(int n) {
     globalFFTSettings.setSmoothingFactor(FFTSmoothingFactor.values()[n]);
-    //FIX ME TO UPDATE THE FFT WIDGET DROPDOWN ALSO
+    FFTSmoothingFactor smoothingFactor = globalFFTSettings.getSmoothingFactor();
+    w_fft.setSmoothingDropdownFrontend(smoothingFactor);
 }
 
 public void bandPowerDataFilteringDropdown(int n) {
     globalFFTSettings.setFilteredEnum(FFTFilteredEnum.values()[n]);
-    //FIX ME TO UPDATE THE FFT WIDGET DROPDOWN ALSO
+    FFTFilteredEnum filteredEnum = globalFFTSettings.getFilteredEnum();
+    w_fft.setFilteringDropdownFrontend(filteredEnum);
 }

OpenBCI_GUI/W_FFT.pde

@@ -198,6 +198,16 @@ class W_fft extends Widget {
             fftPlot.setLogScale("");
         }
     }
+
+    public void setSmoothingDropdownFrontend(FFTSmoothingFactor _smoothingFactor) {
+        String s = _smoothingFactor.getString();
+        cp5_widget.getController("fftSmoothingDropdown").getCaptionLabel().setText(s);
+    }
+
+    public void setFilteringDropdownFrontend(FFTFilteredEnum _filteredEnum) {
+        String s = _filteredEnum.getString();
+        cp5_widget.getController("fftFilteringDropdown").getCaptionLabel().setText(s);
+    }
 };
 
 //These functions need to be global! These functions are activated when an item from the corresponding dropdown is selected
@@ -215,10 +225,12 @@ public void fftLogLinDropdown(int n) {
 
 public void fftSmoothingDropdown(int n) {
     globalFFTSettings.setSmoothingFactor(FFTSmoothingFactor.values()[n]);
-    //FIX ME TO UPDATE THE BAND POWER WIDGET DROPDOWN ALSO
+    FFTSmoothingFactor smoothingFactor = globalFFTSettings.getSmoothingFactor();
+    w_bandPower.setSmoothingDropdownFrontend(smoothingFactor);
 }
 
 public void fftFilteringDropdown(int n) {
     globalFFTSettings.setFilteredEnum(FFTFilteredEnum.values()[n]);
-    //FIX ME TO UPDATE THE BAND POWER WIDGET DROPDOWN ALSO
+    FFTFilteredEnum filteredEnum = globalFFTSettings.getFilteredEnum();
+    w_bandPower.setFilteringDropdownFrontend(filteredEnum);
 }