Add ability to save/load emg joystick inputs

Author: retiutut

OpenBCI_GUI/SessionSettings.pde

@@ -68,8 +68,8 @@ class SessionSettings {
     int fftSmoothingSave;
     int fftFilterSave;
     //Analog Read settings
-    int arVertScaleSave; //updates in VertScale_AR()
-    int arHorizScaleSave; //updates in Duration_AR()
+    int arVertScaleSave;
+    int arHorizScaleSave;
     //Headplot settings
     int hpIntensitySave;
     int hpPolaritySave;
@@ -194,6 +194,7 @@ class SessionSettings {
 
     //EMG Joystick Widget
     int loadEmgJoystickSmoothing;
+    List<Integer> loadEmgJoystickInputs = new ArrayList<Integer>();
 
     //Primary JSON objects for saving and loading data
     private JSONObject saveSettingsJSONData;
@@ -477,6 +478,12 @@ class SessionSettings {
         ///////////////////////////////////////////////Setup new JSON object to save EMG Joystick Settings
         JSONObject saveEmgJoystickSettings = new JSONObject();
         saveEmgJoystickSettings.setInt("smoothing", w_emgJoystick.joystickSmoothing.getIndex());
+        JSONArray saveEmgJoystickInputs = new JSONArray();
+        int numEmgJoystickInputs = w_emgJoystick.emgJoystickInputs.length;
+        for (int i = 0; i < numEmgJoystickInputs; i++) {
+            saveEmgJoystickInputs.setInt(i, w_emgJoystick.emgJoystickInputs[i].getIndex());
+        }
+        saveEmgJoystickSettings.setJSONArray("joystickInputs", saveEmgJoystickInputs);
         saveSettingsJSONData.setJSONObject(kJSONKeyEmgJoystick, saveEmgJoystickSettings);
 
         ///////////////////////////////////////////////Setup new JSON object to save Widgets Active in respective Containers
@@ -662,6 +669,11 @@ class SessionSettings {
         //Get EMG Joystick widget settings
         JSONObject loadEmgJoystickSettings = loadSettingsJSONData.getJSONObject(kJSONKeyEmgJoystick);
         loadEmgJoystickSmoothing = loadEmgJoystickSettings.getInt("smoothing");
+        loadEmgJoystickInputs.clear();
+        JSONArray loadJoystickInputsJson = loadEmgJoystickSettings.getJSONArray("joystickInputs");
+        for (int i = 0; i < loadJoystickInputsJson.size(); i++) {
+            loadEmgJoystickInputs.add(loadJoystickInputsJson.getInt(i));
+        }
 
         //get the  Widget/Container settings
         JSONObject loadWidgetSettings = loadSettingsJSONData.getJSONObject(kJSONKeyWidget);
@@ -913,6 +925,13 @@ class SessionSettings {
         w_emgJoystick.setJoystickSmoothing(loadEmgJoystickSmoothing);
         w_emgJoystick.cp5_widget.getController("emgJoystickSmoothingDropdown").getCaptionLabel()
                 .setText(EmgJoystickSmoothing.getEnumStringsAsList().get(loadEmgJoystickSmoothing));
+        try {
+            for (int i = 0; i < loadEmgJoystickInputs.size(); i++) {
+                w_emgJoystick.updateJoystickInput(i, loadEmgJoystickInputs.get(i));
+            }
+        } catch (Exception e) {
+            println("Settings: Exception caught applying EMG Joystick settings " + e);
+        }
 
         ////////////////////////////////////////////////////////////
         //    Apply more loaded widget settings above this line   //

OpenBCI_GUI/W_EMGJoystick.pde

@@ -47,24 +47,24 @@ class W_EMGJoystick extends Widget {
 
     private String[] plotChannelLabels = new String[NUM_EMG_CHANNELS];
 
-    EmgJoystickSmoothing joystickSmoothing = EmgJoystickSmoothing.POINT_9;
+    public EmgJoystickSmoothing joystickSmoothing = EmgJoystickSmoothing.POINT_9;
 
     private int DROPDOWN_HEIGHT = navH - 4;
     private int DROPDOWN_WIDTH = 80;
     private int DROPDOWN_SPACER = 10;
     private int DROPDOWN_LABEL_WIDTH = 24;
 
-    EmgJoystickInput[] emgJoystickInputs = new EmgJoystickInput[NUM_EMG_CHANNELS];
+    public EmgJoystickInput[] emgJoystickInputs = new EmgJoystickInput[NUM_EMG_CHANNELS];
 
-    ScrollableList xNegativeInputDropdown;
-    ScrollableList xPositiveInputDropdown;
-    ScrollableList yPositiveInputDropdown;
-    ScrollableList yNegativeInputDropdown;
+    private ScrollableList xNegativeInputDropdown;
+    private ScrollableList xPositiveInputDropdown;
+    private ScrollableList yPositiveInputDropdown;
+    private ScrollableList yNegativeInputDropdown;
 
-    TextBox xNegativeInputDropdownLabel;
-    TextBox xPositiveInputDropdownLabel;
-    TextBox yPositiveInputDropdownLabel;
-    TextBox yNegativeInputDropdownLabel;
+    private TextBox xNegativeInputDropdownLabel;
+    private TextBox xPositiveInputDropdownLabel;
+    private TextBox yPositiveInputDropdownLabel;
+    private TextBox yNegativeInputDropdownLabel;
 
     W_EMGJoystick(PApplet _parent){
         super(_parent); //calls the parent CONSTRUCTOR method of Widget (DON'T REMOVE)
@@ -424,6 +424,28 @@ class W_EMGJoystick extends Widget {
         yNegativeInputDropdownLabel.draw();
     }
 
+    public void updateJoystickInput(int inputNumber, Integer value) {
+        if (value == null) {
+            return;
+        }
+        emgJoystickInputs[inputNumber] = EmgJoystickInput.values()[value];
+        String inputName = emgJoystickInputs[inputNumber].getString();
+        switch (inputNumber) {
+            case 0:
+                xNegativeInputDropdown.getCaptionLabel().setText(inputName);
+                break;
+            case 1:
+                xPositiveInputDropdown.getCaptionLabel().setText(inputName);
+                break;
+            case 2:
+                yPositiveInputDropdown.getCaptionLabel().setText(inputName);
+                break;
+            case 3:
+                yNegativeInputDropdown.getCaptionLabel().setText(inputName);
+                break;
+        }
+    }
+
 };
 
 public void emgJoystickSmoothingDropdown(int n) {