From 7a572b68825c270a4c0c024c0870367793e06913 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 16 Sep 2020 19:11:18 -0700 Subject: Fix cap options, fix power style labels --- grapher/Layouts/PowerLayout.cs | 2 +- grapher/Models/Options/CapOptions.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs index e0dcaf8..2004f23 100644 --- a/grapher/Layouts/PowerLayout.cs +++ b/grapher/Layouts/PowerLayout.cs @@ -14,7 +14,7 @@ namespace grapher.Layouts CapLayout = new OptionLayout(true, Cap); WeightLayout = new OptionLayout(true, Weight); OffsetLayout = new OptionLayout(true, Offset); - LimExpLayout = new OptionLayout(true, Limit); + LimExpLayout = new OptionLayout(true, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); } } diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs index 5e47d7b..05a6181 100644 --- a/grapher/Models/Options/CapOptions.cs +++ b/grapher/Models/Options/CapOptions.cs @@ -194,7 +194,7 @@ namespace grapher void OnSensitivityCapCheckedChange(object sender, EventArgs e) { - if (LegacyCapCheck.Checked == true) + if (LegacyCapCheck.Checked) { EnableSensitivityCap(); } @@ -202,7 +202,7 @@ namespace grapher void OnVelocityGainCapCheckedChange(object sender, EventArgs e) { - if (LegacyCapCheck.Checked == true) + if (VelocityGainCapCheck.Checked) { EnableVelocityGainCap(); } -- cgit v1.2.3 From ab90c152742acd9e5abd8542f0660d54aff6bf16 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 16 Sep 2020 20:12:15 -0700 Subject: Fix cap options pt 2 --- driver/driver.vcxproj | 1 + grapher/Models/Options/CapOptions.cs | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/driver/driver.vcxproj b/driver/driver.vcxproj index 9ebcf31..bee36c4 100644 --- a/driver/driver.vcxproj +++ b/driver/driver.vcxproj @@ -108,6 +108,7 @@ true Precise StdCall + MaxSpeed %(AdditionalLibraryDirectories) diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs index 05a6181..c459c50 100644 --- a/grapher/Models/Options/CapOptions.cs +++ b/grapher/Models/Options/CapOptions.cs @@ -156,16 +156,16 @@ namespace grapher CapOption.ActiveValueLabel.FormatString = Constants.GainCapFormatString; CapOption.ActiveValueLabel.Prefix = "Gain"; CapOption.SetActiveValue(gainCap); - LegacyCapCheck.Checked = true; - VelocityGainCapCheck.Checked = false; + LegacyCapCheck.Checked = false; + VelocityGainCapCheck.Checked = true; } else { CapOption.ActiveValueLabel.FormatString = Constants.DefaultActiveValueFormatString; CapOption.ActiveValueLabel.Prefix = string.Empty; CapOption.SetActiveValue(sensCap); - LegacyCapCheck.Checked = false; - VelocityGainCapCheck.Checked = true; + LegacyCapCheck.Checked = true; + VelocityGainCapCheck.Checked = false; } } -- cgit v1.2.3 From 82b49b149f998a878375e6158e97667a9ea26097 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 16 Sep 2020 20:42:37 -0700 Subject: Fix chart scaling for DPIs < 1200 --- grapher/Models/Calculations/AccelCalculator.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs index 092a7aa..4627732 100644 --- a/grapher/Models/Calculations/AccelCalculator.cs +++ b/grapher/Models/Calculations/AccelCalculator.cs @@ -46,6 +46,8 @@ namespace grapher.Models.Calculations private double XYMaxVelocity { get; set; } private int Increment { get; set; } + + private double MeasurementTime { get; set; } #endregion Fields @@ -62,14 +64,14 @@ namespace grapher.Models.Calculations Calculate(data.Y, accel, settings.sensitivity.y, MagnitudesY); } - public static void Calculate(AccelChartData data, ManagedAccel accel, double starter, ICollection magnitudeData) + public void Calculate(AccelChartData data, ManagedAccel accel, double starter, ICollection magnitudeData) { double lastInputMagnitude = 0; double lastOutputMagnitude = 0; foreach (var magnitudeDatum in magnitudeData) { - var output = accel.Accelerate(magnitudeDatum.x, magnitudeDatum.y, 1); + var output = accel.Accelerate(magnitudeDatum.x, magnitudeDatum.y, MeasurementTime); var outMagnitude = Magnitude(output.Item1, output.Item2); var ratio = magnitudeDatum.magnitude > 0 ? outMagnitude / magnitudeDatum.magnitude : starter; @@ -176,7 +178,9 @@ namespace grapher.Models.Calculations { var dpiPollFactor = DPI.Data / PollRate.Data; CombinedMaxVelocity = dpiPollFactor * Constants.MaxMultiplier; - Increment = (int)Math.Floor(CombinedMaxVelocity / Constants.Resolution); + var ratio = CombinedMaxVelocity / Constants.Resolution; + Increment = ratio > 1 ? (int) Math.Floor(ratio) : 1; + MeasurementTime = Increment == 1 ? 1 / ratio : 1; XYMaxVelocity = CombinedMaxVelocity * Constants.XYToCombinedRatio; MagnitudesCombined = GetMagnitudes(); MagnitudesX = GetMagnitudesX(); -- cgit v1.2.3