Improve start/stop controls

Author: omundy

Assets/_Project/Prefabs/UI/ControlsCanvas.prefab

@@ -294,7 +294,7 @@ private void Start ()
         //GetNewData ();
     }
 
-    public void EnableEndpointDropdown (bool _status)
+    public void EnableDataDropdowns (bool _status)
     {
         modeDropdown.interactable = _status;
         endpointDropdown.interactable = _status;
@@ -306,7 +306,7 @@ public void GetNewData ()
         //Debug.Log ("DataManager.GetNewData()");
 
         // disable dropdown temporarily
-        EnableEndpointDropdown (false);
+        EnableDataDropdowns (false);
 
         // reset stats
         receivedTotal = 0;

Assets/_Project/Scripts/Data/DataManager.cs

@@ -176,49 +176,65 @@ private void Start ()
     /////////////////////////////////////////////////////////////
 
 
-
+    string startBtnAction = "Start";
 
     /**
      *  Called from the UI button to start / stop
      */
     public void OnStartBtnClick ()
     {
-        // immediately disable both 
-        SetStartBtnText (" --- ", false);
-        DataManager.Instance.EnableEndpointDropdown (false);
+        // 1. startBtnAction == "Start" - stopped
+        // button enabled = true
+        // dropdowns enabled = true
+        if (startBtnAction.Equals ("Start")) {
+            // disable both
+            SetStartBtnText ("---", false);
+            DataManager.Instance.EnableDataDropdowns (false);
+
+            // set status
+            SetTimelineStatus (TimelineStatus.start);
+            // start loop
+            StartBufferLoop ();
+        }
+
+        // 2. startBtnAction == "Stop" - in play mode
+        // button enabled = true
+        // dropdowns enabled = false
+        else if (startBtnAction.Equals ("Stop")) {
+            // set status
+            SetTimelineStatus (TimelineStatus.inactive);
 
-        // if currently active (user has clicked "stop")
-        if (status == TimelineStatus.active) {
-            SetStartBtnText (" --- ", false);
             // stop everything
             StopBufferLoop ();
             StopHistoryLoop ();
-            // set status
-            SetTimelineStatus (TimelineStatus.inactive);
-            // update btn text and make interactable
-            SetStartBtnText ("Start", true);
-            // should let them select
-            DataManager.Instance.EnableEndpointDropdown (true);
             // if there are players active
             if (PlayerManager.Instance.playerCount > 0) {
-                // then add them
+                // then remove them
                 EventManager.TriggerEvent ("RemoveAllPlayers");
             }
+
+            // enable both
+            SetStartBtnText ("Start", true);
+            DataManager.Instance.EnableDataDropdowns (true);
         }
-        // if not active (user clicked "Start")
+
+        // 3. startBtnAction == "---" - busy doing something 
+        // button enabled = false
+        // dropdowns enabled = false
         else {
-            // set status
-            SetTimelineStatus (TimelineStatus.start);
-            // start loop
-            StartBufferLoop ();
+
         }
+
+
+
         UpdateCounts ();
         UpdateTimelineLogs ();
     }
 
     void SetStartBtnText (string txt, bool interact)
     {
-        startButtonText.text = txt;
+        startBtnAction = txt;
+        startButtonText.text = startBtnAction;
         startButton.interactable = interact;
     }
 
@@ -326,9 +342,9 @@ void UpdateWaitingProgress (int _status)
             // show status
             waitingForDataProgressText.text = " -- ";
             // disable button until data arrives
-            SetStartBtnText (" --- ", false);
+            SetStartBtnText ("---", false);
             // disable
-            DataManager.Instance.EnableEndpointDropdown (false);
+            DataManager.Instance.EnableDataDropdowns (false);
         }
         // still waiting 
         else if (_status == 1) {
@@ -346,21 +362,19 @@ void UpdateWaitingProgress (int _status)
             //waitingForDataProgressText.text = " -- ";
 
             UpdateCounts ();
-            // update btn text and disable
+            // show Stop button and disable dropdowns
             SetStartBtnText ("Stop", true);
-            // disable
-            DataManager.Instance.EnableEndpointDropdown (false);
-
+            DataManager.Instance.EnableDataDropdowns (false);
         }
         // finished - fail - NO DATA
         else if (_status == 3) {
             // mark finished flag true
             waitingForDataFinished = true;
             UpdateCounts ();
-            // update btn text and make interactable
-            SetStartBtnText ("START", true);
-            // should let them select
-            DataManager.Instance.EnableEndpointDropdown (true);
+
+            // show Start button and enable dropdowns
+            SetStartBtnText ("Start", true);
+            DataManager.Instance.EnableDataDropdowns (true);
         }