diff options
| author | a1xd <[email protected]> | 2020-10-15 22:01:57 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-15 22:01:57 -0400 |
| commit | 4306e7ef3331e8b0c1be163b301a8346c222f614 (patch) | |
| tree | 0db1a5fa5c155e3c69b88cfd852838ab3c1d0cfc /grapher/Models/Charts | |
| parent | Merge pull request #35 from a1xd/1.1.1 (diff) | |
| parent | Merge remote-tracking branch 'downstream/GUI' into gain-conv-fix (diff) | |
| download | rawaccel-1.1.1.tar.xz rawaccel-1.1.1.zip | |
Merge pull request #36 from a1xd/gain-conv-fixv1.1.1
fix gain cap conversion
Diffstat (limited to 'grapher/Models/Charts')
| -rw-r--r-- | grapher/Models/Charts/ChartState/CombinedState.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Charts/ChartState/XYOneGraphState.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Charts/ChartState/XYTwoGraphState.cs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/grapher/Models/Charts/ChartState/CombinedState.cs b/grapher/Models/Charts/ChartState/CombinedState.cs index 802c392..aab8a38 100644 --- a/grapher/Models/Charts/ChartState/CombinedState.cs +++ b/grapher/Models/Charts/ChartState/CombinedState.cs @@ -46,7 +46,7 @@ namespace grapher.Models.Charts.ChartState public override void Calculate(ManagedAccel accel, DriverSettings settings) { - Calculator.Calculate(Data.Combined, accel, settings.sensitivity.x, Calculator.MagnitudesCombined); + Calculator.Calculate(Data.Combined, accel, settings.sensitivity.x, Calculator.SimulatedInputCombined); } } } diff --git a/grapher/Models/Charts/ChartState/XYOneGraphState.cs b/grapher/Models/Charts/ChartState/XYOneGraphState.cs index 6bfaac5..92c799f 100644 --- a/grapher/Models/Charts/ChartState/XYOneGraphState.cs +++ b/grapher/Models/Charts/ChartState/XYOneGraphState.cs @@ -44,7 +44,7 @@ namespace grapher.Models.Charts.ChartState public override void Calculate(ManagedAccel accel, DriverSettings settings) { - Calculator.CalculateCombinedDiffSens(Data, accel, settings, Calculator.MagnitudesCombined); + Calculator.CalculateCombinedDiffSens(Data, accel, settings, Calculator.SimulatedInputCombined); } } } diff --git a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs index 017d3d1..22181ad 100644 --- a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs +++ b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs @@ -76,8 +76,8 @@ namespace grapher.Models.Charts.ChartState public override void Calculate(ManagedAccel accel, DriverSettings settings) { - Calculator.Calculate(Data.X, accel, settings.sensitivity.x, Calculator.MagnitudesX); - Calculator.Calculate(Data.Y, accel, settings.sensitivity.y, Calculator.MagnitudesY); + Calculator.Calculate(Data.X, accel, settings.sensitivity.x, Calculator.SimulatedInputX); + Calculator.Calculate(Data.Y, accel, settings.sensitivity.y, Calculator.SimulatedInputY); } } } |