UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/zoom] Factor range sanitation

Browse Source 
Checking wether the range that has been computed is suitable is now
done in Poincare::Zoom by SanitizeRange.

Change-Id: Ib7ff73a3beae29996b1a773744021ad85c6ba946
This commit is contained in:
Gabriel Ozouf
2020-10-15 16:04:25 +02:00
committed by Émilie Feral
parent b10be2c60c
commit c4cd3ecffa
5 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/shared/function_graph_controller.cpp
View File

@@ -160,14 +160,12 @@ void FunctionGraphController::interestingRanges(InteractiveCurveViewRange * rang
float xMin, xMax, yMin, yMax;
Poincare::Zoom::CombineRanges(length, xMins, xMaxs, &xMin, &xMax);
Poincare::Zoom::CombineRanges(length, yMins, yMaxs, &yMin, &yMax);
if (std::isfinite(xMin) && std::isfinite(xMax) && std::isfinite(yMin) && std::isfinite(yMax) && xMax > xMin && yMax > yMin) {
range->setXMin(xMin);
range->setXMax(xMax);
range->setYMin(yMin);
range->setYMax(yMax);
} else {
range->setNullRange();
}
Poincare::Zoom::SanitizeRange(&xMin, &xMax, &yMin, &yMax, range->NormalYXRatio());
range->setXMin(xMin);
range->setXMax(xMax);
range->setYMin(yMin);
range->setYMax(yMax);
}
}

8
apps/shared/interactive_curve_view_range.cpp
View File

@@ -137,14 +137,6 @@ void InteractiveCurveViewRange::setDefault() {
setZoomAuto(true);
}
void InteractiveCurveViewRange::setNullRange() {
m_xRange.setMin(- Range1D::k_default);
setXMax(Range1D::k_default);
m_yRange.setMin(0);
m_yRange.setMax(0);
normalize();
}
void InteractiveCurveViewRange::centerAxisAround(Axis axis, float position) {
if (std::isnan(position)) {
return;

1
apps/shared/interactive_curve_view_range.h
View File

@@ -44,7 +44,6 @@ public:
void panWithVector(float x, float y);
virtual void normalize();
virtual void setDefault();
void setNullRange();
void centerAxisAround(Axis axis, float position);
void panToMakePointVisible(float x, float y, float topMarginRatio, float rightMarginRatio, float bottomMarginRation, float leftMarginRation, float pixelWidth);