Adds CheckUpdatePlayers() logic

Author: omundy

Assets/_Project/Scenes/tally-viz.unity

@@ -9,13 +9,6 @@ public class ProjectManager : Singleton<ProjectManager> {
     protected ProjectManager () { }
     //public static new ProjectManager Instance;
 
-    Timeline timeline;
-    //SettingsManager settingsManager;
-
-    public TMP_Dropdown timelineStatusDropdown;
-
-
-
 
 
 

Assets/_Project/Scripts/Core/ProjectManager.cs

@@ -25,7 +25,6 @@ protected Timeline () { }
 
 
     public TMP_Dropdown dataSourceDropdown;
-    //public TMP_Dropdown timelineStatusDropdown;
     public TMP_Text timelineStatusText;
     public TMP_Text timelineVizDateTimeText;
     public Button startButton;
@@ -49,7 +48,14 @@ public enum TimelineStatus {
     [Tooltip ("Time since a data request made active")]
     public int waitingForDataProgress;
 
-    public int totalEvents;
+    public int totalEventCount;
+
+    [Serializable]
+    public enum DataSource {
+        local,
+        live
+    }
+    public DataSource dataSource;
 
 
     // BUFFER
@@ -133,6 +139,8 @@ private void Awake ()
     {
         //// populate options in the status dropdown 
         //Dropdown_PopulateStatus ();
+
+        //dataSource = (DataSource)dataSourceDropdown.value;
     }
 
     private void Start ()
@@ -158,29 +166,15 @@ private void Start ()
     //    // add options to list
     //    timelineStatusDropdown.AddOptions (options);
     //}
-    ///**
-    // *  Called from UI to update the game status
-    // */
-    //public void Dropdown_Listener (int _status)
-    //{
-    //    // call in-game logic, cast as Enum
-    //    SetTimelineStatus ((TimelineStatus)_status, true);
-    //}
-
 
 
     /**
-     *  Called from game to update the status 
+     *  Called from UI to update the data source
      */
-    public void SetTimelineStatus (TimelineStatus _status, bool fromUI = false)
+    public void OnChangeDataSourceDropdown (int _status)
     {
-        //Debug.Log ("Timeline.SetTimelineStatus() status = " + status + ", _status = " + _status);
-
-        // update status var
-        status = _status;
-
-        // if the call (note, original status) came from within the game then show in UI
-        if (!fromUI) timelineStatusText.text = _status.ToString ();
+        // cast as Enum
+        dataSource = (DataSource)_status;
     }
 
 
@@ -230,13 +224,34 @@ void SetStartBtnText (string txt, bool interact)
     /////////////////////////////////////////////////////////////
 
 
+    /**
+     *  Called from game and buttons to update the status 
+     */
+    public void SetTimelineStatus (TimelineStatus _status, bool fromUI = false)
+    {
+        //Debug.Log ("Timeline.SetTimelineStatus() status = " + status + ", _status = " + _status);
+
+        // update status var
+        status = _status;
+
+        // if the call (note, original status) came from within the game then show in UI
+        if (!fromUI) timelineStatusText.text = _status.ToString ();
+    }
+
     /**
      *  (stops and then) starts the buffer loop
      */
     public void StartBufferLoop ()
     {
         Debug.Log ("Timeline.StartBufferLoop()");
 
+        // update buffer max based on source
+        if (dataSource == DataSource.local) {
+            bufferCountMax = 1000;
+        } else if (dataSource == DataSource.local) {
+            bufferCountMax = 50;
+        }
+
         // if coroutine running
         if (bufferCoroutine != null) StopCoroutine (bufferCoroutine);
         // start buffer, attempt to get new data
@@ -416,14 +431,15 @@ IEnumerator BufferLoop ()
 
            else if (status == TimelineStatus.bufferEmpty) {
 
-                // local
-                if (dataSourceDropdown.value == 0) {
-                    // set to handle end of buffer
+                // LOCAL
+                if (dataSource == DataSource.local) {
+                    // we are using prepackaged data archive so move history back to buffer
                     SetTimelineStatus (TimelineStatus.moveHistory);
                 }
-                // live
-                else if (dataSourceDropdown.value == 1) {
-                    // get new data
+                // LIVE
+                else if (dataSource == DataSource.live) {
+                    // attempt to get new data
+
                 }
 
             }
@@ -439,11 +455,10 @@ IEnumerator BufferLoop ()
 
             }
 
-
+            // update counts
             UpdateCounts ();
-
             // after checking condition
-            if (bufferCount > 0) {
+            if (totalEventCount > 0) {
                 // display
                 UpdateTimelineLogs ();
             }
@@ -517,9 +532,9 @@ IEnumerator HistoryLoop ()
                 if (historyCount > 0) {
                     // after update, sort ascending
                     history.Sort ((x, y) => x.createdAt.CompareTo (y.createdAt));
-                    // display
-                    UpdateTimelineLogs ();
                 }
+                // display
+                UpdateTimelineLogs ();
 
 
                 // log feed item
@@ -561,15 +576,15 @@ void UpdateTimelineLogs ()
         int safety = 0;
         foreach (var feed in buffer) {
             bufferString += feed.eventType + ". " + feed.createdAt + " - " + feed.username + "<br>";
-            if (++safety > bufferCountMax) {
+            if (++safety > bufferCount || safety > totalEventCount) {
                 Debug.Log ("Safety first!");
                 break;
             }
         }
         safety = 0;
         foreach (var feed in history) {
             historyString += feed.eventType + ". " + feed.createdAt + " - " + feed.username + "<br>";
-            if (++safety > bufferCountMax) {
+            if (++safety > historyCount || safety > totalEventCount) {
                 Debug.Log ("Safety first!");
                 break;
             }
@@ -594,7 +609,7 @@ void UpdateCounts ()
     {
         bufferCount = buffer.Count;
         historyCount = history.Count;
-        totalEvents = buffer.Count + history.Count;
+        totalEventCount = buffer.Count + history.Count;
     }
 
     public void UpdateScroll ()

Assets/_Project/Scripts/Data/Timeline.cs

@@ -27,7 +27,7 @@ private void Update ()
     {
 
         // if there are events and historyCount has been updated
-        if (timeline.totalEvents > 0 && lastHistoryCount != timeline.historyCount) {
+        if (timeline.totalEventCount > 0 && lastHistoryCount != timeline.historyCount) {
 
             //Debug.Log ("hi " + timeline.historyCount / (float)timeline.totalEvents);
 
@@ -37,7 +37,7 @@ private void Update ()
             } else {
 
                 // get new normalized position
-                newPosNormalized = new Vector2 (timeline.historyCount / (float)timeline.totalEvents, historyRectTransform.anchorMax.y);
+                newPosNormalized = new Vector2 (timeline.historyCount / (float)timeline.totalEventCount, historyRectTransform.anchorMax.y);
 
                 // start coroutine to lerp from current to new
                 StartCoroutine (LerpPosition (historyRectTransform, newPosNormalized, 1f));