Much progress

1 files changed, 31 insertions, 1 deletions

diff --git a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
index f37af08..b54832c 100644
--- a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
@@ -1,9 +1,13 @@
 using grapher.Models.Calculations;
+using grapher.Models.Serialized;
+using System;
 
 namespace grapher.Models.Charts.ChartState
 {
     public class XYTwoGraphState : ChartState
     {
+        private DriverSettings _settings;
+
         public XYTwoGraphState(
             ChartXY sensitivityChart,
             ChartXY velocityChart,
@@ -16,6 +20,24 @@ namespace grapher.Models.Charts.ChartState
                   accelData)
         { }
 
+        public override DriverSettings Settings
+        {
+            get { return _settings; }
+            set
+            {
+                _settings = value;
+                ShouldStripSens = AccelCalculator.ShouldStripSens(ref value);
+                if (ShouldStripSens)
+                {
+                    Sensitivity = AccelCalculator.GetSens(ref value);
+                }
+            }
+        }
+
+        private bool ShouldStripSens { get; set; }
+
+        private (double, double) Sensitivity { get; set; }
+
         public override void Activate()
         {
             SensitivityChart.SetSeparate();
@@ -25,7 +47,15 @@ namespace grapher.Models.Charts.ChartState
 
         public override void MakeDots(int x, int y, double timeInMs)
         {
-            AccelData.CalculateDotsXY(x, y, timeInMs);
+            double xCalc = x; 
+            double yCalc = y;
+
+            if (ShouldStripSens)
+            {
+                (xCalc, yCalc) = AccelCalculator.StripSens(xCalc, yCalc, Sensitivity.Item1, Sensitivity.Item2);
+            }
+
+            AccelData.CalculateDotsXY((int)Math.Round(xCalc), (int)Math.Round(yCalc), timeInMs);
         }
 
         public override void Bind()