Merge branch 'development' into june2023-networking-refactor

Author: retiutut

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Fix LSL AvgBandPower data type only one value is sent #1098
 - Fix error starting BrainFlow Streaming Board from external process #1102
 - Fix Hardware Settings button not clickable after resizing app #1132
+- Fix bug loading Session Settings related to Widget Layouts #1138
 
 ### Improvements
 

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -62,7 +62,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 //                       Global Variables & Instances
 //------------------------------------------------------------------------
 //Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
-String localGUIVersionString = "v5.1.1-alpha.4";
+String localGUIVersionString = "v5.1.1-alpha.5";
 String localGUIVersionDate = "June 2023";
 String guiLatestVersionGithubAPI = "https://api.github.com/repos/OpenBCI/OpenBCI_GUI/releases/latest";
 String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";

OpenBCI_GUI/SessionSettings.pde

@@ -517,7 +517,7 @@ class SessionSettings {
         println("SessionSettings: " + numActiveWidgets + " active widgets saved!");
         //Print what widgets are in the containers used by current layout for only the number of active widgets
         //for (int i = 0; i < numActiveWidgets; i++) {
-            //int containerCounter = wm.layouts.get(currentLayout-1).containerInts[i];
+            //int containerCounter = wm.layouts.get(currentLayout).containerInts[i];
             //println("Container " + containerCounter + " is available"); //For debugging
         //}
         saveSettingsJSONData.setJSONObject(kJSONKeyWidget, saveWidgetSettings);

OpenBCI_GUI/TopNav.pde

@@ -658,10 +658,10 @@ class LayoutSelector {
             tempLayoutButton.setForceDrawBackground(true);
             tempLayoutButton.onRelease(new CallbackListener() {
                 public void controlEvent(CallbackEvent theEvent) {
-                    output("Layout [" + (layoutNumber+1) + "] selected.");
+                    output("Layout [" + (layoutNumber) + "] selected.");
                     toggleVisibility(); //shut layoutSelector if something is selected
                     wm.setNewContainerLayout(layoutNumber); //have WidgetManager update Layout and active widgets
-                    settings.currentLayout = layoutNumber+1; //copy this value to be used when saving Layout setting
+                    settings.currentLayout = layoutNumber; //copy this value to be used when saving Layout setting
                 }
             });
             layoutOptions.add(tempLayoutButton);