Merge pull request #22 from JacobPalecki/GUI

Replace SigmoidGain with Motivity & Cleanup

4 files changed, 20 insertions, 12 deletions

diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs
index bc0d368..11a7f10 100644
--- a/grapher/Models/Options/AccelOptionSet.cs
+++ b/grapher/Models/Options/AccelOptionSet.cs
@@ -24,6 +24,7 @@ namespace grapher.Models.Options
 
             OptionsTitle.Top = TopAnchor;
             IsTitleMode = true;
+            Hidden = false;
             SetRegularMode();
         }
 
@@ -35,9 +36,10 @@ namespace grapher.Models.Options
 
         public AccelTypeOptions Options { get; }
 
-
         public bool IsTitleMode { get; private set; }
 
+        private bool Hidden { get; set; }
+
         public void SetRegularMode()
         {
             if (IsTitleMode)
@@ -67,6 +69,7 @@ namespace grapher.Models.Options
             OptionsTitle.Hide();
             ActiveValuesTitle.Hide();
             Options.Hide();
+            Hidden = true;
         }
 
         public void Show()
@@ -78,6 +81,7 @@ namespace grapher.Models.Options
 
             ActiveValuesTitle.Show();
             Options.Show();
+            Hidden = false;
         }
 
         public void DisplayTitle()
@@ -106,7 +110,10 @@ namespace grapher.Models.Options
 
         public void SetActiveValues(int mode, AccelArgs args)
         {
-            Options.SetActiveValues(mode, args);
+            if (!Hidden)
+            {
+                Options.SetActiveValues(mode, args);
+            }
         }
 
         public void AlignActiveValues()
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 917ac5c..9bd42f5 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -17,10 +17,10 @@ namespace grapher
             new LinearLayout(),
             new ClassicLayout(),
             new NaturalLayout(),
+            new NaturalGainLayout(),
             new PowerLayout(),
             new LogarithmLayout(),
-            new NaturalGainLayout(),
-            new SigmoidGainLayout(),
+            new MotivityLayout(),
             new OffLayout()
         }.ToDictionary(k => k.Name);
 
@@ -63,6 +63,7 @@ namespace grapher
         #endregion Constructors
 
         #region Properties
+        public AccelCharts AccelCharts { get; }
 
         public Button WriteButton { get; }
 
@@ -179,11 +180,12 @@ namespace grapher
 
         public void SetActiveValues(int index, AccelArgs args)
         {
-            var name = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value.Name;
-            AccelTypeActiveValue.SetValue(name);
+            AccelerationType = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value;
+            AccelTypeActiveValue.SetValue(AccelerationType.Name);
+            AccelDropdown.SelectedIndex = AccelerationType.Index;
 
             Weight.SetActiveValue(args.weight);
-            Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0);
+            Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0 || args.scaleCap <= 0);
             Offset.SetActiveValue(args.offset, args.legacy_offset);
             Acceleration.SetActiveValue(args.accel);
             LimitOrExponent.SetActiveValue(args.exponent);
diff --git a/grapher/Models/Options/ActiveValueLabel.cs b/grapher/Models/Options/ActiveValueLabel.cs
index 18a4400..66817ab 100644
--- a/grapher/Models/Options/ActiveValueLabel.cs
+++ b/grapher/Models/Options/ActiveValueLabel.cs
@@ -5,11 +5,6 @@ namespace grapher.Models.Options
 {
     public class ActiveValueLabel
     {
-        #region Constants
-
-
-        #endregion Constants
-
         #region Fields
 
         private string _prefix;
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 6ec9d31..720cb13 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -130,6 +130,10 @@ namespace grapher.Models.Options
                 settings.args.x,
                 settings.args.y,
                 settings.combineMagnitudes);
+
+            AccelCharts.SetLogarithmic(
+                OptionSetX.Options.AccelerationType.LogarithmicCharts,
+                OptionSetY.Options.AccelerationType.LogarithmicCharts);
         }
 
         public void OnWholeClicked(object sender, EventArgs e)