Rename experiment two to motivity

5 files changed, 54 insertions, 3 deletions

diff --git a/grapher/Models/Charts/ChartXY.cs b/grapher/Models/Charts/ChartXY.cs
index c5c00d1..3850e42 100644
--- a/grapher/Models/Charts/ChartXY.cs
+++ b/grapher/Models/Charts/ChartXY.cs
@@ -128,7 +128,6 @@ namespace grapher
                     pointTwo.Get(out x, out y);
                     chart.Series[3].Points.DataBindXY(x, y);
                 }
-                chart.Update();
             }
         }
 
diff --git a/grapher/Models/Mouse/MouseData.cs b/grapher/Models/Mouse/MouseData.cs
new file mode 100644
index 0000000..e59a969
--- /dev/null
+++ b/grapher/Models/Mouse/MouseData.cs
@@ -0,0 +1,49 @@
+using System;
+
+namespace grapher.Models.Mouse
+{
+    public class MouseData
+    {
+        #region Constructors
+
+        public MouseData()
+        {
+            Lock = new Object();
+            X = 0;
+            Y = 0;
+        }
+
+        #endregion Constructors
+
+        #region Properties
+
+        public Object Lock { get; }
+
+        private int X { get; set; }
+        private int Y { get; set; }
+
+        public void Set(int x, int y)
+        {
+            lock (Lock)
+            {
+                X = x;
+                Y = y;
+            }
+        }
+
+        #endregion Properties
+
+        #region Methods
+
+        public void Get(out int x, out int y)
+        {
+            lock (Lock)
+            {
+                x = X;
+                y = Y;
+            }
+        }
+
+        #endregion Methods
+    }
+}
diff --git a/grapher/Models/Mouse/MouseWatcher.cs b/grapher/Models/Mouse/MouseWatcher.cs
index 405110e..86b1c2e 100644
--- a/grapher/Models/Mouse/MouseWatcher.cs
+++ b/grapher/Models/Mouse/MouseWatcher.cs
@@ -682,6 +682,7 @@ namespace grapher.Models.Mouse
             ContainingForm = containingForm;
             Display = display;
             AccelCharts = accelCharts;
+            MouseData = new MouseData();
 
             RAWINPUTDEVICE device = new RAWINPUTDEVICE();
             device.WindowHandle = ContainingForm.Handle;
@@ -705,6 +706,8 @@ namespace grapher.Models.Mouse
 
         private AccelCharts AccelCharts { get; }
 
+        private MouseData MouseData { get; }
+
         private double PollTime { get; }
 
         #endregion Properties
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index ce5ec54..1302387 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -21,7 +21,7 @@ namespace grapher
             new LogarithmLayout(),
             new NaturalGainLayout(),
             new SigmoidGainLayout(),
-            new ExperimentOneLayout(),
+            new MotivityLayout(),
             new OffLayout()
         }.ToDictionary(k => k.Name);
 
diff --git a/grapher/Models/Serialized/DriverSettings.cs b/grapher/Models/Serialized/DriverSettings.cs
index 03c5687..119b684 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, experimentone, noaccel
+        linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, motivity, noaccel
     }
 
     #endregion Enumerations