Remove widgetName from the constructor of base Widget class

retiutut · retiutut · commit 73e392611a9a · 2025-04-10T21:41:07.000-05:00
diff --git a/OpenBCI_GUI/W_Accelerometer.pde b/OpenBCI_GUI/W_Accelerometer.pde
@@ -44,8 +44,9 @@ class W_Accelerometer extends Widget {
 
     private AccelerometerCapableBoard accelBoard;
 
-    W_Accelerometer(String widgetName) {
-        super(widgetName);
+    W_Accelerometer() {
+        super();
+        widgetTitle = "Accelerometer";
         
         accelBoard = (AccelerometerCapableBoard)currentBoard;
 
diff --git a/OpenBCI_GUI/W_AnalogRead.pde b/OpenBCI_GUI/W_AnalogRead.pde
@@ -9,7 +9,6 @@
 ////////////////////////////////////////////////////////////////////////
 
 class W_AnalogRead extends Widget {
-
     private float arPadding;
     // values for actual time series chart (rectangle encompassing all analogReadBars)
     private float ar_x, ar_y, ar_h, ar_w;
@@ -28,8 +27,9 @@ class W_AnalogRead extends Widget {
 
     private AnalogCapableBoard analogBoard;
 
-    W_AnalogRead(String _widgetName) {
-        super(_widgetName);
+    W_AnalogRead() {
+        super();
+        widgetTitle = "AnalogRead";
 
         analogBoard = (AnalogCapableBoard)currentBoard;
 
diff --git a/OpenBCI_GUI/W_BandPower.pde b/OpenBCI_GUI/W_BandPower.pde
@@ -15,7 +15,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 class W_BandPower extends Widget {
-
     // indexes
     private final int DELTA = 0; // 1-4 Hz
     private final int THETA = 1; // 4-8 Hz
@@ -40,8 +39,9 @@ class W_BandPower extends Widget {
     int[] autoCleanTimers;
     boolean[] previousThresholdCrossed;
 
-    W_BandPower(String _widgetName) {
-        super(_widgetName);
+    W_BandPower() {
+        super();
+        widgetTitle = "Band Power";
 
         autoCleanTimers = new int[currentBoard.getNumEXGChannels()];
         previousThresholdCrossed = new boolean[currentBoard.getNumEXGChannels()];
diff --git a/OpenBCI_GUI/W_CytonImpedance.pde b/OpenBCI_GUI/W_CytonImpedance.pde
@@ -56,8 +56,9 @@ class W_CytonImpedance extends Widget {
     private int thresholdTFWidth = 60; //Hard-code this value since there are deep errors with controlp5.textfield.setSize() and creating new graphics in this class - RW 12/13/2021
     
 
-    W_CytonImpedance(String _widgetName){
-        super(_widgetName);
+    W_CytonImpedance() {
+        super();
+        widgetTitle = "Cyton Signal";
 
         cytonBoard = (BoardCyton) currentBoard;
 
diff --git a/OpenBCI_GUI/W_DigitalRead.pde b/OpenBCI_GUI/W_DigitalRead.pde
@@ -22,8 +22,9 @@ class W_DigitalRead extends Widget {
 
     private DigitalCapableBoard digitalBoard;
 
-    W_DigitalRead(String _widgetName) {
-        super(_widgetName);
+    W_DigitalRead() {
+        super();
+        widgetTitle = "Digital Read";
 
         digitalBoard = (DigitalCapableBoard)currentBoard;
 
diff --git a/OpenBCI_GUI/W_EMG.pde b/OpenBCI_GUI/W_EMG.pde
@@ -21,8 +21,9 @@ class W_Emg extends Widget {
 
     public ExGChannelSelect emgChannelSelect;
 
-    W_Emg (String _widgetName) {
-        super(_widgetName);
+    W_Emg () {
+        super();
+        widgetTitle = "EMG";
 
         cp5ElementsToCheck = new ArrayList<controlP5.Controller>();
 
diff --git a/OpenBCI_GUI/W_EMGJoystick.pde b/OpenBCI_GUI/W_EMGJoystick.pde
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 class W_EmgJoystick extends Widget {
-
     private ControlP5 emgCp5;
     private Button emgSettingsButton;
     private List<controlP5.Controller> cp5ElementsToCheck;
@@ -71,8 +70,9 @@ class W_EmgJoystick extends Widget {
     private PImage yPositiveInputLabelImage = loadImage("EMG_Joystick/UP_100x100.png");
     private PImage yNegativeInputLabelImage = loadImage("EMG_Joystick/DOWN_100x100.png");
 
-    W_EmgJoystick(String _widgetName) {
-        super(_widgetName);
+    W_EmgJoystick() {
+        super();
+        widgetTitle = "EMG Joystick";
 
         emgCp5 = new ControlP5(ourApplet);
         emgCp5.setGraphics(ourApplet, 0,0);
diff --git a/OpenBCI_GUI/W_FFT.pde b/OpenBCI_GUI/W_FFT.pde
@@ -13,7 +13,6 @@
 ///////////////////////////////////////////////////
 
 class W_Fft extends Widget {
-
     public ExGChannelSelect fftChanSelect;
     private boolean prevChanSelectIsVisible = false;
 
@@ -28,8 +27,9 @@ class W_Fft extends Widget {
 
     List<controlP5.Controller> cp5ElementsToCheck = new ArrayList<controlP5.Controller>();
 
-    W_Fft(String _widgetName) {
-        super(_widgetName);
+    W_Fft() {
+        super();
+        widgetTitle = "FFT Plot";
 
         fftChanSelect = new ExGChannelSelect(ourApplet, x, y, w, navH);
         fftChanSelect.activateAllButtons();
diff --git a/OpenBCI_GUI/W_Focus.pde b/OpenBCI_GUI/W_Focus.pde
@@ -22,7 +22,6 @@ import brainflow.LogLevels;
 import brainflow.MLModel;
 
 class W_Focus extends Widget {
-
     private ExGChannelSelect focusChanSelect;
     private boolean prevChanSelectIsVisible = false;
     private AuditoryNeurofeedback auditoryNeurofeedback;
@@ -64,8 +63,9 @@ class W_Focus extends Widget {
 
     List<controlP5.Controller> cp5ElementsToCheck = new ArrayList<controlP5.Controller>();
 
-    W_Focus(String _widgetName) {
-        super(_widgetName);
+    W_Focus() {
+        super();
+        widgetTitle = "Focus";
 
          //Add channel select dropdown to this widget
         focusChanSelect = new ExGChannelSelect(ourApplet, x, y, w, navH);
diff --git a/OpenBCI_GUI/W_GanglionImpedance.pde b/OpenBCI_GUI/W_GanglionImpedance.pde
@@ -1,9 +1,11 @@
 class W_GanglionImpedance extends Widget {
+
     Button startStopCheck;
     int padding = 24;
 
-    W_GanglionImpedance(String _widgetName) {
-        super(_widgetName);
+    W_GanglionImpedance() {
+        super();
+        widgetTitle = "Ganglion Signal";
 
         createStartStopCheck("startStopCheck", "Start Impedance Check", x + padding, y + padding, 200, NAV_HEIGHT, p4, 14, colorNotPressed, OPENBCI_DARKBLUE);
     }
diff --git a/OpenBCI_GUI/W_HeadPlot.pde b/OpenBCI_GUI/W_HeadPlot.pde
@@ -10,18 +10,17 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 class W_HeadPlot extends Widget {
-    
     private HeadPlot headPlot;
-
     private HeadPlotIntensity headPlotIntensity = HeadPlotIntensity.INTENSITY_1;
     private HeadPlotPolarity headPlotPolarity = HeadPlotPolarity.PLUS_AND_MINUS;
     private HeadPlotContours headPlotContours = HeadPlotContours.ON;
     private HeadPlotSmoothing headPlotSmoothing = HeadPlotSmoothing.SMOOTH_98;
 
     private final float DEFAULT_VERTICAL_SCALE_UV = 200f; //this defines the Y-scale on the montage plots...this is the vertical space between traces
 
-    W_HeadPlot(String _widgetName) {
-        super(_widgetName);
+    W_HeadPlot() {
+        super();
+        widgetTitle = "Head Plot";
 
         addDropdown("headPlotIntensityDropdown", "Intensity", headPlotIntensity.getEnumStringsAsList(), headPlotIntensity.getIndex());
         addDropdown("headPlotPolarityDropdown", "Polarity", headPlotPolarity.getEnumStringsAsList(), headPlotPolarity.getIndex());
diff --git a/OpenBCI_GUI/W_Marker.pde b/OpenBCI_GUI/W_Marker.pde
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////
 
 class W_Marker extends Widget {
-
     private ControlP5 localCP5;
     private List<controlP5.Controller> cp5ElementsToCheckForOverlap;
 
@@ -45,8 +44,9 @@ class W_Marker extends Widget {
     private MarkerVertScale markerVertScale = MarkerVertScale.EIGHT;
     private MarkerWindow markerWindow = MarkerWindow.FIVE;
 
-    W_Marker(String _widgetName) {
-        super(_widgetName);
+    W_Marker() {
+        super();
+        widgetTitle = "Marker";
 
         //Instantiate local cp5 for this box. This allows extra control of drawing cp5 elements specifically inside this class.
         localCP5 = new ControlP5(ourApplet);
diff --git a/OpenBCI_GUI/W_PacketLoss.pde b/OpenBCI_GUI/W_PacketLoss.pde
@@ -37,8 +37,9 @@ class W_PacketLoss extends Widget {
 
     private CalculationWindowSize tableWindowSize = CalculationWindowSize.SECONDS10;
 
-    W_PacketLoss(String _widgetName) {
-        super(_widgetName);
+    W_PacketLoss() {
+        super();
+        widgetTitle = "Packet Loss";
 
         dataGrid = new Grid(5/*numRows*/, 4/*numCols*/, CELL_HEIGHT);
         packetLossTracker = ((Board)currentBoard).getPacketLossTracker();
diff --git a/OpenBCI_GUI/W_Playback.pde b/OpenBCI_GUI/W_Playback.pde
@@ -21,8 +21,9 @@ class W_playback extends Widget {
 
     private boolean menuHasUpdated = false;
 
-    W_playback(String _widgetName) {
-        super(_widgetName);
+    W_playback() {
+        super();
+        widgetTitle = "Playback History";
 
         cp5_playback = new ControlP5(ourApplet);
         cp5_playback.setGraphics(ourApplet, 0,0);
diff --git a/OpenBCI_GUI/W_PulseSensor.pde b/OpenBCI_GUI/W_PulseSensor.pde
@@ -9,7 +9,6 @@
 ////////////////////////////////////////////////////
 
 class W_PulseSensor extends Widget {
-
     //to see all core variables/methods of the Widget class, refer to Widget.pde
     //put your custom variables here...
     private color graphStroke = #d2d2d2;
@@ -62,8 +61,9 @@ class W_PulseSensor extends Widget {
 
     private AnalogCapableBoard analogBoard;
 
-    W_PulseSensor(String _widgetName) {
-        super(_widgetName);
+    W_PulseSensor() {
+        super();
+        widgetTitle = "Pulse Sensor";
 
         analogBoard = (AnalogCapableBoard)currentBoard;
 
diff --git a/OpenBCI_GUI/W_Spectrogram.pde b/OpenBCI_GUI/W_Spectrogram.pde
@@ -8,7 +8,6 @@
 //////////////////////////////////////////////////////
 
 class W_Spectrogram extends Widget {
-
     //to see all core variables/methods of the Widget class, refer to Widget.pde
     public ExGChannelSelect spectChanSelectTop;
     public ExGChannelSelect spectChanSelectBot;
@@ -48,8 +47,9 @@ class W_Spectrogram extends Widget {
     private SpectrogramWindowSize windowSize = SpectrogramWindowSize.ONE_MINUTE;
     private FFTLogLin logLin = FFTLogLin.LIN;
 
-    W_Spectrogram(String _widgetName) {
-        super(_widgetName);
+    W_Spectrogram() {
+        super();
+        widgetTitle = "Spectrogram";
 
         //Add channel select dropdown to this widget
         spectChanSelectTop = new DualExGChannelSelect(ourApplet, x, y, w, navH, true);
diff --git a/OpenBCI_GUI/W_Template.pde b/OpenBCI_GUI/W_Template.pde
diff --git a/OpenBCI_GUI/W_TimeSeries.pde b/OpenBCI_GUI/W_TimeSeries.pde
diff --git a/OpenBCI_GUI/Widget.pde b/OpenBCI_GUI/Widget.pde
diff --git a/OpenBCI_GUI/WidgetManager.pde b/OpenBCI_GUI/WidgetManager.pde
diff --git a/OpenBCI_GUI/WidgetSettings.pde b/OpenBCI_GUI/WidgetSettings.pde
