Merge and fix write button

9 files changed, 45 insertions, 15 deletions

diff --git a/grapher/Layouts/ClassicLayout.cs b/grapher/Layouts/ClassicLayout.cs
index 572566f..8403c5d 100644
--- a/grapher/Layouts/ClassicLayout.cs
+++ b/grapher/Layouts/ClassicLayout.cs
@@ -11,10 +11,12 @@ namespace grapher.Layouts
             Index = (int)AccelMode.classic;
 
             AccelLayout = new OptionLayout(true, Acceleration);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(true, Cap);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(true, Exponent);
+            LimitLayout = new OptionLayout(false, string.Empty);
+            ExponentLayout = new OptionLayout(true, Exponent);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }
diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs
index cf6f87f..c8cce6d 100644
--- a/grapher/Layouts/DefaultLayout.cs
+++ b/grapher/Layouts/DefaultLayout.cs
@@ -13,10 +13,12 @@ namespace grapher.Layouts
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(true, Acceleration);
+            ScaleLayout = new OptionLayout(true, Scale);
             CapLayout = new OptionLayout(true, Cap);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(true, $"{Limit}\\{Exponent}");
+            LimitLayout = new OptionLayout(true, Limit);
+            ExponentLayout = new OptionLayout(true, Exponent);
             MidpointLayout = new OptionLayout(true, Midpoint);
         }
     }
diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
index 04f5189..c380397 100644
--- a/grapher/Layouts/LayoutBase.cs
+++ b/grapher/Layouts/LayoutBase.cs
@@ -18,10 +18,12 @@ namespace grapher.Layouts
         public LayoutBase()
         {
             AccelLayout = new OptionLayout(false, string.Empty);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(false, string.Empty);
             WeightLayout = new OptionLayout(false, string.Empty);
             OffsetLayout = new OptionLayout(false, string.Empty);
-            LimExpLayout = new OptionLayout(false, string.Empty);
+            LimitLayout = new OptionLayout(false, string.Empty);
+            ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
 
             ButtonEnabled = true;
@@ -42,22 +44,28 @@ namespace grapher.Layouts
 
         protected OptionLayout AccelLayout { get; set; }
 
+        protected OptionLayout ScaleLayout { get; set; }
+
         protected OptionLayout CapLayout { get; set; }
 
         protected OptionLayout WeightLayout { get; set; }
 
         protected OptionLayout OffsetLayout { get; set; }
 
-        protected OptionLayout LimExpLayout { get; set; }
+        protected OptionLayout LimitLayout { get; set; }
+
+        protected OptionLayout ExponentLayout { get; set; }
 
         protected OptionLayout MidpointLayout { get; set; }
 
         public void Layout(
             IOption accelOption,
+            IOption scaleOption,
             IOption capOption,
             IOption weightOption,
             IOption offsetOption,
-            IOption limExpOption,
+            IOption limitOption,
+            IOption expOption,
             IOption midpointOption,
             Button button,
             int top)
@@ -68,10 +76,12 @@ namespace grapher.Layouts
 
             foreach (var option in new (OptionLayout, IOption)[] {
                 (AccelLayout, accelOption),
+                (ScaleLayout, scaleOption),
                 (CapLayout, capOption),
                 (WeightLayout, weightOption),
                 (OffsetLayout, offsetOption),
-                (LimExpLayout, limExpOption),
+                (LimitLayout, limitOption),
+                (ExponentLayout, expOption),
                 (MidpointLayout, midpointOption)})
             {
                 option.Item1.Layout(option.Item2);
@@ -94,18 +104,22 @@ namespace grapher.Layouts
 
         public void Layout(
             IOption accelOption,
+            IOption scaleOption,
             IOption capOption,
             IOption weightOption,
             IOption offsetOption,
-            IOption limExpOption,
+            IOption limitOption,
+            IOption expOption,
             IOption midpointOption,
             Button button)
         {
             Layout(accelOption,
+                scaleOption,
                 capOption,
                 weightOption,
                 offsetOption,
-                limExpOption,
+                limitOption,
+                expOption,
                 midpointOption,
                 button,
                 accelOption.Top);
diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs
index e87c851..0412a2a 100644
--- a/grapher/Layouts/LinearLayout.cs
+++ b/grapher/Layouts/LinearLayout.cs
@@ -12,10 +12,12 @@ namespace grapher.Layouts
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(true, Acceleration);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(true, Cap);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(false, string.Empty);
+            LimitLayout = new OptionLayout(false, string.Empty);
+            ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }
diff --git a/grapher/Layouts/MotivityLayout.cs b/grapher/Layouts/MotivityLayout.cs
index c555ef0..839de58 100644
--- a/grapher/Layouts/MotivityLayout.cs
+++ b/grapher/Layouts/MotivityLayout.cs
@@ -17,10 +17,12 @@ namespace grapher.Layouts
             LogarithmicCharts = true;
 
             AccelLayout = new OptionLayout(true, Acceleration);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(false, string.Empty);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(false, string.Empty);
-            LimExpLayout = new OptionLayout(true, Motivity);
+            LimitLayout = new OptionLayout(true, Motivity);
+            ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(true, Midpoint);
         }
     }
diff --git a/grapher/Layouts/NaturalGainLayout.cs b/grapher/Layouts/NaturalGainLayout.cs
index b9cf75e..12daed3 100644
--- a/grapher/Layouts/NaturalGainLayout.cs
+++ b/grapher/Layouts/NaturalGainLayout.cs
@@ -12,10 +12,12 @@ namespace grapher.Layouts
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(true, Acceleration);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(false, string.Empty);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(true, Limit);
+            LimitLayout = new OptionLayout(true, Limit);
+            ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }
diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs
index 59895df..44129f9 100644
--- a/grapher/Layouts/NaturalLayout.cs
+++ b/grapher/Layouts/NaturalLayout.cs
@@ -12,10 +12,12 @@ namespace grapher.Layouts
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(true, Acceleration);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(false, string.Empty);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(true, Limit);
+            LimitLayout = new OptionLayout(true, Limit);
+            ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }
diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs
index c47ea39..664e364 100644
--- a/grapher/Layouts/OffLayout.cs
+++ b/grapher/Layouts/OffLayout.cs
@@ -13,10 +13,12 @@ namespace grapher.Layouts
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(false, string.Empty);
+            ScaleLayout = new OptionLayout(false, string.Empty);
             CapLayout = new OptionLayout(false, string.Empty);
             WeightLayout = new OptionLayout(false, string.Empty);
             OffsetLayout = new OptionLayout(false, string.Empty);
-            LimExpLayout = new OptionLayout(false, string.Empty);
+            LimitLayout = new OptionLayout(false, string.Empty);
+            ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }
diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs
index e12ac4a..1911813 100644
--- a/grapher/Layouts/PowerLayout.cs
+++ b/grapher/Layouts/PowerLayout.cs
@@ -11,11 +11,13 @@ namespace grapher.Layouts
             Index = (int)AccelMode.power;
             LogarithmicCharts = false;
 
-            AccelLayout = new OptionLayout(true, Scale);
+            AccelLayout = new OptionLayout(false, string.Empty);
+            ScaleLayout = new OptionLayout(true, Scale);
             CapLayout = new OptionLayout(true, Cap);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(true, Exponent);
+            LimitLayout = new OptionLayout(false, string.Empty);
+            ExponentLayout = new OptionLayout(true, Exponent);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }