UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/sequence/graph/curve_view_range] Do not set m_xMin|Max twice

Browse Source
This commit is contained in:
Ruben Dashyan
2019-06-27 16:32:14 +02:00
parent fe95528f02
commit 554175d725
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/sequence/graph/curve_view_range.cpp
View File

@@ -19,16 +19,16 @@ void CurveViewRange::roundAbscissa() {
float halfScreenWidth = ((float)Ion::Display::Width)/2.0f;
float newXMin = clipped(roundedXMean - halfScreenWidth, false);
float newXMax = clipped(roundedXMean + halfScreenWidth - 1.0f, true);
float interestingXMin = m_delegate->interestingXMin();
if (newXMin < interestingXMin) {
newXMin = interestingXMin - k_displayLeftMarginRatio * (float)Ion::Display::Width;
newXMax = newXMin + (float)Ion::Display::Width;
}
if (std::isnan(newXMin) || std::isnan(newXMax)) {
return;
}
m_xMin = newXMin;
m_xMax = newXMax;
float interestingXMin = m_delegate->interestingXMin();
if (m_xMin < interestingXMin) {
m_xMin = interestingXMin - k_displayLeftMarginRatio * (float)Ion::Display::Width;
m_xMax = m_xMin + (float)Ion::Display::Width;
}
m_xGridUnit = computeGridUnit(Axis::X, m_xMax - m_xMin);
if (m_delegate) {
m_delegate->didChangeRange(this);
@@ -42,16 +42,16 @@ void CurveViewRange::normalize() {
// Compute the X
float newXMin = clipped(xMean - NormalizedXHalfRange(), false);
float newXMax = clipped(xMean + NormalizedXHalfRange(), true);
float interestingXMin = m_delegate->interestingXMin();
if (newXMin < interestingXMin) {
newXMin = interestingXMin -k_displayLeftMarginRatio*2.0f*NormalizedXHalfRange();
newXMax = newXMin + 2.0f*NormalizedXHalfRange();
}
if (!std::isnan(newXMin) && !std::isnan(newXMax)) {
m_xMin = newXMin;
m_xMax = newXMax;
m_xGridUnit = computeGridUnit(Axis::X, m_xMax - m_xMin);
}
float interestingXMin = m_delegate->interestingXMin();
if (m_xMin < interestingXMin) {
m_xMin = interestingXMin -k_displayLeftMarginRatio*2.0f*NormalizedXHalfRange();
m_xMax = m_xMin + 2.0f*NormalizedXHalfRange();
}
// Compute the Y
m_yAuto = false;