Add separate box for power in classic mode

2 files changed, 35 insertions, 24 deletions

diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index 7d33f0c..d424d80 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -54,6 +54,8 @@ namespace grapher.Models
             TextBox scaleBoxY,
             TextBox limitBoxX,
             TextBox limitBoxY,
+            TextBox powerClassicBoxX,
+            TextBox powerClassicBoxY,
             TextBox expBoxX,
             TextBox expBoxY,
             TextBox midpointBoxX,
@@ -89,6 +91,8 @@ namespace grapher.Models
             Label scaleLabelY,
             Label limitLabelX,
             Label limitLabelY,
+            Label powerClassicLabelX,
+            Label powerClassicLabelY,
             Label expLabelX,
             Label expLabelY,
             Label lutTextLabelX,
@@ -112,6 +116,8 @@ namespace grapher.Models
             Label scaleActiveLabelY,
             Label limitActiveLabelX,
             Label limitActiveLabelY,
+            Label powerClassicActiveLabelX,
+            Label powerClassicActiveLabelY,
             Label expActiveLabelX,
             Label expActiveLabelY,
             Label midpointActiveLabelX,
@@ -273,6 +279,18 @@ namespace grapher.Models
                 new ActiveValueLabel(limitActiveLabelY, activeValueTitleY),
                 optionSetYLeft);
 
+            var powerClassicX = new Option(
+                new Field(powerClassicBoxX, form, 2),
+                powerClassicLabelX,
+                new ActiveValueLabel(powerClassicActiveLabelX, activeValueTitleX),
+                0);
+
+            var powerClassicY = new Option(
+                new Field(powerClassicBoxY, form, 2),
+                powerClassicLabelY,
+                new ActiveValueLabel(powerClassicActiveLabelY, activeValueTitleY),
+                optionSetYLeft);
+
             var exponentX = new Option(
                 new Field(expBoxX, form, 2),
                 expLabelX,
@@ -346,6 +364,7 @@ namespace grapher.Models
                 weightX,
                 offsetX,
                 limitX,
+                powerClassicX,
                 exponentX,
                 midpointX,
                 lutTextX,
@@ -366,6 +385,7 @@ namespace grapher.Models
                 weightY,
                 offsetY,
                 limitY,
+                powerClassicX,
                 exponentY,
                 midpointY,
                 lutTextY,
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index f97df2d..169426d 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -36,6 +36,7 @@ namespace grapher
             Option weight,
             Option offset,
             Option limit,
+            Option powerClassic,
             Option exponent,
             Option midpoint,
             TextOption lutText,
@@ -68,6 +69,7 @@ namespace grapher
             Weight = weight;
             Offset = offset;
             Limit = limit;
+            PowerClassic = powerClassic;
             Exponent = exponent;
             Midpoint = midpoint;
             WriteButton = writeButton;
@@ -113,6 +115,12 @@ namespace grapher
 
         public Option Limit { get; }
 
+        /// <summary>
+        /// This is the option for the power parameter for Classic style,
+        /// and has nothing to do with the Power style.
+        /// </summary>
+        public Option PowerClassic { get; }
+
         public Option Exponent { get; }
 
         public Option Midpoint { get; }
@@ -215,6 +223,7 @@ namespace grapher
             Weight.Hide();
             Offset.Hide();
             Limit.Hide();
+            PowerClassic.Hide();
             Exponent.Hide();
             Midpoint.Hide();
             LutText.Hide();
@@ -245,7 +254,8 @@ namespace grapher
             Acceleration.SetActiveValue(AccelerationParameterFromArgs(ref args));
             Scale.SetActiveValue(args.scale);
             Limit.SetActiveValue(args.limit);
-            Exponent.SetActiveValue(ExponentParameterFromArgs(ref args));
+            PowerClassic.SetActiveValue(args.power);
+            Exponent.SetActiveValue(args.exponent);
             Midpoint.SetActiveValue(args.midpoint);
             LutPanel.SetActiveValues(args.tableData.points, args.tableData.length);
             LutApply.SetActiveValue(args.tableData.velocity);
@@ -307,17 +317,8 @@ namespace grapher
             if (Scale.Visible) args.scale = Scale.Field.Data;
             if (Cap.Visible) args.cap = Cap.Field.Data;
             if (Limit.Visible) args.limit = Limit.Field.Data;
-            if (Exponent.Visible)
-            {
-                if (args.mode == AccelMode.classic)
-                {
-                    args.power = Exponent.Field.Data;
-                }
-                else
-                {
-                    args.exponent = Exponent.Field.Data;
-                }
-            }
+            if (PowerClassic.Visible) args.power = PowerClassic.Field.Data;
+            if (Exponent.Visible)args.exponent = Exponent.Field.Data;
             if (Offset.Visible) args.offset = Offset.Field.Data;
             if (Midpoint.Visible) args.midpoint = Midpoint.Field.Data;
             if (Weight.Visible) args.weight = Weight.Field.Data;
@@ -340,6 +341,7 @@ namespace grapher
             Offset.AlignActiveValues();
             Weight.AlignActiveValues();
             Limit.AlignActiveValues();
+            PowerClassic.AlignActiveValues();
             Exponent.AlignActiveValues();
             Midpoint.AlignActiveValues();
             LutApply.AlignActiveValues();
@@ -375,6 +377,7 @@ namespace grapher
                 Weight,
                 Offset,
                 Limit,
+                PowerClassic,
                 Exponent,
                 Midpoint,
                 LutText,
@@ -423,18 +426,6 @@ namespace grapher
             }
         }
 
-        private double ExponentParameterFromArgs(ref AccelArgs args)
-        {
-            if (args.mode == AccelMode.classic)
-            {
-                return args.power;
-            }
-            else
-            {
-                return args.exponent;
-            }
-        }
-
         #endregion Methods
     }
 }