Merge pull request #22 from JacobPalecki/GUI

Replace SigmoidGain with Motivity & Cleanup

3 files changed, 54 insertions, 2 deletions

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/Mouse/PointData.cs b/grapher/Models/Mouse/PointData.cs
index 374c52e..e3f44ea 100644
--- a/grapher/Models/Mouse/PointData.cs
+++ b/grapher/Models/Mouse/PointData.cs
@@ -9,8 +9,8 @@ namespace grapher.Models.Mouse
         public PointData()
         {
             Lock = new Object();
-            X = new double[] { 0 };
-            Y = new double[] { 0 };
+            X = new double[] { 0.01 };
+            Y = new double[] { 0.01 };
         }
 
         #endregion Constructors