generalize power start-from-1

starting output is determined by (gain) offset

2 files changed, 58 insertions, 56 deletions

diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index 89318e2..bb65541 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -54,8 +54,10 @@ namespace grapher.Models
             TextBox inCapBoxYPower,
             TextBox outCapBoxXPower,
             TextBox outCapBoxYPower,
-            TextBox offsetBoxX,
-            TextBox offsetBoxY,
+            TextBox inputOffsetBoxX,
+            TextBox inputOffsetBoxY,
+            TextBox outputOffsetBoxX,
+            TextBox outputOffsetBoxY,
             TextBox accelerationBoxX,
             TextBox accelerationBoxY,
             TextBox decayRateBoxX,
@@ -86,10 +88,6 @@ namespace grapher.Models
             CheckBox byComponentCheckBox,
             CheckBox gainSwitchX,
             CheckBox gainSwitchY,
-            CheckBox powerStartsFromZeroBoxX,
-            CheckBox powerStartsFromOneBoxX,
-            CheckBox powerStartsFromZeroBoxY,
-            CheckBox powerStartsFromOneBoxY,
             RichTextBox xLutActiveValuesBox,
             RichTextBox yLutActiveValuesBox,
             RichTextBox xLutPointsBox,
@@ -110,8 +108,10 @@ namespace grapher.Models
             Label outCapLabelYPower,
             Label capTypeLabelXPower,
             Label capTypeLabelYPower,
-            Label offsetLabelX,
-            Label offsetLabelY,
+            Label inputOffsetLabelX,
+            Label inputOffsetLabelY,
+            Label outputOffsetLabelX,
+            Label outputOffsetLabelY,
             Label constantOneLabelX,
             Label constantOneLabelY,
             Label decayRateLabelX,
@@ -128,8 +128,6 @@ namespace grapher.Models
             Label powerClassicLabelY,
             Label expLabelX,
             Label expLabelY,
-            Label powerStartsFromLabelX,
-            Label powerStartsFromLabelY,
             Label lutTextLabelX,
             Label lutTextLabelY,
             Label constantThreeLabelX,
@@ -151,8 +149,10 @@ namespace grapher.Models
             Label outCapActiveYLabelPower,
             Label capTypeActiveXLabelPower,
             Label capTypeActiveYLabelPower,
-            Label offsetActiveLabelX,
-            Label offsetActiveLabelY,
+            Label inputOffsetActiveLabelX,
+            Label inputOffsetActiveLabelY,
+            Label outputOffsetActiveLabelX,
+            Label outputOffsetActiveLabelY,
             Label accelerationActiveLabelX,
             Label accelerationActiveLabelY,
             Label decayRateActiveLabelX,
@@ -169,8 +169,6 @@ namespace grapher.Models
             Label powerClassicActiveLabelY,
             Label expActiveLabelX,
             Label expActiveLabelY,
-            Label powerStartsFromActiveLabelX,
-            Label powerStartsFromActiveLabelY,
             Label midpointActiveLabelX,
             Label midpointActiveLabelY,
             Label accelTypeActiveLabelX,
@@ -249,22 +247,40 @@ namespace grapher.Models
 
             var directionalityLeft = directionalityPanel.Left;
 
-            var offsetX = new Option(
-                offsetBoxX,
+            var inputOffsetX = new Option(
+                inputOffsetBoxX,
                 form,
                 0,
-                offsetLabelX,
+                inputOffsetLabelX,
                 0,
-                new ActiveValueLabel(offsetActiveLabelX, activeValueTitleX),
+                new ActiveValueLabel(inputOffsetActiveLabelX, activeValueTitleX),
                 "Offset");
 
-            var offsetY = new Option(
-                offsetBoxY,
+            var inputOffsetY = new Option(
+                inputOffsetBoxY,
                 form,
                 0,
-                offsetLabelY,
+                inputOffsetLabelY,
                 optionSetYLeft,
-                new ActiveValueLabel(offsetActiveLabelY, activeValueTitleY),
+                new ActiveValueLabel(inputOffsetActiveLabelY, activeValueTitleY),
+                "Offset");
+
+            var outputOffsetX = new Option(
+                outputOffsetBoxX,
+                form,
+                0,
+                outputOffsetLabelX,
+                0,
+                new ActiveValueLabel(outputOffsetActiveLabelX, activeValueTitleX),
+                "Offset");
+
+            var outputOffsetY = new Option(
+                outputOffsetBoxY,
+                form,
+                0,
+                outputOffsetLabelY,
+                optionSetYLeft,
+                new ActiveValueLabel(outputOffsetActiveLabelY, activeValueTitleY),
                 "Offset");
 
             var accelerationX = new Option(
@@ -495,20 +511,6 @@ namespace grapher.Models
                 outCapYPower,
                 scaleY);
 
-            var powerStartsFromX = new SwitchOption(
-                powerStartsFromLabelX,
-                powerStartsFromZeroBoxX,
-                powerStartsFromOneBoxX,
-                new ActiveValueLabel(powerStartsFromActiveLabelX, activeValueTitleX),
-                0);
-
-            var powerStartsFromY = new SwitchOption(
-                powerStartsFromLabelY,
-                powerStartsFromZeroBoxY,
-                powerStartsFromOneBoxY,
-                new ActiveValueLabel(powerStartsFromActiveLabelY, activeValueTitleY),
-                optionSetYLeft);
-
             var lpNorm = new Option(
                 new Field(lpNormBox, form, 2),
                 lpNormLabel,
@@ -554,11 +556,11 @@ namespace grapher.Models
                 gainSwitchOptionX,
                 classicCapOptionsX,
                 powerCapOptionsX,
-                powerStartsFromX,
+                outputOffsetX,
                 decayRateX,
                 growthRateX,
                 smoothX,
-                offsetX,
+                inputOffsetX,
                 limitX,
                 powerClassicX,
                 exponentX,
@@ -577,11 +579,11 @@ namespace grapher.Models
                 gainSwitchOptionY,
                 classicCapOptionsY,
                 powerCapOptionsY,
-                powerStartsFromY,
+                outputOffsetY,
                 decayRateY,
                 growthRateY,
                 smoothY,
-                offsetY,
+                inputOffsetY,
                 limitY,
                 powerClassicY,
                 exponentY,
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index b3153ed..d89f2d1 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -29,11 +29,11 @@ namespace grapher
             CheckBoxOption gainSwitch,
             CapOptions classicCap,
             CapOptions powerCap,
-            SwitchOption powerStartsFrom,
+            Option outputOffset,
             Option decayRate,
             Option growthRate,
             Option smooth,
-            Option offset,
+            Option inputOffset,
             Option limit,
             Option powerClassic,
             Option exponent,
@@ -67,11 +67,11 @@ namespace grapher
             Smooth = smooth;
             ClassicCap = classicCap;
             PowerCap = powerCap;
-            Offset = offset;
+            InputOffset = inputOffset;
             Limit = limit;
             PowerClassic = powerClassic;
             Exponent = exponent;
-            PowerStartsFrom = powerStartsFrom;
+            OutputOffset = outputOffset;
             Midpoint = midpoint;
             WriteButton = writeButton;
             AccelTypeActiveValue = accelTypeActiveValue;
@@ -114,9 +114,9 @@ namespace grapher
 
         public CapOptions PowerCap { get; }
 
-        public SwitchOption PowerStartsFrom { get; }
+        public Option InputOffset { get; }
 
-        public Option Offset { get; }
+        public Option OutputOffset { get; }
 
         public Option Limit { get; }
 
@@ -227,8 +227,8 @@ namespace grapher
             Smooth.Hide();
             ClassicCap.Hide();
             PowerCap.Hide();
-            PowerStartsFrom.Hide();
-            Offset.Hide();
+            OutputOffset.Hide();
+            InputOffset.Hide();
             Limit.Hide();
             PowerClassic.Hide();
             Exponent.Hide();
@@ -265,8 +265,8 @@ namespace grapher
                 args.cap.x,
                 args.cap.y,
                 args.capMode);
-            PowerStartsFrom.SetActiveValue(!args.powerStartFromOne);
-            Offset.SetActiveValue(args.offset);
+            OutputOffset.SetActiveValue(args.outputOffset);
+            InputOffset.SetActiveValue(args.inputOffset);
             DecayRate.SetActiveValue(args.decayRate);
             GrowthRate.SetActiveValue(args.growthRate);
             Smooth.SetActiveValue(args.smooth);
@@ -328,7 +328,6 @@ namespace grapher
                 args.cap.y = PowerCap.Out.Field.Data;
                 args.capMode = PowerCap.CapTypeOptions.GetSelectedCapMode();
             }
-            if (PowerStartsFrom.Visible) args.powerStartFromOne = PowerStartsFrom.Second.Checked;
             if (Limit.Visible)
             {
                 if (args.mode == AccelMode.motivity)
@@ -342,7 +341,8 @@ namespace grapher
             }
             if (PowerClassic.Visible) args.exponentClassic = PowerClassic.Field.Data;
             if (Exponent.Visible) args.exponentPower = Exponent.Field.Data;
-            if (Offset.Visible) args.offset = Offset.Field.Data;
+            if (InputOffset.Visible) args.inputOffset = InputOffset.Field.Data;
+            if (OutputOffset.Visible) args.outputOffset = OutputOffset.Field.Data;
             if (Midpoint.Visible) args.midpoint = Midpoint.Field.Data;
             if (LutPanel.Visible)
             {
@@ -369,8 +369,8 @@ namespace grapher
             Smooth.AlignActiveValues();
             ClassicCap.AlignActiveValues();
             PowerCap.AlignActiveValues();
-            PowerStartsFrom.AlignActiveValues();
-            Offset.AlignActiveValues();
+            OutputOffset.AlignActiveValues();
+            InputOffset.AlignActiveValues();
             Limit.AlignActiveValues();
             PowerClassic.AlignActiveValues();
             Exponent.AlignActiveValues();
@@ -407,11 +407,11 @@ namespace grapher
                 DecayRate,
                 GrowthRate,
                 Smooth,
-                Offset,
+                InputOffset,
                 Limit,
                 PowerClassic,
                 Exponent,
-                PowerStartsFrom,
+                OutputOffset,
                 Midpoint,
                 LutText,
                 LutPanel,