From 7479114121b6c91812b68b598ca360f4d916cb93 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 22 Jan 2021 19:08:11 -0800 Subject: Fix graphing error in by component graph calculation --- grapher/Models/Calculations/AccelCalculator.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs index 60c6eaa..d641873 100644 --- a/grapher/Models/Calculations/AccelCalculator.cs +++ b/grapher/Models/Calculations/AccelCalculator.cs @@ -136,6 +136,11 @@ namespace grapher.Models.Calculations var ratio = outMagnitude / simulatedInputDatum.velocity; var slope = inDiff > 0 ? outDiff / inDiff : starter; + if (slope < lastSlope) + { + Console.WriteLine(); + } + if (ratio > maxRatio) { maxRatio = ratio; @@ -398,8 +403,8 @@ namespace grapher.Models.Calculations var timeFactor = ceil / i; mouseInputData.x = 0; mouseInputData.y = ceil; - mouseInputData.time = MeasurementTime; - mouseInputData.velocity = Velocity(0, i, mouseInputData.time); + mouseInputData.time = MeasurementTime*timeFactor; + mouseInputData.velocity = Velocity(0, ceil, mouseInputData.time); mouseInputData.angle = Math.PI / 2; magnitudes.Add(mouseInputData); } -- cgit v1.2.3 From daae5529514c8916ce940e150d97baa465222ff4 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 22 Jan 2021 19:14:45 -0800 Subject: Fix anisotropy panel covering bottom classic option in by component --- grapher/Constants/Constants.cs | 2 +- grapher/Models/AccelGUIFactory.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grapher/Constants/Constants.cs b/grapher/Constants/Constants.cs index d58c5cf..446f5fa 100644 --- a/grapher/Constants/Constants.cs +++ b/grapher/Constants/Constants.cs @@ -44,7 +44,7 @@ namespace grapher public const int DropDownLeftSeparation = 10; /// Height of sensitivity chart when displayed alone. - public const int SensitivityChartAloneHeight = 450; + public const int SensitivityChartAloneHeight = 455; /// Height of sensitivity chart when displayed alongside Velocity and Gain charts. public const int SensitivityChartTogetherHeight = 328; diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 6a4c46f..1c42c76 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -381,7 +381,7 @@ namespace grapher.Models range, wholeCheckBox, byComponentCheckBox, - 245); + 260); var applyOptions = new ApplyOptions( byComponentXYLock, -- cgit v1.2.3 From 66cf99e8fb3e9a7c3bac607cebd98c11f73c5545 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Fri, 22 Jan 2021 23:27:13 -0500 Subject: fix last mouse move - swapped axes --- grapher/Models/Charts/AccelCharts.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs index 2369432..65c636b 100644 --- a/grapher/Models/Charts/AccelCharts.cs +++ b/grapher/Models/Charts/AccelCharts.cs @@ -31,8 +31,8 @@ namespace grapher gainChart, accelCalculator, estimated, - estimatedY, - estimatedX); + estimatedX, + estimatedY); ContainingForm = form; EnableVelocityAndGain = enableVelocityAndGain; -- cgit v1.2.3