3 files changed, 28 insertions, 23 deletions
diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index 1aa3909..5e4b3de 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -14,18 +14,14 @@ namespace grapher
 {
     public class AccelCharts
     {
-        public const int ChartSeparationVertical = 10;
-
-        /// <summary> Needed to show full contents in form. Unsure why. </summary>
-        public const int FormHeightPadding = 35;
+        #region Constructors
 
         public AccelCharts(
             Form form,
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
-            ToolStripMenuItem enableVelocityAndGain,
-            ICollection<CheckBox> checkBoxesXY)
+            ToolStripMenuItem enableVelocityAndGain)
         {
             Estimated = new EstimatedPoints();
             EstimatedX = new EstimatedPoints();
@@ -37,7 +33,6 @@ namespace grapher
             VelocityChart = velocityChart;
             GainChart = gainChart;
             EnableVelocityAndGain = enableVelocityAndGain;
-            CheckBoxesXY = checkBoxesXY;
 
             SensitivityChart.SetPointBinds(Estimated.Sensitivity, EstimatedX.Sensitivity, EstimatedY.Sensitivity);
             VelocityChart.SetPointBinds(Estimated.Velocity, EstimatedX.Velocity, EstimatedY.Velocity);
@@ -45,9 +40,9 @@ namespace grapher
 
             SensitivityChart.SetTop(0);
             VelocityChart.SetHeight(SensitivityChart.Height);
-            VelocityChart.SetTop(SensitivityChart.Height + ChartSeparationVertical);
+            VelocityChart.SetTop(SensitivityChart.Height + Constants.ChartSeparationVertical);
             GainChart.SetHeight(SensitivityChart.Height);
-            GainChart.SetTop(VelocityChart.Top + VelocityChart.Height + ChartSeparationVertical);
+            GainChart.SetTop(VelocityChart.Top + VelocityChart.Height + Constants.ChartSeparationVertical);
 
             Rectangle screenRectangle = ContaingForm.RectangleToScreen(ContaingForm.ClientRectangle);
             FormBorderHeight = screenRectangle.Top - ContaingForm.Top;
@@ -60,6 +55,10 @@ namespace grapher
             ShowCombined();
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public Form ContaingForm { get; }
 
         public ChartXY SensitivityChart { get; }
@@ -78,12 +77,14 @@ namespace grapher
 
         private EstimatedPoints EstimatedY { get; }
 
-        private ICollection<CheckBox> CheckBoxesXY { get; }
-
         private bool Combined { get; set; }
 
         private int FormBorderHeight { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void MakeDots(int x, int y, double timeInMs)
         {
             if (Combined)
@@ -119,9 +120,9 @@ namespace grapher
             }
         }
 
-        public void RefreshXY()
+        public void RefreshXY(bool isWhole)
         {
-            if (CheckBoxesXY.All(box => box.Checked))
+            if (isWhole)
             {
                 ShowCombined();
             }
@@ -152,10 +153,10 @@ namespace grapher
         {
             VelocityChart.Show();
             GainChart.Show();
-            ContaingForm.Height = SensitivityChart.Height + 
-                                    ChartSeparationVertical +
+            ContaingForm.Height = SensitivityChart.Height +
+                                    Constants.ChartSeparationVertical +
                                     VelocityChart.Height +
-                                    ChartSeparationVertical +
+                                    Constants.ChartSeparationVertical +
                                     GainChart.Height +
                                     FormBorderHeight;
         }
@@ -199,5 +200,7 @@ namespace grapher
         {
             ContaingForm.Width = SensitivityChart.Left + SensitivityChart.Width;
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Charts/ChartXY.cs b/grapher/Models/Charts/ChartXY.cs
index 81874a2..6a65e41 100644
--- a/grapher/Models/Charts/ChartXY.cs
+++ b/grapher/Models/Charts/ChartXY.cs
@@ -15,12 +15,6 @@ namespace grapher
 {
     public class ChartXY
     {
-        #region Consts
-
-        public const int ChartSeparationHorizontal = 10;
-
-        #endregion Consts
-
         #region Constructors
 
         public ChartXY(Chart chartX, Chart chartY)
@@ -31,7 +25,7 @@ namespace grapher
             ChartY.Top = ChartX.Top;
             ChartY.Height = ChartX.Height;
             ChartY.Width = ChartX.Width;
-            ChartY.Left = ChartX.Left + ChartX.Width + ChartSeparationHorizontal;
+            ChartY.Left = ChartX.Left + ChartX.Width + Constants.ChartSeparationHorizontal;
 
             SetupChart(ChartX);
             SetupChart(ChartY);
diff --git a/grapher/Models/Charts/EstimatedPoints.cs b/grapher/Models/Charts/EstimatedPoints.cs
index fa0718b..9ff0e5b 100644
--- a/grapher/Models/Charts/EstimatedPoints.cs
+++ b/grapher/Models/Charts/EstimatedPoints.cs
@@ -9,6 +9,8 @@ namespace grapher.Models.Charts
 {
     public class EstimatedPoints
     {
+        #region Constructors
+
         public EstimatedPoints()
         {
             Sensitivity = new PointData();
@@ -16,10 +18,16 @@ namespace grapher.Models.Charts
             Gain = new PointData();
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public PointData Sensitivity { get; }
 
         public PointData Velocity { get; }
 
         public PointData Gain { get; }
+
+        #endregion Properties
     }
 }