Add WidgetWithSettings to EMG and EMGJoystick widgets

Author: retiutut

OpenBCI_GUI/W_EMG.pde

@@ -13,26 +13,17 @@
 //  TODO: Add dynamic threshold functionality
 ////////////////////////////////////////////////////////////////////////////////
 
-class W_Emg extends Widget {
+class W_Emg extends WidgetWithSettings {
     private ControlP5 emgCp5;
     private Button emgSettingsButton;
     private final int EMG_SETTINGS_BUTTON_WIDTH = 125;
     private List<controlP5.Controller> cp5ElementsToCheck;
-
     public ExGChannelSelect emgChannelSelect;
 
     W_Emg () {
         super();
         widgetTitle = "EMG";
 
-        cp5ElementsToCheck = new ArrayList<controlP5.Controller>();
-
-        //Add channel select dropdown to this widget
-        emgChannelSelect = new ExGChannelSelect(ourApplet, x, y, w, navH);
-        emgChannelSelect.activateAllButtons();
-        
-        cp5ElementsToCheck.addAll(emgChannelSelect.getCp5ElementsForOverlapCheck());
-
         emgCp5 = new ControlP5(ourApplet);
         emgCp5.setGraphics(ourApplet, 0,0);
         emgCp5.setAutoDraw(false);
@@ -41,6 +32,29 @@ class W_Emg extends Widget {
         cp5ElementsToCheck.add((controlP5.Controller) emgSettingsButton);
     }
 
+    @Override
+    protected void initWidgetSettings() {
+        super.initWidgetSettings();
+        emgChannelSelect = new ExGChannelSelect(ourApplet, x, y, w, navH);
+        emgChannelSelect.activateAllButtons();
+        cp5ElementsToCheck = new ArrayList<controlP5.Controller>();
+        cp5ElementsToCheck.addAll(emgChannelSelect.getCp5ElementsForOverlapCheck());
+        saveActiveChannels(emgChannelSelect.getActiveChannels());
+        widgetSettings.saveDefaults();
+    }
+
+    @Override
+    protected void applySettings() {
+        applyActiveChannels(emgChannelSelect);
+    }
+
+    @Override
+    protected void updateChannelSettings() {
+        if (emgChannelSelect != null) {
+            saveActiveChannels(emgChannelSelect.getActiveChannels());
+        }
+    }
+
     public void update() {
         super.update();
         lockElementsOnOverlapCheck(cp5ElementsToCheck);

OpenBCI_GUI/W_EMGJoystick.pde

@@ -9,7 +9,7 @@
 //                                                                                                     //
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-class W_EmgJoystick extends Widget {
+class W_EmgJoystick extends WidgetWithSettings {
     private ControlP5 emgCp5;
     private Button emgSettingsButton;
     private List<controlP5.Controller> cp5ElementsToCheck;
@@ -46,8 +46,6 @@ class W_EmgJoystick extends Widget {
 
     private String[] plotChannelLabels = new String[NUM_EMG_INPUTS];
 
-    public EmgJoystickSmoothing joystickSmoothing = EmgJoystickSmoothing.POINT_9;
-
     private int DROPDOWN_HEIGHT = navH - 4;
     private int DROPDOWN_WIDTH = 80;
     private int DROPDOWN_SPACER = 10;
@@ -96,11 +94,20 @@ class W_EmgJoystick extends Widget {
             plotChannelLabels[i] = Integer.toString(emgJoystickInputs.getInput(i).getIndex() + 1);
         }
 
-        List<String> joystickSmoothingList = EnumHelper.getEnumStrings(EmgJoystickSmoothing.class);
+        createInputDropdowns();
+    }
 
-        addDropdown("emgJoystickSmoothingDropdown", "Smoothing", joystickSmoothingList, joystickSmoothing.getIndex());
+    @Override
+    protected void initWidgetSettings() {
+        super.initWidgetSettings();
+        widgetSettings.set(EmgJoystickSmoothing.class, EmgJoystickSmoothing.POINT_9);
+        initDropdown(EmgJoystickSmoothing.class, "emgJoystickSmoothingDropdown", "Smoothing");
+        widgetSettings.saveDefaults();
+    }
 
-        createInputDropdowns();
+    @Override
+    protected void applySettings() {
+        updateDropdownLabel(EmgJoystickSmoothing.class, "emgJoystickSmoothingDropdown");
     }
 
     public void update(){
@@ -234,7 +241,7 @@ class W_EmgJoystick extends Widget {
         joystickRawX = unitCircleXY[0];
         joystickRawY = unitCircleXY[1];
         //Lerp the joystick values to smooth them out
-        float amount = 1.0f - joystickSmoothing.getValue();
+        float amount = 1.0f - widgetSettings.get(EmgJoystickSmoothing.class).getValue();
         joystickRawX = lerp(previousJoystickRawX, joystickRawX, amount);
         joystickRawY = lerp(previousJoystickRawY, joystickRawY, amount);
     }
@@ -316,7 +323,7 @@ class W_EmgJoystick extends Widget {
     }
 
     public void setJoystickSmoothing(int n) {
-        joystickSmoothing = joystickSmoothing.values()[n];
+        widgetSettings.setByIndex(EmgJoystickSmoothing.class, n);
     }
 
     private void createEmgSettingsButton() {