From f54b15b9c8db293719c4b97d933578005bcf238a Mon Sep 17 00:00:00 2001 From: Gabriel Ozouf Date: Thu, 8 Oct 2020 17:31:27 +0200 Subject: [PATCH] [interactive_curve_view_range] Preserve ratio Preserve orthonormality when adding margins to a default range. Change-Id: Iaa1da8d36812e2dad1be3894198ee0fabcd3020f --- apps/shared/interactive_curve_view_range.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/shared/interactive_curve_view_range.cpp b/apps/shared/interactive_curve_view_range.cpp index 31e87abb6..8a4d11033 100644 --- a/apps/shared/interactive_curve_view_range.cpp +++ b/apps/shared/interactive_curve_view_range.cpp @@ -111,6 +111,7 @@ void InteractiveCurveViewRange::setDefault() { // Compute the interesting range m_delegate->interestingRanges(this); + bool revertToNormalized = isOrthonormal(); // Add margins float xRange = xMax() - xMin(); @@ -121,7 +122,7 @@ void InteractiveCurveViewRange::setDefault() { m_yRange.setMin(m_delegate->addMargin(yMin(), yRange, true, true), k_lowerMaxFloat, k_upperMaxFloat); MemoizedCurveViewRange::protectedSetYMax(m_delegate->addMargin(yMax(), yRange, true, false), k_lowerMaxFloat, k_upperMaxFloat); - if (!m_delegate->defaultRangeIsNormalized()) { + if (!(m_delegate->defaultRangeIsNormalized() || revertToNormalized)) { return; }