Merge pull request #19 from JacobPalecki/gainOffset

Add gain offset & make gain options default

7 files changed, 147 insertions, 18 deletions

diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 7a32b4e..a7d5d49 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -1,5 +1,6 @@
 using grapher.Models.Calculations;
 using grapher.Models.Mouse;
+using grapher.Models.Options;
 using grapher.Models.Serialized;
 using System;
 using System.CodeDom;
@@ -28,7 +29,7 @@ namespace grapher
             Option rotation,
             OptionXY weight,
             CapOptions cap,
-            Option offset,
+            OffsetOptions offset,
             Option acceleration,
             Option limtOrExp,
             Option midpoint,
@@ -82,7 +83,7 @@ namespace grapher
 
         public CapOptions Cap { get; }
 
-        public Option Offset { get; }
+        public OffsetOptions Offset { get; }
 
         public Option Acceleration { get; }
 
@@ -119,7 +120,8 @@ namespace grapher
                 {
                     x = new AccelArgs
                     {
-                        offset = Offset.Field.Data,
+                        offset = Offset.Offset,
+                        legacy_offset = Offset.LegacyOffset,
                         weight = Weight.Fields.X,
                         gainCap = Cap.VelocityGainCap,
                         scaleCap = Cap.SensitivityCapX,
@@ -162,7 +164,7 @@ namespace grapher
             Sensitivity.SetActiveValues(settings.sensitivity.x, settings.sensitivity.y);
             Rotation.SetActiveValue(settings.rotation);
             AccelerationOptions.SetActiveValue((int)settings.modes.x);
-            Offset.SetActiveValue(settings.args.x.offset);
+            Offset.SetActiveValue(settings.args.x.offset, settings.args.y.offset);
             Weight.SetActiveValues(settings.args.x.weight, settings.args.x.weight);
             Acceleration.SetActiveValue(settings.args.x.accel); // rate, powerscale
             LimitOrExponent.SetActiveValue(settings.args.x.limit); //exp, powerexp
diff --git a/grapher/Models/Fields/Field.cs b/grapher/Models/Fields/Field.cs
index 8d75172..1810081 100644
--- a/grapher/Models/Fields/Field.cs
+++ b/grapher/Models/Fields/Field.cs
@@ -97,7 +97,7 @@ namespace grapher
                 State = FieldState.Typing;
             }
 
-            Box.Text = string.Empty;
+            Box.Text = Data.ToString();
         }
 
         public void SetToEntered()
diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 493561a..87bac88 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -14,27 +14,27 @@ namespace grapher
         public const string GainCapFormatString = "0.##";
 
         public CapOptions(
-            ToolStripMenuItem sensitivityCapCheck,
             ToolStripMenuItem velocityGainCapCheck,
+            ToolStripMenuItem legacyCapCheck,
             OptionXY capOption,
             OptionXY weightOption)
         {
 
-            SensitivityCapCheck = sensitivityCapCheck;
             VelocityGainCapCheck = velocityGainCapCheck;
+            LegacyCapCheck = legacyCapCheck;
             CapOption = capOption;
             WeightOption = weightOption;
 
-            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();
         }
 
-        public ToolStripMenuItem SensitivityCapCheck { get; }
+        public ToolStripMenuItem LegacyCapCheck { get; }
 
         public ToolStripMenuItem VelocityGainCapCheck { get; }
 
@@ -104,10 +104,10 @@ namespace grapher
 
         void OnSensitivityCapCheckClick(object sender, EventArgs e)
         {
-            if (!SensitivityCapCheck.Checked)
+            if (!LegacyCapCheck.Checked)
             {
                 VelocityGainCapCheck.Checked = false;
-                SensitivityCapCheck.Checked = true;
+                LegacyCapCheck.Checked = true;
             }
         }
 
@@ -116,13 +116,13 @@ namespace grapher
             if (!VelocityGainCapCheck.Checked)
             {
                 VelocityGainCapCheck.Checked = true;
-                SensitivityCapCheck.Checked = false;
+                LegacyCapCheck.Checked = false;
             }
         }
 
         void OnSensitivityCapCheckedChange(object sender, EventArgs e)
         {
-            if (SensitivityCapCheck.Checked == true)
+            if (LegacyCapCheck.Checked == true)
             {
                 EnableSensitivityCap();
             }
@@ -130,7 +130,7 @@ namespace grapher
 
         void OnVelocityGainCapCheckedChange(object sender, EventArgs e)
         {
-            if (SensitivityCapCheck.Checked == true)
+            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;
+        }
+    }
+}
diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs
index bacd760..b0ef374 100644
--- a/grapher/Models/Options/Option.cs
+++ b/grapher/Models/Options/Option.cs
@@ -59,7 +59,8 @@ namespace grapher
         public void SetName(string name)
         {
             Label.Text = name;
-            Label.Left = Convert.ToInt32((Field.Box.Left / 2.0) - (Label.Width / 2.0));
+            //Label.Left = Convert.ToInt32((Field.Box.Left / 2.0) - (Label.Width / 2.0));   //Centered
+            Label.Left = Convert.ToInt32(Field.Box.Left - Label.Width - 10);    //Right-aligned
         }
 
         public void SetActiveValue(double value)
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index b22bb78..8e22617 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -62,7 +62,8 @@ namespace grapher
         public void SetName(string name)
         {
             Label.Text = name;
-            Label.Left = Convert.ToInt32((Fields.XField.Box.Left / 2.0) - (Label.Width / 2.0));
+            //Label.Left = Convert.ToInt32((Fields.XField.Box.Left / 2.0) - (Label.Width / 2.0));   //Centered
+            Label.Left = Convert.ToInt32(Fields.XField.Box.Left - Label.Width - 10);    //Right-aligned
         }
 
         public void SetActiveValues(double x, double y)
diff --git a/grapher/Models/Serialized/DriverSettings.cs b/grapher/Models/Serialized/DriverSettings.cs
index 4595bf2..cdccf88 100644
--- a/grapher/Models/Serialized/DriverSettings.cs
+++ b/grapher/Models/Serialized/DriverSettings.cs
@@ -13,6 +13,7 @@ namespace grapher.Models.Serialized
     public struct AccelArgs
     {
         public double offset;
+        public double legacy_offset;
         public double accel;
         public double limit;
         public double exponent;