Further work

7 files changed, 45 insertions, 33 deletions

diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index 9bbbd26..9807ddf 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -97,11 +97,6 @@ namespace grapher.Models.Calculations
                     (outputX, outputY) = StripThisSens(outputX, outputY);
                 }
 
-                if (stripRot)
-                {
-                    (outputX, outputY) = StripThisRot(outputX, outputY);
-                }
-
                 var outMagnitude = Magnitude(output.Item1, output.Item2);
                 var ratio = magnitudeDatum.magnitude > 0 ? outMagnitude / magnitudeDatum.magnitude : starter;
 
diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index 844afe1..a5f004d 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -19,14 +19,15 @@ namespace grapher
             ChartXY gainChart,
             ToolStripMenuItem enableVelocityAndGain,
             ToolStripMenuItem enableLastMouseMove,
-            Button writeButton)
+            Button writeButton,
+            AccelCalculator accelCalculator)
         {
             var estimated = new EstimatedPoints();
             var estimatedX = new EstimatedPoints();
             var estimatedY = new EstimatedPoints();
             SetupCharts(sensitivityChart, velocityChart, gainChart, estimated, estimatedX, estimatedY);
             var accelData = new AccelData(estimated, estimatedX, estimatedY);
-            ChartStateManager = new ChartStateManager(sensitivityChart, velocityChart, gainChart, accelData);
+            ChartStateManager = new ChartStateManager(sensitivityChart, velocityChart, gainChart, accelData, accelCalculator);
 
             ContainingForm = form;
             EnableVelocityAndGain = enableVelocityAndGain;
@@ -63,7 +64,7 @@ namespace grapher
         {
             get
             {
-                return ChartState.AccelData;
+                return ChartState.Data;
             }
         }
 
diff --git a/grapher/Models/Charts/ChartState/ChartState.cs b/grapher/Models/Charts/ChartState/ChartState.cs
index cc334ac..99f44ff 100644
--- a/grapher/Models/Charts/ChartState/ChartState.cs
+++ b/grapher/Models/Charts/ChartState/ChartState.cs
@@ -15,12 +15,14 @@ namespace grapher.Models.Charts.ChartState
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
-            AccelData accelData)
+            AccelData accelData,
+            AccelCalculator calculator)
         {
             SensitivityChart = sensitivityChart;
             VelocityChart = velocityChart;
             GainChart = gainChart;
-            AccelData = accelData;
+            Data = accelData;
+            Calculator = calculator;
         }
 
         public ChartXY SensitivityChart { get; }
@@ -29,7 +31,9 @@ namespace grapher.Models.Charts.ChartState
 
         public ChartXY GainChart { get; }
 
-        public AccelData AccelData { get; }
+        public AccelData Data { get; }
+
+        public AccelCalculator Calculator { get; }
 
         public virtual DriverSettings Settings { get; set; }
 
@@ -39,6 +43,8 @@ namespace grapher.Models.Charts.ChartState
 
         public abstract void Activate();
 
+        public abstract void Calculate();
+
         public void DrawLastMovement()
         {
             SensitivityChart.DrawLastMovementValue();
diff --git a/grapher/Models/Charts/ChartState/ChartStateManager.cs b/grapher/Models/Charts/ChartState/ChartStateManager.cs
index b64b1a2..54d2e81 100644
--- a/grapher/Models/Charts/ChartState/ChartStateManager.cs
+++ b/grapher/Models/Charts/ChartState/ChartStateManager.cs
@@ -14,25 +14,29 @@ namespace grapher.Models.Charts.ChartState
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChat,
-            AccelData accelData)
+            AccelData accelData,
+            AccelCalculator accelCalculator)
         {
             CombinedState = new CombinedState(
                 sensitivityChart,
                 velocityChart,
                 gainChat,
-                accelData);
+                accelData,
+                accelCalculator);
 
             XYOneGraphState = new XYOneGraphState(
                 sensitivityChart,
                 velocityChart,
                 gainChat,
-                accelData);
+                accelData,
+                accelCalculator);
 
             XYTwoGraphState = new XYTwoGraphState(
                 sensitivityChart,
                 velocityChart,
                 gainChat,
-                accelData);
+                accelData,
+                accelCalculator);
         }
 
         private CombinedState CombinedState { get; }
diff --git a/grapher/Models/Charts/ChartState/CombinedState.cs b/grapher/Models/Charts/ChartState/CombinedState.cs
index bc8c720..d229a43 100644
--- a/grapher/Models/Charts/ChartState/CombinedState.cs
+++ b/grapher/Models/Charts/ChartState/CombinedState.cs
@@ -8,12 +8,14 @@ namespace grapher.Models.Charts.ChartState
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
-            AccelData accelData)
+            AccelData accelData,
+            AccelCalculator accelCalculator)
             : base(
                   sensitivityChart,
                   velocityChart,
                   gainChart,
-                  accelData)
+                  accelData,
+                  accelCalculator)
         { }
 
         public override void Activate()
@@ -25,14 +27,14 @@ namespace grapher.Models.Charts.ChartState
 
         public override void MakeDots(int x, int y, double timeInMs)
         {
-            AccelData.CalculateDots(x, y, timeInMs);
+            Data.CalculateDots(x, y, timeInMs);
         }
 
         public override void Bind()
         {
-            SensitivityChart.Bind(AccelData.Combined.AccelPoints);
-            VelocityChart.Bind(AccelData.Combined.VelocityPoints);
-            GainChart.Bind(AccelData.Combined.GainPoints);
+            SensitivityChart.Bind(Data.Combined.AccelPoints);
+            VelocityChart.Bind(Data.Combined.VelocityPoints);
+            GainChart.Bind(Data.Combined.GainPoints);
         }
     }
 }
diff --git a/grapher/Models/Charts/ChartState/XYOneGraphState.cs b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
index 3ed5c5b..bc9a88d 100644
--- a/grapher/Models/Charts/ChartState/XYOneGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
@@ -8,12 +8,14 @@ namespace grapher.Models.Charts.ChartState
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
-            AccelData accelData)
+            AccelData accelData,
+            AccelCalculator accelCalculator)
             : base(
                   sensitivityChart,
                   velocityChart,
                   gainChart,
-                  accelData)
+                  accelData,
+                  accelCalculator)
         { }
 
         public override void Activate()
@@ -25,14 +27,14 @@ namespace grapher.Models.Charts.ChartState
 
         public override void MakeDots(int x, int y, double timeInMs)
         {
-            AccelData.CalculateDotsXY(x, y, timeInMs);
+            Data.CalculateDotsXY(x, y, timeInMs);
         }
 
         public override void Bind()
         {
-            SensitivityChart.BindXY(AccelData.X.AccelPoints, AccelData.Y.AccelPoints);
-            VelocityChart.BindXY(AccelData.X.VelocityPoints, AccelData.Y.VelocityPoints);
-            GainChart.BindXY(AccelData.X.GainPoints, AccelData.Y.GainPoints);
+            SensitivityChart.BindXY(Data.X.AccelPoints, Data.Y.AccelPoints);
+            VelocityChart.BindXY(Data.X.VelocityPoints, Data.Y.VelocityPoints);
+            GainChart.BindXY(Data.X.GainPoints, Data.Y.GainPoints);
         }
     }
 }
diff --git a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
index b54832c..8be88f0 100644
--- a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
@@ -12,12 +12,14 @@ namespace grapher.Models.Charts.ChartState
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
-            AccelData accelData)
+            AccelData accelData,
+            AccelCalculator accelCalculator)
             : base(
                   sensitivityChart,
                   velocityChart,
                   gainChart,
-                  accelData)
+                  accelData,
+                  accelCalculator)
         { }
 
         public override DriverSettings Settings
@@ -55,14 +57,14 @@ namespace grapher.Models.Charts.ChartState
                 (xCalc, yCalc) = AccelCalculator.StripSens(xCalc, yCalc, Sensitivity.Item1, Sensitivity.Item2);
             }
 
-            AccelData.CalculateDotsXY((int)Math.Round(xCalc), (int)Math.Round(yCalc), timeInMs);
+            Data.CalculateDotsXY((int)Math.Round(xCalc), (int)Math.Round(yCalc), timeInMs);
         }
 
         public override void Bind()
         {
-            SensitivityChart.BindXY(AccelData.X.AccelPoints, AccelData.Y.AccelPoints);
-            VelocityChart.BindXY(AccelData.X.VelocityPoints, AccelData.Y.VelocityPoints);
-            GainChart.BindXY(AccelData.X.GainPoints, AccelData.Y.GainPoints);
+            SensitivityChart.BindXY(Data.X.AccelPoints, Data.Y.AccelPoints);
+            VelocityChart.BindXY(Data.X.VelocityPoints, Data.Y.VelocityPoints);
+            GainChart.BindXY(Data.X.GainPoints, Data.Y.GainPoints);
         }
     }
 }