From 246fb772c5bf7dd6a85143fadebece3b4d9f1e04 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Tue, 1 Sep 2020 02:18:41 -0700
Subject: Add constants class and separate classes into regions

---
 grapher/Models/Calculations/AccelCalculator.cs | 28 +++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'grapher/Models/Calculations/AccelCalculator.cs')

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
     }
 }
-- 
cgit v1.2.3


From 4aa2f3ed741dcbd39233e125a34cac8163267d8d Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Tue, 1 Sep 2020 02:39:09 -0700
Subject: Move constants to central class

---
 grapher/Models/Calculations/AccelCalculator.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'grapher/Models/Calculations/AccelCalculator.cs')

diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index 0f0a60a..4e44902 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -1,5 +1,4 @@
-using grapher.Constants;
-using grapher.Models.Serialized;
+using grapher.Models.Serialized;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -179,9 +178,9 @@ namespace grapher.Models.Calculations
         public void ScaleByMouseSettings()
         {
             var dpiPollFactor = DPI.Data / PollRate.Data;
-            CombinedMaxVelocity = dpiPollFactor * AccelGUIConstants.MaxMultiplier;
-            Increment = (int) Math.Floor(CombinedMaxVelocity / AccelGUIConstants.Resolution);
-            XYMaxVelocity = CombinedMaxVelocity * AccelGUIConstants.XYToCombinedRatio;
+            CombinedMaxVelocity = dpiPollFactor * Constants.MaxMultiplier;
+            Increment = (int)Math.Floor(CombinedMaxVelocity / Constants.Resolution);
+            XYMaxVelocity = CombinedMaxVelocity * Constants.XYToCombinedRatio;
             MagnitudesCombined = GetMagnitudes();
             MagnitudesX = GetMagnitudesX();
             MagnitudesY = GetMagnitudesY();
-- 
cgit v1.2.3


From 9502dcf7608475857b1487375997d20a9d29622e Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Tue, 8 Sep 2020 01:26:22 -0700
Subject: Remove and sort usings en masse

---
 grapher/Models/Calculations/AccelCalculator.cs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'grapher/Models/Calculations/AccelCalculator.cs')

diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index 4e44902..092a7aa 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -3,9 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace grapher.Models.Calculations
 {
-- 
cgit v1.2.3