Fix bug & rename x axis to input speed

3 files changed, 22 insertions, 11 deletions

diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index 46b7a9a..ecfb978 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -166,7 +166,7 @@ namespace grapher
             // 
             // AccelerationChart
             // 
-            chartArea1.AxisX.Title = "Speed (counts/ms)";
+            chartArea1.AxisX.Title = "Input Speed (counts/ms)";
             chartArea1.AxisY.Title = "Ratio of Output to Input";
             chartArea1.Name = "ChartArea1";
             this.AccelerationChart.ChartAreas.Add(chartArea1);
@@ -400,7 +400,7 @@ namespace grapher
             // 
             // VelocityChart
             // 
-            chartArea2.AxisX.Title = "Speed (count/ms)";
+            chartArea2.AxisX.Title = "Input Speed (count/ms)";
             chartArea2.AxisY.Title = "Output Speed (counts/ms)";
             chartArea2.Name = "ChartArea1";
             this.VelocityChart.ChartAreas.Add(chartArea2);
@@ -441,7 +441,7 @@ namespace grapher
             // 
             // GainChart
             // 
-            chartArea3.AxisX.Title = "Speed (counts/ms)";
+            chartArea3.AxisX.Title = "Input Speed (counts/ms)";
             chartArea3.AxisY.Title = "Slope of Velocity Chart";
             chartArea3.Name = "ChartArea1";
             this.GainChart.ChartAreas.Add(chartArea3);
@@ -580,7 +580,7 @@ namespace grapher
             this.gainCapToolStripMenuItem,
             this.legacyCapToolStripMenuItem});
             this.capStyleToolStripMenuItem.Name = "capStyleToolStripMenuItem";
-            this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
             this.capStyleToolStripMenuItem.Text = "Cap Style";
             // 
             // gainCapToolStripMenuItem
@@ -603,7 +603,7 @@ namespace grapher
             this.gainOffsetToolStripMenuItem,
             this.legacyOffsetToolStripMenuItem});
             this.offsetStyleToolStripMenuItem.Name = "offsetStyleToolStripMenuItem";
-            this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
             this.offsetStyleToolStripMenuItem.Text = "Offset Style";
             // 
             // gainOffsetToolStripMenuItem
@@ -624,7 +624,7 @@ namespace grapher
             this.wholeVectorToolStripMenuItem,
             this.byVectorComponentToolStripMenuItem});
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(163, 22);
             this.toolStripMenuItem1.Text = "Application Style";
             // 
             // wholeVectorToolStripMenuItem
@@ -661,7 +661,7 @@ namespace grapher
             // 
             // AccelerationChartY
             // 
-            chartArea4.AxisX.Title = "Speed (counts/ms)";
+            chartArea4.AxisX.Title = "Input Speed (counts/ms)";
             chartArea4.AxisY.Title = "Ratio of Output to Input)";
             chartArea4.Name = "ChartArea1";
             this.AccelerationChartY.ChartAreas.Add(chartArea4);
@@ -697,7 +697,7 @@ namespace grapher
             // 
             // VelocityChartY
             // 
-            chartArea5.AxisX.Title = "Speed (count/ms)";
+            chartArea5.AxisX.Title = "Input Speed (count/ms)";
             chartArea5.AxisY.Title = "Output Speed (counts/ms)";
             chartArea5.Name = "ChartArea1";
             this.VelocityChartY.ChartAreas.Add(chartArea5);
@@ -733,7 +733,7 @@ namespace grapher
             // 
             // GainChartY
             // 
-            chartArea6.AxisX.Title = "Speed (counts/ms)";
+            chartArea6.AxisX.Title = "Input Speed (counts/ms)";
             chartArea6.AxisY.Title = "Slope of Velocity Chart";
             chartArea6.Name = "ChartArea1";
             this.GainChartY.ChartAreas.Add(chartArea6);
diff --git a/grapher/Models/Charts/ChartXY.cs b/grapher/Models/Charts/ChartXY.cs
index b17960b..c5c00d1 100644
--- a/grapher/Models/Charts/ChartXY.cs
+++ b/grapher/Models/Charts/ChartXY.cs
@@ -134,18 +134,22 @@ namespace grapher
 
         public static void SetLogarithmic(Chart chart)
         {
+            /*
             chart.ChartAreas[0].AxisX.Minimum = 0.001;
             chart.ChartAreas[0].AxisX.Maximum = 3500;
             chart.ChartAreas[0].AxisY.Minimum = 0.001;
             chart.ChartAreas[0].AxisY.Maximum = 10;
             chart.ChartAreas[0].AxisX.IsLogarithmic = true;
             chart.ChartAreas[0].AxisY.IsLogarithmic = true;
+            */
         }
 
         public static void SetStandard(Chart chart)
         {
+            /*
             chart.ChartAreas[0].AxisX.IsLogarithmic = false;
             chart.ChartAreas[0].AxisY.IsLogarithmic = false;
+            */
         }
 
         public void SetPointBinds(PointData combined, PointData x, PointData y)
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()