Merge pull request #21 from JacobPalecki/GUI

GUI: Icon, Separate X/Y sens mode, some fixes

4 files changed, 11 insertions, 10 deletions

diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 14c2019..917ac5c 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -18,6 +18,7 @@ namespace grapher
             new ClassicLayout(),
             new NaturalLayout(),
             new PowerLayout(),
+            new LogarithmLayout(),
             new NaturalGainLayout(),
             new SigmoidGainLayout(),
             new OffLayout()
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 241fe50..6ec9d31 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -227,7 +227,7 @@ namespace grapher.Models.Options
         private void SetActiveTitlesWhole()
         {
             OptionSetX.ActiveValuesTitle.Left = OptionSetX.Options.Left + OptionSetX.Options.Width;
-            LockXYLabel.Width = (AccelCharts.SensitivityChart.Left - OptionSetX.ActiveValuesTitle.Left) / 2;
+            LockXYLabel.Width = (AccelCharts.Left - OptionSetX.ActiveValuesTitle.Left) / 2;
             OptionSetX.ActiveValuesTitle.Width = LockXYLabel.Width;
             LockXYLabel.Left = OptionSetX.ActiveValuesTitle.Left + OptionSetX.ActiveValuesTitle.Width;
             Sensitivity.Fields.LockCheckBox.Left = LockXYLabel.Left + LockXYLabel.Width / 2 - Sensitivity.Fields.LockCheckBox.Width / 2;
diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 5e47d7b..c459c50 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -156,16 +156,16 @@ namespace grapher
                 CapOption.ActiveValueLabel.FormatString = Constants.GainCapFormatString;
                 CapOption.ActiveValueLabel.Prefix = "Gain";
                 CapOption.SetActiveValue(gainCap);
-                LegacyCapCheck.Checked = true;
-                VelocityGainCapCheck.Checked = false;
+                LegacyCapCheck.Checked = false;
+                VelocityGainCapCheck.Checked = true;
             }
             else
             {
                 CapOption.ActiveValueLabel.FormatString = Constants.DefaultActiveValueFormatString;
                 CapOption.ActiveValueLabel.Prefix = string.Empty;
                 CapOption.SetActiveValue(sensCap);
-                LegacyCapCheck.Checked = false;
-                VelocityGainCapCheck.Checked = true;
+                LegacyCapCheck.Checked = true;
+                VelocityGainCapCheck.Checked = false;
             }
         }
 
@@ -194,7 +194,7 @@ namespace grapher
 
         void OnSensitivityCapCheckedChange(object sender, EventArgs e)
         {
-            if (LegacyCapCheck.Checked == true)
+            if (LegacyCapCheck.Checked)
             {
                 EnableSensitivityCap();
             }
@@ -202,7 +202,7 @@ namespace grapher
 
         void OnVelocityGainCapCheckedChange(object sender, EventArgs e)
         {
-            if (LegacyCapCheck.Checked == true)
+            if (VelocityGainCapCheck.Checked)
             {
                 EnableVelocityGainCap();
             }
diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs
index 5dc022b..c0d339e 100644
--- a/grapher/Models/Options/Option.cs
+++ b/grapher/Models/Options/Option.cs
@@ -119,7 +119,7 @@ namespace grapher
         {
             get
             {
-                return Field.Box.Visible;
+                return Field.Box.Enabled;
             }
         }
 
@@ -140,14 +140,14 @@ namespace grapher
 
         public override void Hide()
         {
-            Field.Box.Hide();
+            Field.Hide();
             Label.Hide();
             ActiveValueLabel.Hide();
         }
 
         public void Show()
         {
-            Field.Box.Show();
+            Field.Show();
             Label.Show();
             ActiveValueLabel.Show();
         }