Skip to content

Commit 5ec82f5

Browse files
committed
Improvements to control panel options
1 parent 1d147c2 commit 5ec82f5

File tree

6 files changed

+186
-88
lines changed

6 files changed

+186
-88
lines changed

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

100755100644
Lines changed: 111 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Prefabs/UI/ControlsCanvas.prefab

Lines changed: 34 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Prefabs/UI/LegendCanvas.prefab

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Scripts/Data/DataManager.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,14 @@ void OnDisable ()
6060

6161
[Serializable]
6262
public enum ModeType {
63-
remoteLive, // remote - refresh with new data from server - the endpoint automatic
64-
remoteArchive, // remote - make only one data request, shuffle between buffer / history
65-
localArchive // same as remoteArchive except using local - the endpoint is disabled
63+
liveRefresh, // remote - refresh with new data from server - the endpoint automatic
64+
live, // live data - make only one data request, shuffle between buffer / history
65+
archive // same as live except using local - the endpoint is disabled
66+
}
67+
public enum ModeTypeSansLive {
68+
live,
69+
archive
6670
}
67-
6871

6972

7073

@@ -243,8 +246,8 @@ public void ScaleSizeOfDataRequests (int scale)
243246
private void Awake ()
244247
{
245248
// populate dropdown options
246-
PopulateDropdown (modeDropdown, new ModeType ());
247-
PopulateDropdown (endpointDropdown, new EndpointType ());
249+
PopulateDropdownFromEnum (modeDropdown, new ModeTypeSansLive ());
250+
PopulateDropdownFromEnum (endpointDropdown, new EndpointType ());
248251

249252
// get inspector values
250253
modeDropdown.value = (int)selectedMode;
@@ -256,7 +259,7 @@ private void Awake ()
256259
/// </summary>
257260
/// <param name="dropdown">A reference to a TMP_Dropdown</param>
258261
/// <param name="e">Use like this: "new Enum()"</param>
259-
void PopulateDropdown (TMP_Dropdown dropdown, Enum e)
262+
void PopulateDropdownFromEnum (TMP_Dropdown dropdown, Enum e)
260263
{
261264
// clear the options in the dropdown
262265
dropdown.ClearOptions ();
@@ -319,7 +322,7 @@ public void GetNewData ()
319322
EventManager.TriggerEvent ("DataManagerUpdated");
320323

321324
// if using local archive file
322-
if (selectedMode == ModeType.localArchive) {
325+
if (selectedMode == ModeType.archive) {
323326

324327
// jump straight to handle archived json
325328
//HandleJsonResponse (localDataFile.text);
@@ -437,7 +440,7 @@ public void HandleJsonResponse (string text)
437440

438441
// LIVE MODE ONLY - SKIP DUPLICATES
439442

440-
if (selectedMode == ModeType.remoteLive) {
443+
if (selectedMode == ModeType.liveRefresh) {
441444
// get any duplicate dates in buffer based on both conditions
442445
var bufferMatches = Timeline.Instance.buffer.FindAll (found => found.createdAt == _createdAt);
443446
var historyMatches = Timeline.Instance.history.FindAll (found => found.createdAt == _createdAt);

0 commit comments

Comments
 (0)