Remove widgetOptions ArrayList from WidgetManager

Author: retiutut

OpenBCI_GUI/Widget.pde

@@ -48,6 +48,10 @@ class Widget {
         mapToCurrentContainer();
     }
 
+    public String getWidgetTitle() {
+        return widgetTitle;
+    }
+
     public boolean getIsActive() {
         return isWidgetActive;
     }
@@ -225,7 +229,7 @@ class Widget {
         int dropdownsItemsToShow = int((h0 * widgetDropdownScaling) / (navH - 4));
         widgetSelectorHeight = (dropdownsItemsToShow + 1) * (navH - 4);
         if (widgetManager != null) {
-            int maxDropdownHeight = (widgetManager.widgetOptions.size() + 1) * (navH - 4);
+            int maxDropdownHeight = (widgetManager.getWidgetCount() + 1) * (navH - 4);
             if (widgetSelectorHeight > maxDropdownHeight) widgetSelectorHeight = maxDropdownHeight;
         }
 

OpenBCI_GUI/WidgetManager.pde

@@ -13,15 +13,13 @@
 class WidgetManager {
     //This holds all of the widgets. When creating/adding new widgets, we will add them to this ArrayList (below)
     private ArrayList<Widget> widgets;
-    private ArrayList<String> widgetOptions; //List of Widget Titles, used to populate cp5 widgetSelector dropdown of all widgets
     private int currentContainerLayout; //This is the Layout structure for the main body of the GUI
     private ArrayList<Layout> layouts = new ArrayList<Layout>();  //This holds all of the different layouts ...
 
     private boolean visible = true;
 
     WidgetManager() {
         widgets = new ArrayList<Widget>();
-        widgetOptions = new ArrayList<String>();
 
         //DO NOT re-order the functions below
         setupLayouts();
@@ -97,14 +95,17 @@ class WidgetManager {
     }
 
     private void setupWidgetSelectorDropdowns() {
-        // Populate the dropdown options with widget titles
+        // Create a temporary list of widget titles for dropdown setup
+        ArrayList<String> widgetTitles = new ArrayList<String>();
+        
+        // Populate the titles list by calling getWidgetTitle() on each widget
         for (Widget widget : widgets) {
-            widgetOptions.add(widget.widgetTitle);
+            widgetTitles.add(widget.getWidgetTitle());
         }
 
-        // Setup the dropdown for each widget
+        // Setup the dropdown for each widget using the temporary list
         for (Widget widget : widgets) {
-            widget.setupWidgetSelectorDropdown(widgetOptions);
+            widget.setupWidgetSelectorDropdown(widgetTitles);
             widget.setupNavDropdowns();
         }
     }
@@ -310,4 +311,8 @@ class WidgetManager {
     public W_TimeSeries getTimeSeriesWidget() {
         return (W_TimeSeries) getWidget("W_TimeSeries");
     }
+
+    public int getWidgetCount() {
+        return widgets.size();
+    }
 };