Merge pull request #22 from JacobPalecki/GUI

Replace SigmoidGain with Motivity & Cleanup

3 files changed, 11 insertions, 2 deletions

diff --git a/grapher/Models/Serialized/DriverSettings.cs b/grapher/Models/Serialized/DriverSettings.cs
index d42187c..5f9307c 100644
--- a/grapher/Models/Serialized/DriverSettings.cs
+++ b/grapher/Models/Serialized/DriverSettings.cs
@@ -8,7 +8,7 @@ namespace grapher.Models.Serialized
 
     public enum AccelMode
     {
-        linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, noaccel
+        linear, classic, natural, naturalgain, power, logarithm, motivity, noaccel
     }
 
     #endregion Enumerations
diff --git a/grapher/Models/Serialized/GUISettings.cs b/grapher/Models/Serialized/GUISettings.cs
index 2543104..84e681b 100644
--- a/grapher/Models/Serialized/GUISettings.cs
+++ b/grapher/Models/Serialized/GUISettings.cs
@@ -33,6 +33,9 @@ namespace grapher.Models.Serialized
         [JsonProperty(Order = 4)]
         public bool ShowLastMouseMove { get; set; }
 
+        [JsonProperty(Order = 4)]
+        public bool ShowVelocityAndGain { get; set; }
+
         #endregion Properties
     }
 }
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index ccffc3f..cac2bd0 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -13,13 +13,15 @@ namespace grapher.Models.Serialized
             Field dpiField,
             Field pollRateField,
             ToolStripMenuItem autoWrite,
-            ToolStripMenuItem showLastMouseMove)
+            ToolStripMenuItem showLastMouseMove,
+            ToolStripMenuItem showVelocityAndGain)
         {
             ActiveAccel = activeAccel;
             DpiField = dpiField;
             PollRateField = pollRateField;
             AutoWriteMenuItem = autoWrite;
             ShowLastMouseMoveMenuItem = showLastMouseMove;
+            ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
         }
 
         #endregion Constructors
@@ -38,6 +40,8 @@ namespace grapher.Models.Serialized
 
         private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; }
 
+        private ToolStripMenuItem ShowVelocityAndGainMoveMenuItem { get; set; }
+
         #endregion Properties
 
         #region Methods
@@ -53,6 +57,7 @@ namespace grapher.Models.Serialized
                     DPI = (int)DpiField.Data,
                     PollRate = (int)PollRateField.Data,
                     ShowLastMouseMove = ShowLastMouseMoveMenuItem.Checked,
+                    ShowVelocityAndGain = ShowVelocityAndGainMoveMenuItem.Checked,
                 };
 
                 RawAccelSettings.Save();
@@ -69,6 +74,7 @@ namespace grapher.Models.Serialized
             PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
             AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
             ShowLastMouseMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowLastMouseMove;
+            ShowVelocityAndGainMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowVelocityAndGain;
         }
 
         public void Startup()