separate x/y mostly works

2 files changed, 17 insertions, 11 deletions

diff --git a/grapher/Models/Charts/ChartState/ChartState.cs b/grapher/Models/Charts/ChartState/ChartState.cs
index a219cc4..ea67e83 100644
--- a/grapher/Models/Charts/ChartState/ChartState.cs
+++ b/grapher/Models/Charts/ChartState/ChartState.cs
@@ -23,6 +23,7 @@ namespace grapher.Models.Charts.ChartState
             GainChart = gainChart;
             Data = accelData;
             Calculator = calculator;
+            TwoDotsPerGraph = false;
         }
 
         public ChartXY SensitivityChart { get; }
@@ -37,6 +38,8 @@ namespace grapher.Models.Charts.ChartState
 
         public virtual DriverSettings Settings { get; set; }
 
+        internal bool TwoDotsPerGraph { get; set; }
+
         public abstract void MakeDots(int x, int y, double timeInMs);
 
         public abstract void Bind();
@@ -44,6 +47,7 @@ namespace grapher.Models.Charts.ChartState
         public abstract void Activate();
 
         public abstract void Calculate(ManagedAccel accel, DriverSettings settings);
+
         public virtual void SetUpCalculate(DriverSettings settings)
         {
             Data.Clear();
@@ -52,9 +56,9 @@ namespace grapher.Models.Charts.ChartState
 
         public void DrawLastMovement()
         {
-            SensitivityChart.DrawLastMovementValue();
-            VelocityChart.DrawLastMovementValue();
-            GainChart.DrawLastMovementValue();
+            SensitivityChart.DrawLastMovementValue(TwoDotsPerGraph);
+            VelocityChart.DrawLastMovementValue(TwoDotsPerGraph);
+            GainChart.DrawLastMovementValue(TwoDotsPerGraph);
         }
 
         public void SetWidened()
diff --git a/grapher/Models/Charts/ChartState/XYOneGraphState.cs b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
index c1153c1..bbc0c28 100644
--- a/grapher/Models/Charts/ChartState/XYOneGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
@@ -17,25 +17,27 @@ namespace grapher.Models.Charts.ChartState
                   gainChart,
                   accelData,
                   accelCalculator)
-        { }
+        {
+            TwoDotsPerGraph = true;
+        }
 
         public override void Activate()
         {
-            SensitivityChart.SetSeparate();
-            VelocityChart.SetSeparate();
-            GainChart.SetSeparate();
+            SensitivityChart.SetCombined();
+            VelocityChart.SetCombined();
+            GainChart.SetCombined();
         }
 
         public override void MakeDots(int x, int y, double timeInMs)
         {
-            Data.CalculateDotsCombinedDiffSens(x, y, timeInMs);
+            Data.CalculateDotsCombinedDiffSens(x, y, timeInMs, Settings);
         }
 
         public override void Bind()
         {
-            SensitivityChart.BindXY(Data.X.AccelPoints, Data.Y.AccelPoints);
-            VelocityChart.BindXY(Data.X.VelocityPoints, Data.Y.VelocityPoints);
-            GainChart.BindXY(Data.X.GainPoints, Data.Y.GainPoints);
+            SensitivityChart.BindXYCombined(Data.X.AccelPoints, Data.Y.AccelPoints);
+            VelocityChart.BindXYCombined(Data.X.VelocityPoints, Data.Y.VelocityPoints);
+            GainChart.BindXYCombined(Data.X.GainPoints, Data.Y.GainPoints);
         }
 
         public override void Calculate(ManagedAccel accel, DriverSettings settings)