Merge pull request #21 from JacobPalecki/GUI

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

6 files changed, 27 insertions, 6 deletions

diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs
index fded8c7..8afdc79 100644
--- a/grapher/Layouts/LinearLayout.cs
+++ b/grapher/Layouts/LinearLayout.cs
@@ -12,7 +12,7 @@ namespace grapher.Layouts
 
             AccelLayout = new OptionLayout(true, Acceleration);
             CapLayout = new OptionLayout(true, Cap);
-            WeightLayout = new OptionLayout(false, string.Empty);
+            WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
             LimExpLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/LogarithmLayout.cs b/grapher/Layouts/LogarithmLayout.cs
new file mode 100644
index 0000000..5b25d60
--- /dev/null
+++ b/grapher/Layouts/LogarithmLayout.cs
@@ -0,0 +1,21 @@
+using grapher.Models.Serialized;
+
+namespace grapher.Layouts
+{
+    public class LogarithmLayout : LayoutBase
+    {
+        public LogarithmLayout ()
+            : base()
+        {
+            Name = "Logarithm";
+            Index = (int)AccelMode.logarithm;
+
+            AccelLayout = new OptionLayout(true, Scale);
+            CapLayout = new OptionLayout(true, Cap);
+            WeightLayout = new OptionLayout(true, Weight);
+            OffsetLayout = new OptionLayout(true, Offset);
+            LimExpLayout = new OptionLayout(false, string.Empty);
+            MidpointLayout = new OptionLayout(false, string.Empty);
+        }
+    }
+}
diff --git a/grapher/Layouts/NaturalGainLayout.cs b/grapher/Layouts/NaturalGainLayout.cs
index b982b91..dd2cc05 100644
--- a/grapher/Layouts/NaturalGainLayout.cs
+++ b/grapher/Layouts/NaturalGainLayout.cs
@@ -12,7 +12,7 @@ namespace grapher.Layouts
 
             AccelLayout = new OptionLayout(true, Acceleration);
             CapLayout = new OptionLayout(false, string.Empty);
-            WeightLayout = new OptionLayout(false, string.Empty);
+            WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
             LimExpLayout = new OptionLayout(true, Limit);
             MidpointLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs
index aa5c22c..faa4730 100644
--- a/grapher/Layouts/NaturalLayout.cs
+++ b/grapher/Layouts/NaturalLayout.cs
@@ -12,7 +12,7 @@ namespace grapher.Layouts
 
             AccelLayout = new OptionLayout(true, Acceleration);
             CapLayout = new OptionLayout(false, string.Empty);
-            WeightLayout = new OptionLayout(false, string.Empty);
+            WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
             LimExpLayout = new OptionLayout(true, Limit);
             MidpointLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs
index e0dcaf8..2004f23 100644
--- a/grapher/Layouts/PowerLayout.cs
+++ b/grapher/Layouts/PowerLayout.cs
@@ -14,7 +14,7 @@ namespace grapher.Layouts
             CapLayout = new OptionLayout(true, Cap);
             WeightLayout = new OptionLayout(true, Weight);
             OffsetLayout = new OptionLayout(true, Offset);
-            LimExpLayout = new OptionLayout(true, Limit);
+            LimExpLayout = new OptionLayout(true, Exponent);
             MidpointLayout = new OptionLayout(false, string.Empty);
         }
     }
diff --git a/grapher/Layouts/SigmoidGainLayout.cs b/grapher/Layouts/SigmoidGainLayout.cs
index 183e31f..c807439 100644
--- a/grapher/Layouts/SigmoidGainLayout.cs
+++ b/grapher/Layouts/SigmoidGainLayout.cs
@@ -12,8 +12,8 @@ namespace grapher.Layouts
 
             AccelLayout = new OptionLayout(true, Acceleration);
             CapLayout = new OptionLayout(false, string.Empty);
-            WeightLayout = new OptionLayout(false, string.Empty);
-            OffsetLayout = new OptionLayout(true, Offset);
+            WeightLayout = new OptionLayout(true, Weight);
+            OffsetLayout = new OptionLayout(false, string.Empty);
             LimExpLayout = new OptionLayout(true, Limit);
             MidpointLayout = new OptionLayout(true, Midpoint);
         }