Merge pull request #33 from a1xd/1.1v1.1.0

1.1

3 files changed, 11 insertions, 86 deletions

diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index 7484a3a..6247811 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -13,7 +13,7 @@ namespace grapher
         #region Constructors
 
         public AccelCharts(
-            Form form,
+            RawAcceleration form,
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
@@ -34,10 +34,6 @@ namespace grapher
             EnableLastValue = enableLastMouseMove;
             WriteButton = writeButton;
 
-
-            Rectangle screenRectangle = ContainingForm.RectangleToScreen(ContainingForm.ClientRectangle);
-            FormBorderHeight = screenRectangle.Top - ContainingForm.Top;
-
             EnableVelocityAndGain.Click += new System.EventHandler(OnEnableClick);
             EnableVelocityAndGain.CheckedChanged += new System.EventHandler(OnEnableVelocityGainCheckStateChange);
 
@@ -52,7 +48,7 @@ namespace grapher
 
         #region Properties
 
-        public Form ContainingForm { get; }
+        public RawAcceleration ContainingForm { get; }
 
         public ToolStripMenuItem EnableVelocityAndGain { get; }
 
@@ -125,23 +121,9 @@ namespace grapher
         {
             ChartState = ChartStateManager.DetermineState(driverSettings);
             ChartState.Activate();
-            UpdateFormWidth();
             Bind();
         }
 
-        public void SetWidened()
-        {
-            ChartState.SetWidened();
-            UpdateFormWidth();
-            AlignWriteButton();
-        }
-
-        public void SetNarrowed()
-        {
-            ChartState.SetNarrowed();
-            UpdateFormWidth();
-            AlignWriteButton();
-        }
 
         public void Redraw()
         {
@@ -176,8 +158,6 @@ namespace grapher
             velocityChart.SetTop(sensitivityChart.Height + Constants.ChartSeparationVertical);
             gainChart.SetHeight(sensitivityChart.Height);
             gainChart.SetTop(velocityChart.Top + velocityChart.Height + Constants.ChartSeparationVertical);
-
-            sensitivityChart.Show();
         }
 
         private void OnEnableClick(object sender, EventArgs e)
@@ -187,6 +167,7 @@ namespace grapher
 
         private void OnEnableVelocityGainCheckStateChange(object sender, EventArgs e)
         {
+            ContainingForm.ResetAutoScroll();
             if (EnableVelocityAndGain.Checked)
             {
                 ShowVelocityAndGain();
@@ -207,17 +188,12 @@ namespace grapher
 
         private void ShowVelocityAndGain()
         {
-            ChartState.ShowVelocityAndGain(ContainingForm, FormBorderHeight);
+            ChartState.ShowVelocityAndGain();
         }
 
         private void HideVelocityAndGain()
         {
-            ChartState.HideVelocityAndGain(ContainingForm, FormBorderHeight);
-        }
-
-        private void UpdateFormWidth()
-        {
-            ContainingForm.Width = ChartState.SensitivityChart.Left + ChartState.SensitivityChart.Width;
+            ChartState.HideVelocityAndGain();
         }
 
         private void AlignWriteButton()
diff --git a/grapher/Models/Charts/ChartState/ChartState.cs b/grapher/Models/Charts/ChartState/ChartState.cs
index 1898e12..270e212 100644
--- a/grapher/Models/Charts/ChartState/ChartState.cs
+++ b/grapher/Models/Charts/ChartState/ChartState.cs
@@ -68,20 +68,6 @@ namespace grapher.Models.Charts.ChartState
             GainChart.DrawLastMovementValue(TwoDotsPerGraph);
         }
 
-        public void SetWidened()
-        {
-            SensitivityChart.SetWidened();
-            VelocityChart.SetWidened();
-            GainChart.SetWidened();
-        }
-
-        public void SetNarrowed()
-        {
-            SensitivityChart.SetNarrowed();
-            VelocityChart.SetNarrowed();
-            GainChart.SetNarrowed();
-        }
-
         public void ClearLastValue()
         {
             SensitivityChart.ClearLastValue();
@@ -89,23 +75,16 @@ namespace grapher.Models.Charts.ChartState
             GainChart.ClearLastValue();
         }
 
-        public void ShowVelocityAndGain(Form form, int borderHeight)
+        public void ShowVelocityAndGain()
         {
             VelocityChart.Show();
             GainChart.Show();
-            form.Height = SensitivityChart.Height +
-                                    Constants.ChartSeparationVertical +
-                                    VelocityChart.Height +
-                                    Constants.ChartSeparationVertical +
-                                    GainChart.Height +
-                                    borderHeight;
         }
 
-        public void HideVelocityAndGain(Form form, int borderHeight)
+        public void HideVelocityAndGain()
         {
             VelocityChart.Hide();
             GainChart.Hide();
-            form.Height = SensitivityChart.Height + borderHeight;
         }
 
         public void SetLogarithmic(bool x, bool y)
diff --git a/grapher/Models/Charts/ChartXY.cs b/grapher/Models/Charts/ChartXY.cs
index 27b63b5..98ba059 100644
--- a/grapher/Models/Charts/ChartXY.cs
+++ b/grapher/Models/Charts/ChartXY.cs
@@ -24,9 +24,7 @@ namespace grapher
 
             Combined = false;
             SetCombined();
-
-            Widened = false;
-            SetWidened();
+            Visible = true;
         }
 
         #endregion Constructors
@@ -72,11 +70,9 @@ namespace grapher
             }
         }
 
-        public bool Combined { get; private set; }
-
-        public bool Widened { get; private set; }
+        public bool Combined { get; set; }
 
-        public bool Visible { get; private set; }
+        public bool Visible { get; set; }
 
         public string Title { get; }
 
@@ -273,36 +269,10 @@ namespace grapher
             }
         }
 
-        public void SetWidened()
-        {
-            if (!Widened)
-            {
-                ChartX.Width = Constants.WideChartWidth;
-                ChartY.Width = Constants.WideChartWidth;
-
-                ChartX.Left = Constants.WideChartLeft;
-                ChartY.Left = ChartX.Left + ChartX.Width + Constants.ChartSeparationHorizontal;
-
-                Widened = true;
-            }
-        }
-
-        public void SetNarrowed()
-        {
-            if (Widened)
-            {
-                ChartX.Width = Constants.NarrowChartWidth;
-                ChartY.Width = Constants.NarrowChartWidth;
-
-                ChartX.Left = Constants.NarrowChartLeft;
-                ChartY.Left = ChartX.Left + ChartX.Width + Constants.ChartSeparationHorizontal;
-
-                Widened = false;
-            }
-        }
 
         public void Hide()
         {
+
             if (Visible)
             {
                 ChartX.Hide();