diff options
| author | JacobPalecki <[email protected]> | 2020-08-31 23:03:46 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-31 23:03:46 -0700 |
| commit | 471fe599bab6ba0632ddd1dacd20c7fc42db0eee (patch) | |
| tree | 90a82ee14dbb112621657efbd2523ed35f59d154 /grapher/Models/Calculations | |
| parent | Merge pull request #16 from JacobPalecki/Misc (diff) | |
| parent | add independent xy accel to driver (diff) | |
| download | rawaccel-471fe599bab6ba0632ddd1dacd20c7fc42db0eee.tar.xz rawaccel-471fe599bab6ba0632ddd1dacd20c7fc42db0eee.zip | |
Merge pull request #17 from a1xd/indep
Indep
Diffstat (limited to 'grapher/Models/Calculations')
| -rw-r--r-- | grapher/Models/Calculations/AccelCalculator.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs index 63ed281..102de8d 100644 --- a/grapher/Models/Calculations/AccelCalculator.cs +++ b/grapher/Models/Calculations/AccelCalculator.cs @@ -1,4 +1,5 @@ -using System; +using grapher.Models.Serialized; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -46,15 +47,15 @@ namespace grapher.Models.Calculations private int Increment { get; set; } - public void Calculate(AccelData data, ManagedAccel accel) + public void Calculate(AccelData data, ManagedAccel accel, DriverSettings settings) { ScaleByMouseSettings(); data.Clear(); - Calculate(data.Combined, accel, accel.SensitivityX, MagnitudesCombined); - Calculate(data.X, accel, accel.SensitivityX, MagnitudesX); - Calculate(data.Y, accel, accel.SensitivityY, MagnitudesY); + Calculate(data.Combined, accel, settings.sensitivity.x, MagnitudesCombined); + Calculate(data.X, accel, settings.sensitivity.x, MagnitudesX); + Calculate(data.Y, accel, settings.sensitivity.y, MagnitudesY); } public static void Calculate(AccelChartData data, ManagedAccel accel, double starter, ICollection<MagnitudeData> magnitudeData) |