GUI v7 - Second major refactor

OpenBCI_GUI/ADS1299SettingsController.pde

@@ -2,7 +2,7 @@ import org.apache.commons.lang3.tuple.Pair;
 
 
 class ADS1299SettingsController {
-    private PApplet _parentApplet;
+    private PApplet parentApplet;
     private boolean isVisible = false;
     protected int x, y, w, h;
     protected final int PADDING_3 = 3;
@@ -64,16 +64,16 @@ class ADS1299SettingsController {
     protected int channelCount;
     protected List<Integer> activeChannels;
 
-    ADS1299SettingsController(PApplet _parent, List<Integer> _activeChannels, int _x, int _y, int _w, int _h, int _channelBarHeight) {
+    ADS1299SettingsController(PApplet _parentApplet, List<Integer> _activeChannels, int _x, int _y, int _w, int _h, int _channelBarHeight) {
         x = _x;
         y = _y;
         w = _w;
         h = _h;
         channelBarHeight = _channelBarHeight;
 
-        _parentApplet = _parent;
-        hwsCp5 = new ControlP5(_parentApplet);
-        hwsCp5.setGraphics(_parentApplet, 0,0);
+        this.parentApplet = _parentApplet;
+        hwsCp5 = new ControlP5(parentApplet);
+        hwsCp5.setGraphics(parentApplet, 0,0);
         hwsCp5.setAutoDraw(false);
 
         int colOffset = (w / CONTROL_BUTTON_COUNT) / 2;
@@ -180,7 +180,7 @@ class ADS1299SettingsController {
             toggleWidthAndHeight = DEFAULT_TOGGLE_WIDTH;
         }
 
-        hwsCp5.setGraphics(_parentApplet, 0, 0);
+        hwsCp5.setGraphics(parentApplet, 0, 0);
 
         int colOffset = (w / CONTROL_BUTTON_COUNT) / 2;
         int button_y = y + h + PADDING_3;
@@ -233,7 +233,7 @@ class ADS1299SettingsController {
             dropdownY = int(y + (channelBarHeight * rowCount) + ((channelBarHeight - dropdownH) / 2));
             final int buttonXIncrement = spaceBetweenButtons + dropdownW;
 
-            int toggleX = dropdownX + (dropdownW / 2) - (toggleWidthAndHeight);
+            int toggleX = dropdownX + (dropdownW / 2) - (toggleWidthAndHeight / 2);
             channelSelectToggles[i].setPosition(toggleX, dropdownY);
             channelSelectToggles[i].setSize(toggleWidthAndHeight, toggleWidthAndHeight);
 
@@ -750,8 +750,9 @@ void loadHardwareSettings(File selection) {
             if (((ADS1299SettingsBoard)currentBoard).getADS1299Settings().loadSettingsValues(selection.getAbsolutePath())) {
                 outputSuccess("Hardware Settings Loaded!");
                 for (int i = 0; i < globalChannelCount; i++) {
-                    w_timeSeries.adsSettingsController.updateChanSettingsDropdowns(i, currentBoard.isEXGChannelActive(i));
-                    w_timeSeries.adsSettingsController.updateHasUnappliedSettings(i);
+                    W_TimeSeries timeSeriesWidget = widgetManager.getTimeSeriesWidget();
+                    timeSeriesWidget.adsSettingsController.updateChanSettingsDropdowns(i, currentBoard.isEXGChannelActive(i));
+                    timeSeriesWidget.adsSettingsController.updateHasUnappliedSettings(i);
                 }
             } else {
                 outputError("Failed to load Hardware Settings.");

OpenBCI_GUI/AccelerometerEnums.pde

@@ -0,0 +1,84 @@
+public enum AccelerometerVerticalScale implements IndexingInterface
+{
+    AUTO (0, 0, "Auto"),
+    ONE_G (1, 1, "1 g"),
+    TWO_G (2, 2, "2 g"),
+    FOUR_G (3, 4, "4 g");
+
+    private int index;
+    private int value;
+    private String label;
+
+    AccelerometerVerticalScale(int _index, int _value, String _label) {
+        this.index = _index;
+        this.value = _value;
+        this.label = _label;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    @Override
+    public String getString() {
+        return label;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+
+    public int getHighestValue() {
+        int highestValue = 0;
+        for (AccelerometerVerticalScale scale : values()) {
+            if (scale.getValue() > highestValue) {
+                highestValue = scale.getValue();
+            }
+        }
+        return highestValue;
+    }
+}
+
+public enum AccelerometerHorizontalScale implements IndexingInterface
+{
+    ONE_SEC (1, 1, "1 sec"),
+    THREE_SEC (2, 3, "3 sec"),
+    FIVE_SEC (3, 5, "5 sec"),
+    TEN_SEC (4, 10, "10 sec"),
+    TWENTY_SEC (5, 20, "20 sec");
+
+    private int index;
+    private int value;
+    private String label;
+
+    AccelerometerHorizontalScale(int _index, int _value, String _label) {
+        this.index = _index;
+        this.value = _value;
+        this.label = _label;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    @Override
+    public String getString() {
+        return label;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+
+    public int getHighestValue() {
+        int highestValue = 0;
+        for (AccelerometerHorizontalScale scale : values()) {
+            if (scale.getValue() > highestValue) {
+                highestValue = scale.getValue();
+            }
+        }
+        return highestValue;
+    }
+}

OpenBCI_GUI/AnalogReadEnums.pde

@@ -0,0 +1,67 @@
+public enum AnalogReadVerticalScale implements IndexingInterface
+{
+    AUTO (0, 0, "Auto"),
+    FIFTY (1, 50, "50 uV"),
+    ONE_HUNDRED (2, 100, "100 uV"),
+    TWO_HUNDRED (3, 200, "200 uV"),
+    FOUR_HUNDRED (4, 400, "400 uV"),
+    ONE_THOUSAND_FIFTY (5, 1050, "1050 uV"),
+    TEN_THOUSAND (6, 10000, "10000 uV");
+
+    private int index;
+    private int value;
+    private String label;
+
+    AnalogReadVerticalScale(int _index, int _value, String _label) {
+        this.index = _index;
+        this.value = _value;
+        this.label = _label;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    @Override
+    public String getString() {
+        return label;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+}
+
+public enum AnalogReadHorizontalScale implements IndexingInterface
+{
+    ONE_SEC (1, 1, "1 sec"),
+    THREE_SEC (2, 3, "3 sec"),
+    FIVE_SEC (3, 5, "5 sec"),
+    TEN_SEC (4, 10, "10 sec"),
+    TWENTY_SEC (5, 20, "20 sec");
+
+    private int index;
+    private int value;
+    private String label;
+
+    AnalogReadHorizontalScale(int _index, int _value, String _label) {
+        this.index = _index;
+        this.value = _value;
+        this.label = _label;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    @Override
+    public String getString() {
+        return label;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+}

OpenBCI_GUI/BandPowerEnums.pde

@@ -0,0 +1,56 @@
+
+public enum BPLogLin implements IndexingInterface {
+    LOG (0, "Log"),
+    LINEAR (1, "Linear");
+
+    private int index;
+    private String label;
+
+    BPLogLin(int _index, String _label) {
+        this.index = _index;
+        this.label = _label;
+    }
+
+    @Override
+    public String getString() {
+        return label;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+}
+
+public enum BPVerticalScale implements IndexingInterface {
+    SCALE_10 (0, 10, "10 uV"),
+    SCALE_50 (1, 50, "50 uV"),
+    SCALE_100 (2, 100, "100 uV"),
+    SCALE_500 (3, 500, "500 uV"),
+    SCALE_1000 (4, 1000, "1000 uV"),
+    SCALE_1500 (5, 1500, "1500 uV");
+
+    private int index;
+    private final int value;
+    private String label;
+
+    BPVerticalScale(int index, int value, String label) {
+        this.index = index;
+        this.value = value;
+        this.label = label;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    @Override
+    public String getString() {
+        return label;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+}

OpenBCI_GUI/ChannelSelect.pde

@@ -10,16 +10,16 @@ class ChannelSelect {
     protected boolean channelSelectHover;
     protected boolean isVisible;
 
-    ChannelSelect(PApplet _parent, int _x, int _y, int _w, int _navH) {
+    ChannelSelect(PApplet _parentApplet, int _x, int _y, int _w, int _navH) {
         x = _x;
         y = _y;
         w = _w;
         h = _navH;
         navH = _navH;
 
         //setup for checkboxes
-        cp5_chanSelect = new ControlP5(_parent);
-        cp5_chanSelect.setGraphics(_parent, 0, 0);
+        cp5_chanSelect = new ControlP5(_parentApplet);
+        cp5_chanSelect.setGraphics(_parentApplet, 0, 0);
         cp5_chanSelect.setAutoDraw(false); //draw only when specified
     }
 
@@ -66,8 +66,8 @@ class ChannelSelect {
         popStyle();
     }
 
-    public void screenResized(PApplet _parent) {
-        cp5_chanSelect.setGraphics(_parent, 0, 0);
+    public void screenResized(PApplet _parentApplet) {
+        cp5_chanSelect.setGraphics(_parentApplet, 0, 0);
     }
 
     public void mousePressed(boolean dropdownIsActive) {
@@ -111,8 +111,8 @@ class ExGChannelSelect extends ChannelSelect {
     protected List<Toggle> channelButtons;
     private List<Integer> activeChannels = new ArrayList<Integer>();
 
-    ExGChannelSelect(PApplet _parent, int _x, int _y, int _w, int _navH) {
-        super(_parent, _x, _y, _w, _navH);
+    ExGChannelSelect(PApplet _parentApplet, int _x, int _y, int _w, int _navH) {
+        super(_parentApplet, _x, _y, _w, _navH);
         createButtons();
     }
 
@@ -232,6 +232,17 @@ class ExGChannelSelect extends ChannelSelect {
         return activeChannels;
     }
 
+    public void updateChannelSelection(List<Integer> channels) {
+        // First deactivate all channels
+        deactivateAllButtons();
+
+        // Then activate only the selected channels
+        for (Integer channel : channels) {
+            if (channel >= 0 && channel < channelButtons.size()) {
+                setToggleState(channel, true);  // Changed from toggleButton
+            }
+        }
+    }
 }
 
 class DualChannelSelector {
@@ -282,8 +293,8 @@ class DualExGChannelSelect extends ExGChannelSelect {
 
     DualChannelSelector dualChannelSelector;
 
-    DualExGChannelSelect(PApplet _parent, int _x, int _y, int _w, int _navH, boolean isFirstRow) {
-        super(_parent, _x, _y, _w, _navH);
+    DualExGChannelSelect(PApplet _parentApplet, int _x, int _y, int _w, int _navH, boolean isFirstRow) {
+        super(_parentApplet, _x, _y, _w, _navH);
         dualChannelSelector = new DualChannelSelector(isFirstRow);
     }
 

OpenBCI_GUI/Containers.pde

@@ -80,8 +80,8 @@ void drawContainers() {
     if (widthOfLastScreen_C != width || heightOfLastScreen_C != height) {
         setupContainers();
         //setupVizs(); //container extension example (more below)
-        settings.widthOfLastScreen = width;
-        settings.heightOfLastScreen = height;
+        sessionSettings.widthOfLastScreen = width;
+        sessionSettings.heightOfLastScreen = height;
     }
 }