1 files changed, 20 insertions, 14 deletions
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 06854b8..4946414 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -15,7 +15,8 @@ namespace grapher.Models.Options
             AccelOptionSet optionSetX,
             AccelOptionSet optionSetY,
             DirectionalityOptions directionalityOptions,
-            OptionXY sensitivity,
+            Option sensitivity,
+            LockableOption yxRatio,
             Option rotation,
             Label lockXYLabel,
             AccelCharts accelCharts)
@@ -34,6 +35,7 @@ namespace grapher.Models.Options
             OptionSetX = optionSetX;
             OptionSetY = optionSetY;
             Sensitivity = sensitivity;
+            YToXRatio = yxRatio;
             Rotation = rotation;
             LockXYLabel = lockXYLabel;
             AccelCharts = accelCharts;
@@ -44,7 +46,8 @@ namespace grapher.Models.Options
             ByComponentVectorXYLock.CheckedChanged += new System.EventHandler(OnByComponentXYLockChecked);
             ByComponentVectorXYLock.Checked = true;
 
-            Rotation.SnapTo(Sensitivity);
+            YToXRatio.SnapTo(Sensitivity);
+            Rotation.SnapTo(YToXRatio);
 
             EnableWholeApplication();
         }
@@ -65,7 +68,9 @@ namespace grapher.Models.Options
 
         public DirectionalityOptions Directionality { get; }
 
-        public OptionXY Sensitivity { get; }
+        public Option Sensitivity { get; }
+
+        public LockableOption YToXRatio { get; }
 
         public Option Rotation { get; }
 
@@ -81,30 +86,31 @@ namespace grapher.Models.Options
 
         #region Methods
 
-        public void SetArgs(ref Vec2<AccelArgs> args)
+        public void SetArgsFromActiveValues(ref AccelArgs argsX, ref AccelArgs argsY)
         {
-            OptionSetX.SetArgs(ref args.x);
+            OptionSetX.SetArgsFromActiveValues(ref argsX);
 
             if (ByComponentVectorXYLock.Checked)
             {
-                OptionSetX.SetArgs(ref args.y);
+                OptionSetX.SetArgsFromActiveValues(ref argsY);
             }
             else
             {
-                OptionSetY.SetArgs(ref args.y);
+                OptionSetY.SetArgsFromActiveValues(ref argsY);
             }
         }
 
-        public void SetActiveValues(DriverSettings settings)
+        public void SetActiveValues(Profile settings)
         {
-            Sensitivity.SetActiveValues(settings.sensitivity.x, settings.sensitivity.y);
+            Sensitivity.SetActiveValue(settings.sensitivity);
+            YToXRatio.SetActiveValue(settings.yxSensRatio);
             Rotation.SetActiveValue(settings.rotation);
             
             WholeVectorCheckBox.Checked = settings.combineMagnitudes;
             ByComponentVectorCheckBox.Checked = !settings.combineMagnitudes;
-            ByComponentVectorXYLock.Checked = settings.args.x.Equals(settings.args.y);
-            OptionSetX.SetActiveValues(ref settings.args.x);
-            OptionSetY.SetActiveValues(ref settings.args.y);
+            ByComponentVectorXYLock.Checked = settings.argsX.Equals(settings.argsY);
+            OptionSetX.SetActiveValues(ref settings.argsX);
+            OptionSetY.SetActiveValues(ref settings.argsY);
 
             Directionality.SetActiveValues(settings);
 
@@ -210,8 +216,8 @@ namespace grapher.Models.Options
             LockXYLabel.Width = (AccelCharts.Left - OptionSetX.ActiveValuesTitle.Left) / 2;
             OptionSetX.ActiveValuesTitle.Width = LockXYLabel.Width;
             LockXYLabel.Left = OptionSetX.ActiveValuesTitle.Left + OptionSetX.ActiveValuesTitle.Width;
-            Sensitivity.Fields.LockCheckBox.Left = LockXYLabel.Left + LockXYLabel.Width / 2 - Sensitivity.Fields.LockCheckBox.Width / 2;
-            ByComponentVectorXYLock.Left = Sensitivity.Fields.LockCheckBox.Left;
+            YToXRatio.LockBox.Left = LockXYLabel.Left + LockXYLabel.Width / 2 - YToXRatio.LockBox.Width / 2;
+            ByComponentVectorXYLock.Left = YToXRatio.LockBox.Left;
             AlignActiveValues();
         }