Merge pull request #87 from matthewstrasiotto/streamer_mode

Improve use of whitespace on charts, make elements bolder, add "streaming mode" toggle for overlaying charts using Chroma key in OBS

2 files changed, 13 insertions, 4 deletions

diff --git a/grapher/Models/Serialized/GUISettings.cs b/grapher/Models/Serialized/GUISettings.cs
index bb35055..a4eb627 100644
--- a/grapher/Models/Serialized/GUISettings.cs
+++ b/grapher/Models/Serialized/GUISettings.cs
@@ -31,6 +31,9 @@ namespace grapher.Models.Serialized
         [JsonProperty(Order = 5)]
         public bool AutoWriteToDriverOnStartup { get; set; }
 
+        [JsonProperty(Order = 6)]
+        public bool StreamingMode { get; set; }
+
         #endregion Properties
 
         #region Methods
@@ -53,7 +56,8 @@ namespace grapher.Models.Serialized
                 PollRate == other.PollRate &&
                 ShowLastMouseMove == other.ShowLastMouseMove &&
                 ShowVelocityAndGain == other.ShowVelocityAndGain &&
-                AutoWriteToDriverOnStartup == other.AutoWriteToDriverOnStartup;
+                AutoWriteToDriverOnStartup == other.AutoWriteToDriverOnStartup &&
+                StreamingMode == other.StreamingMode;
         }
 
         public override int GetHashCode()
@@ -62,7 +66,8 @@ namespace grapher.Models.Serialized
                 PollRate.GetHashCode() ^
                 ShowLastMouseMove.GetHashCode() ^
                 ShowVelocityAndGain.GetHashCode() ^
-                AutoWriteToDriverOnStartup.GetHashCode();
+                AutoWriteToDriverOnStartup.GetHashCode() ^
+                StreamingMode.GetHashCode();
         }
 
         #endregion Methods
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 40652dd..c867c0a 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -19,6 +19,7 @@ namespace grapher.Models.Serialized
             ToolStripMenuItem autoWrite,
             ToolStripMenuItem showLastMouseMove,
             ToolStripMenuItem showVelocityAndGain,
+            ToolStripMenuItem streamingMode,
             DeviceIDManager deviceIDManager)
         {
             ActiveAccel = activeAccel;
@@ -27,6 +28,7 @@ namespace grapher.Models.Serialized
             AutoWriteMenuItem = autoWrite;
             ShowLastMouseMoveMenuItem = showLastMouseMove;
             ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
+            StreamingModeMenuItem = streamingMode;
             DeviceIDManager = deviceIDManager;
         }
 
@@ -49,7 +51,7 @@ namespace grapher.Models.Serialized
         private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; }
 
         private ToolStripMenuItem ShowVelocityAndGainMoveMenuItem { get; set; }
-
+        private ToolStripMenuItem StreamingModeMenuItem{ get; set; }
         #endregion Properties
 
         #region Methods
@@ -73,6 +75,7 @@ namespace grapher.Models.Serialized
             PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
             ShowLastMouseMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowLastMouseMove;
             ShowVelocityAndGainMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowVelocityAndGain;
+            StreamingModeMenuItem.Checked = RawAccelSettings.GUISettings.StreamingMode;
             AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
         }
 
@@ -103,7 +106,8 @@ namespace grapher.Models.Serialized
                 PollRate = (int)PollRateField.Data,
                 ShowLastMouseMove = ShowLastMouseMoveMenuItem.Checked,
                 ShowVelocityAndGain = ShowVelocityAndGainMoveMenuItem.Checked,
-                AutoWriteToDriverOnStartup = AutoWriteMenuItem.Checked
+                AutoWriteToDriverOnStartup = AutoWriteMenuItem.Checked,
+                StreamingMode = StreamingModeMenuItem.Checked
             };
         }