further tweaks

4 files changed, 24 insertions, 33 deletions

diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index a3b8e07..ffe8444 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -113,7 +113,6 @@ namespace grapher.Models.Calculations
                 var outMagnitude = Velocity(output.Item1, output.Item2, simulatedInputDatum.time);
                 var inDiff = Math.Round(simulatedInputDatum.velocity - lastInputMagnitude, 5);
                 var outDiff = Math.Round(outMagnitude - lastOutputMagnitude, 5);
-                var slope = inDiff > 0 ? outDiff / inDiff : starter;
 
                 if (inDiff <= 0)
                 {
@@ -137,6 +136,7 @@ namespace grapher.Models.Calculations
                 }
 
                 var ratio = outMagnitude / simulatedInputDatum.velocity;
+                var slope = inDiff > 0 ? outDiff / inDiff : starter;
                 
                 if (ratio > maxRatio)
                 {
@@ -303,42 +303,32 @@ namespace grapher.Models.Calculations
 
             foreach (var slowMoveX in SlowMovements)
             {
-                foreach (var slowMoveY in SlowMovements)
-                {
-                    if (slowMoveY >= slowMoveX)
-                    {
-                        continue;
-                    }
-
-                    var ratio = slowMoveX > 0.0 ? slowMoveY / slowMoveX : 1;
-                    var ceilX = (int)Math.Round(slowMoveX*50);
-                    var ceilY = (int)Math.Round(slowMoveY*50);
-                    var ceilMagnitude = Magnitude(ceilX, ceilY);
-                    var timeFactor = ceilMagnitude / Magnitude(slowMoveX, slowMoveY);
+                var slowMoveY = slowMoveX;
+                var ratio = slowMoveX > 0.0 ? slowMoveY / slowMoveX : 1;
+                var ceilX = (int)Math.Round(slowMoveX*50);
+                var ceilY = (int)Math.Round(slowMoveY*50);
+                var ceilMagnitude = Magnitude(ceilX, ceilY);
+                var timeFactor = ceilMagnitude / Magnitude(slowMoveX, slowMoveY);
 
-                    SimulatedMouseInput mouseInputData;
-                    mouseInputData.x = ceilX;
-                    mouseInputData.y = ceilY;
-                    mouseInputData.time = MeasurementTime*timeFactor;
-                    mouseInputData.velocity = Velocity(ceilX, ceilY, mouseInputData.time);
-                    mouseInputData.angle = Math.Atan2(ceilY, ceilX);
-                    magnitudes.Add(mouseInputData);
+                SimulatedMouseInput mouseInputData;
+                mouseInputData.x = ceilX;
+                mouseInputData.y = ceilY;
+                mouseInputData.time = MeasurementTime*timeFactor;
+                mouseInputData.velocity = Velocity(ceilX, ceilY, mouseInputData.time);
+                mouseInputData.angle = Math.Atan2(ceilY, ceilX);
+                magnitudes.Add(mouseInputData);
 
-                }
             }
 
             for (int i = 5; i < CombinedMaxVelocity; i+=Increment)
             {
-                for (int j = 0; j <= i; j+=Increment)
-                {
-                    SimulatedMouseInput mouseInputData;
-                    mouseInputData.x = i;
-                    mouseInputData.y = j;
-                    mouseInputData.time = MeasurementTime;
-                    mouseInputData.velocity = Velocity(i, j, mouseInputData.time);
-                    mouseInputData.angle = Math.Atan2(j,i);
-                    magnitudes.Add(mouseInputData);
-                }
+                SimulatedMouseInput mouseInputData;
+                mouseInputData.x = i;
+                mouseInputData.y = i;
+                mouseInputData.time = MeasurementTime;
+                mouseInputData.velocity = Velocity(i, i, mouseInputData.time);
+                mouseInputData.angle = Math.Atan2(i,i);
+                magnitudes.Add(mouseInputData);
             }
 
             magnitudes.Sort((m1, m2) => m1.velocity.CompareTo(m2.velocity));
diff --git a/grapher/Models/Fields/FieldXY.cs b/grapher/Models/Fields/FieldXY.cs
index 3396907..72f14ea 100644
--- a/grapher/Models/Fields/FieldXY.cs
+++ b/grapher/Models/Fields/FieldXY.cs
@@ -129,9 +129,10 @@ namespace grapher
             YField.SetNewDefault(y);
             XField.SetToDefault();
 
-            if (x != y)
+            if (x != y || !AllowCombined)
             {
                 LockCheckBox.Checked = false;
+                YField.SetToDefault();
 
                 if (Combined)
                 {
diff --git a/grapher/Models/Options/Directionality/DirectionalityOptions.cs b/grapher/Models/Options/Directionality/DirectionalityOptions.cs
index d9a67cd..c21b932 100644
--- a/grapher/Models/Options/Directionality/DirectionalityOptions.cs
+++ b/grapher/Models/Options/Directionality/DirectionalityOptions.cs
@@ -155,6 +155,7 @@ namespace grapher.Models.Options.Directionality
                 LpNorm.Show();
                 Domain.Show();
                 Range.Show();
+                Range.Fields.LockCheckBox.Hide();
                 WholeCheckBox.Show();
                 ByComponentCheckBox.Show();
                 DirectionalityLabel.Text = Constants.DirectionalityTitleOpen;
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index 8efd5b7..102d05d 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -127,7 +127,6 @@ namespace grapher
         {
             ActiveValueLabels.SetValues(x, y);
             Fields.SetActive(x, y);
-            
         }
 
         public override void AlignActiveValues()