Add constants class and separate classes into regions

3 files changed, 41 insertions, 9 deletions

diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index 102de8d..0f0a60a 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -1,4 +1,5 @@
-using grapher.Models.Serialized;
+using grapher.Constants;
+using grapher.Models.Serialized;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -11,11 +12,7 @@ namespace grapher.Models.Calculations
 {
     public class AccelCalculator
     {
-        public const int DefaultDPI = 1200;
-        public const int DefaultPollRate = 1000;
-        public const int Resolution = 100;
-        public const double MaxMultiplier = 85;
-        public const double XYToCombinedRatio = 1.3;
+        #region Structs
 
         public struct MagnitudeData
         {
@@ -24,6 +21,9 @@ namespace grapher.Models.Calculations
             public int y;
         }
 
+        #endregion Structs
+
+        #region Constructors
 
         public AccelCalculator(Field dpi, Field pollRate)
         {
@@ -31,6 +31,10 @@ namespace grapher.Models.Calculations
             PollRate = pollRate;
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public ReadOnlyCollection<MagnitudeData> MagnitudesCombined { get; private set; }
 
         public ReadOnlyCollection<MagnitudeData> MagnitudesX { get; private set; }
@@ -47,6 +51,10 @@ namespace grapher.Models.Calculations
 
         private int Increment { get; set; }
 
+        #endregion Fields
+
+        #region Methods
+
         public void Calculate(AccelData data, ManagedAccel accel, DriverSettings settings)
         {
             ScaleByMouseSettings();
@@ -171,12 +179,14 @@ namespace grapher.Models.Calculations
         public void ScaleByMouseSettings()
         {
             var dpiPollFactor = DPI.Data / PollRate.Data;
-            CombinedMaxVelocity = dpiPollFactor * MaxMultiplier;
-            Increment = (int) Math.Floor(CombinedMaxVelocity / Resolution);
-            XYMaxVelocity = CombinedMaxVelocity * 1.5;
+            CombinedMaxVelocity = dpiPollFactor * AccelGUIConstants.MaxMultiplier;
+            Increment = (int) Math.Floor(CombinedMaxVelocity / AccelGUIConstants.Resolution);
+            XYMaxVelocity = CombinedMaxVelocity * AccelGUIConstants.XYToCombinedRatio;
             MagnitudesCombined = GetMagnitudes();
             MagnitudesX = GetMagnitudesX();
             MagnitudesY = GetMagnitudesY();
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Calculations/AccelChartData.cs b/grapher/Models/Calculations/AccelChartData.cs
index 20142a7..6b29f16 100644
--- a/grapher/Models/Calculations/AccelChartData.cs
+++ b/grapher/Models/Calculations/AccelChartData.cs
@@ -8,6 +8,8 @@ namespace grapher.Models.Calculations
 {
     public class AccelChartData
     {
+        #region Constructors
+
         public AccelChartData()
         {
             AccelPoints = new SortedDictionary<double, double>();
@@ -17,6 +19,10 @@ namespace grapher.Models.Calculations
             OutVelocityToPoints = new Dictionary<double, (double, double, double)>();
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public SortedDictionary<double, double> AccelPoints { get; }
 
         public SortedDictionary<double, double> VelocityPoints { get; }
@@ -27,6 +33,10 @@ namespace grapher.Models.Calculations
 
         public Dictionary<double, (double, double, double)> OutVelocityToPoints { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void Clear()
         {
             AccelPoints.Clear();
@@ -57,5 +67,7 @@ namespace grapher.Models.Calculations
                 return values;
             }
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Calculations/AccelData.cs b/grapher/Models/Calculations/AccelData.cs
index 683c67e..3e1f987 100644
--- a/grapher/Models/Calculations/AccelData.cs
+++ b/grapher/Models/Calculations/AccelData.cs
@@ -10,6 +10,7 @@ namespace grapher.Models.Calculations
 {
     public class AccelData
     {
+        #region Constructors
 
         public AccelData(
             EstimatedPoints combined,
@@ -25,6 +26,10 @@ namespace grapher.Models.Calculations
             EstimatedY = y;
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public AccelChartData Combined { get; }
 
         public AccelChartData X { get; }
@@ -37,6 +42,10 @@ namespace grapher.Models.Calculations
 
         private EstimatedPoints EstimatedY { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void Clear()
         {
             Combined.Clear();
@@ -70,5 +79,6 @@ namespace grapher.Models.Calculations
             EstimatedY.Gain.Set(inYVelocity, yGain);
         }
 
+        #endregion Methods
     }
 }