Add y lines to graphes + further work

6 files changed, 25 insertions, 14 deletions

diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 59aab2f..5567be3 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -102,8 +102,7 @@ namespace grapher
 
         public void UpdateGraph()
         {
-            AccelCalculator.Calculate(
-                AccelCharts.AccelData, 
+            AccelCharts.Calculate(
                 Settings.ActiveAccel, 
                 Settings.RawAccelSettings.AccelerationSettings);
             AccelCharts.Bind();
diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index 9807ddf..ab1f346 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -57,17 +57,6 @@ namespace grapher.Models.Calculations
 
         #region Methods
 
-        public void Calculate(AccelData data, ManagedAccel accel, DriverSettings settings)
-        {
-            ScaleByMouseSettings();
-
-            data.Clear();
-
-            Calculate(data.Combined, accel, settings.sensitivity.x, MagnitudesCombined, true, settings);
-            Calculate(data.X, accel, settings.sensitivity.x, MagnitudesX);
-            Calculate(data.Y, accel, settings.sensitivity.y, MagnitudesY);
-        }
-
         public void Calculate(AccelChartData data, ManagedAccel accel, double starter, ICollection<MagnitudeData> magnitudeData, bool strip = false, DriverSettings settings = null)
         {
             double lastInputMagnitude = 0;
diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index a5f004d..657ae89 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -142,6 +142,12 @@ namespace grapher
             AlignWriteButton();
         }
 
+        public void Calculate(ManagedAccel accel, DriverSettings settings)
+        {
+            ChartState.SetUpCalculate(settings);
+            ChartState.Calculate(accel, settings);
+        }
+
         private static void SetupCharts(
             ChartXY sensitivityChart,
             ChartXY velocityChart,
diff --git a/grapher/Models/Charts/ChartState/ChartState.cs b/grapher/Models/Charts/ChartState/ChartState.cs
index 99f44ff..a219cc4 100644
--- a/grapher/Models/Charts/ChartState/ChartState.cs
+++ b/grapher/Models/Charts/ChartState/ChartState.cs
@@ -43,7 +43,12 @@ namespace grapher.Models.Charts.ChartState
 
         public abstract void Activate();
 
-        public abstract void Calculate();
+        public abstract void Calculate(ManagedAccel accel, DriverSettings settings);
+        public virtual void SetUpCalculate(DriverSettings settings)
+        {
+            Data.Clear();
+            Calculator.ScaleByMouseSettings();
+        }
 
         public void DrawLastMovement()
         {
diff --git a/grapher/Models/Charts/ChartState/CombinedState.cs b/grapher/Models/Charts/ChartState/CombinedState.cs
index d229a43..c788775 100644
--- a/grapher/Models/Charts/ChartState/CombinedState.cs
+++ b/grapher/Models/Charts/ChartState/CombinedState.cs
@@ -1,4 +1,5 @@
 using grapher.Models.Calculations;
+using grapher.Models.Serialized;
 
 namespace grapher.Models.Charts.ChartState
 {
@@ -36,5 +37,10 @@ namespace grapher.Models.Charts.ChartState
             VelocityChart.Bind(Data.Combined.VelocityPoints);
             GainChart.Bind(Data.Combined.GainPoints);
         }
+
+        public override void Calculate(ManagedAccel accel, DriverSettings settings)
+        {
+            Calculator.Calculate(Data.Combined, accel, settings.sensitivity.x, Calculator.MagnitudesCombined, true, settings);
+        }
     }
 }
diff --git a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
index 8be88f0..69dc335 100644
--- a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
@@ -66,5 +66,11 @@ namespace grapher.Models.Charts.ChartState
             VelocityChart.BindXY(Data.X.VelocityPoints, Data.Y.VelocityPoints);
             GainChart.BindXY(Data.X.GainPoints, Data.Y.GainPoints);
         }
+
+        public override void Calculate(ManagedAccel accel, DriverSettings settings)
+        {
+            Calculator.Calculate(Data.X, accel, settings.sensitivity.x, Calculator.MagnitudesX);
+            Calculator.Calculate(Data.Y, accel, settings.sensitivity.y, Calculator.MagnitudesY);
+        }
     }
 }