Merge with master

3 files changed, 144 insertions, 19 deletions

diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs
index b1f85a9..838917c 100644
--- a/grapher/Models/Options/AccelOptionSet.cs
+++ b/grapher/Models/Options/AccelOptionSet.cs
@@ -17,7 +17,7 @@ namespace grapher.Models.Options
             Option acceleration,
             CapOptions cap,
             Option weight,
-            Option offset,
+            OffsetOptions offset,
             Option limitOrExp,
             Option midpoint)
         {
@@ -50,7 +50,7 @@ namespace grapher.Models.Options
 
         public Option Weight { get; }
 
-        public Option Offset { get; }
+        public OffsetOptions Offset { get; }
 
         public Option LimitOrExponent { get; }
 
@@ -126,7 +126,8 @@ namespace grapher.Models.Options
             args.limit = LimitOrExponent.Field.Data;
             args.exponent = LimitOrExponent.Field.Data;
             args.powerExponent = LimitOrExponent.Field.Data;
-            args.offset = Offset.Field.Data;
+            args.offset = Offset.Offset;
+            args.legacy_offset = Offset.LegacyOffset;
             args.midpoint = Midpoint.Field.Data;
             args.weight = Weight.Field.Data;
         }
@@ -143,7 +144,7 @@ namespace grapher.Models.Options
             AccelTypeOptions.SetActiveValue(mode);
             Weight.SetActiveValue(args.weight);
             Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0);
-            Offset.SetActiveValue(args.offset);
+            Offset.SetActiveValue(args.offset, args.legacy_offset);
             Acceleration.SetActiveValue(args.accel);
             LimitOrExponent.SetActiveValue(args.exponent);
             Midpoint.SetActiveValue(args.midpoint);
@@ -155,8 +156,8 @@ namespace grapher.Models.Options
             Acceleration.Top = AccelTypeOptions.Top + AccelTypeOptions.Height + Constants.OptionVerticalSeperation;
             Cap.SnapTo(Acceleration);
             Weight.SnapTo(Cap);
-            Offset.SnapTo(Weight);
-            LimitOrExponent.SnapTo(Offset);
+            Offset.OffsetOption.SnapTo(Weight);
+            LimitOrExponent.SnapTo(Offset.OffsetOption);
             Midpoint.SnapTo(LimitOrExponent);
         }
     }
diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 713842c..6dc1116 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -18,29 +18,29 @@ namespace grapher
         #region Constructors
 
         public CapOptions(
-            ToolStripMenuItem sensitivityCapCheck,
             ToolStripMenuItem velocityGainCapCheck,
+            ToolStripMenuItem legacyCapCheck,
             Option capOption)
         {
 
-            SensitivityCapCheck = sensitivityCapCheck;
             VelocityGainCapCheck = velocityGainCapCheck;
+            LegacyCapCheck = legacyCapCheck;
             CapOption = capOption;
 
-            SensitivityCapCheck.Click += new System.EventHandler(OnSensitivityCapCheckClick);
+            LegacyCapCheck.Click += new System.EventHandler(OnSensitivityCapCheckClick);
             VelocityGainCapCheck.Click += new System.EventHandler(OnVelocityGainCapCheckClick);
 
-            SensitivityCapCheck.CheckedChanged += new System.EventHandler(OnSensitivityCapCheckedChange);
+            LegacyCapCheck.CheckedChanged += new System.EventHandler(OnSensitivityCapCheckedChange);
             VelocityGainCapCheck.CheckedChanged += new System.EventHandler(OnVelocityGainCapCheckedChange);
 
-            EnableSensitivityCap();
+            EnableVelocityGainCap();
         }
 
         #endregion Constructors
 
         #region Properties
 
-        public ToolStripMenuItem SensitivityCapCheck { get; }
+        public ToolStripMenuItem LegacyCapCheck { get; }
 
         public ToolStripMenuItem VelocityGainCapCheck { get; }
 
@@ -124,7 +124,7 @@ namespace grapher
                 CapOption.ActiveValueLabel.FormatString = Constants.GainCapFormatString;
                 CapOption.ActiveValueLabel.Prefix = "Gain";
                 CapOption.SetActiveValue(gainCap);
-                SensitivityCapCheck.Checked = true;
+                LegacyCapCheck.Checked = true;
                 VelocityGainCapCheck.Checked = false;
             }
             else
@@ -132,17 +132,17 @@ namespace grapher
                 CapOption.ActiveValueLabel.FormatString = Constants.DefaultActiveValueFormatString;
                 CapOption.ActiveValueLabel.Prefix = string.Empty;
                 CapOption.SetActiveValue(sensCap);
-                SensitivityCapCheck.Checked = false;
+                LegacyCapCheck.Checked = false;
                 VelocityGainCapCheck.Checked = true;
             }
         }
 
         void OnSensitivityCapCheckClick(object sender, EventArgs e)
         {
-            if (!SensitivityCapCheck.Checked)
+            if (!LegacyCapCheck.Checked)
             {
                 VelocityGainCapCheck.Checked = false;
-                SensitivityCapCheck.Checked = true;
+                LegacyCapCheck.Checked = true;
             }
         }
 
@@ -151,13 +151,13 @@ namespace grapher
             if (!VelocityGainCapCheck.Checked)
             {
                 VelocityGainCapCheck.Checked = true;
-                SensitivityCapCheck.Checked = false;
+                LegacyCapCheck.Checked = false;
             }
         }
 
         void OnSensitivityCapCheckedChange(object sender, EventArgs e)
         {
-            if (SensitivityCapCheck.Checked)
+            if (LegacyCapCheck.Checked == true)
             {
                 EnableSensitivityCap();
             }
@@ -165,7 +165,7 @@ namespace grapher
 
         void OnVelocityGainCapCheckedChange(object sender, EventArgs e)
         {
-            if (SensitivityCapCheck.Checked)
+            if (LegacyCapCheck.Checked == true)
             {
                 EnableVelocityGainCap();
             }
diff --git a/grapher/Models/Options/OffsetOptions.cs b/grapher/Models/Options/OffsetOptions.cs
new file mode 100644
index 0000000..0b01ab9
--- /dev/null
+++ b/grapher/Models/Options/OffsetOptions.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace grapher.Models.Options
+{
+    public class OffsetOptions
+    {
+        public OffsetOptions(
+            ToolStripMenuItem velocityGainOffsetCheck,
+            ToolStripMenuItem legacyOffsetCheck,
+            Option offsetOption)
+        {
+            VelocityGainOffsetCheck = velocityGainOffsetCheck;
+            LegacyOffsetCheck = legacyOffsetCheck;
+            OffsetOption = offsetOption;
+
+            VelocityGainOffsetCheck.Click += new System.EventHandler(OnVelocityGainOffsetClick);
+            LegacyOffsetCheck.Click += new System.EventHandler(OnLegacyOffsetClick);
+
+            VelocityGainOffsetCheck.CheckedChanged += new System.EventHandler(OnVelocityGainOffsetCheckedChange);
+            LegacyOffsetCheck.CheckedChanged += new System.EventHandler(OnLegacyOffsetCheckedChange);
+
+            VelocityGainOffsetCheck.Checked = true;
+        }
+
+        public ToolStripMenuItem VelocityGainOffsetCheck { get; }
+
+        public ToolStripMenuItem LegacyOffsetCheck { get; }
+
+        public Option OffsetOption { get; }
+
+        public bool IsLegacy { get; private set; }
+
+        public double LegacyOffset 
+        { 
+            get
+            {
+                if (IsLegacy)
+                {
+                    return OffsetOption.Field.Data;
+                }
+                else
+                {
+                    return 0;
+                }
+            } 
+        }
+
+        public double Offset
+        {
+            get
+            {
+                if (IsLegacy)
+                {
+                    return 0;
+                }
+                else
+                {
+                    return OffsetOption.Field.Data;
+                }
+            }
+        }
+
+        public void SetActiveValue(double offset, double legacyOffset)
+        {
+            if (offset > 0)
+            {
+                OffsetOption.SetActiveValue(offset);
+            }
+            else
+            {
+                OffsetOption.SetActiveValue(legacyOffset);
+            }
+        }
+
+        public void OnVelocityGainOffsetClick(object sender, EventArgs e)
+        {
+            if (!VelocityGainOffsetCheck.Checked)
+            {
+                VelocityGainOffsetCheck.Checked = true;
+                LegacyOffsetCheck.Checked = false;
+            }
+        }
+
+        public void OnLegacyOffsetClick(object sender, EventArgs e)
+        {
+            if (!LegacyOffsetCheck.Checked)
+            {
+                LegacyOffsetCheck.Checked = true;
+                VelocityGainOffsetCheck.Checked = false;
+            }
+        }
+
+        public void OnVelocityGainOffsetCheckedChange(object sender, EventArgs e)
+        {
+            if (VelocityGainOffsetCheck.Checked)
+            {
+                EnableVelocityGainOffset();
+            }
+        }
+
+        public void OnLegacyOffsetCheckedChange(object sender, EventArgs e)
+        {
+            if (LegacyOffsetCheck.Checked)
+            {
+                EnableLegacyOffset();
+            }
+        }
+
+        public void EnableVelocityGainOffset()
+        {
+            IsLegacy = false;
+        }
+
+        public void EnableLegacyOffset()
+        {
+            IsLegacy = true;
+        }
+    }
+}