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

[apps/graph] Fix default zoom for non cartesian + cartesian

Browse Source
This commit is contained in:
Léa Saviot
2019-09-10 11:02:57 +02:00
parent 4262ea0365
commit 77262b02dc
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/graph/graph/graph_controller.cpp
View File

@@ -57,8 +57,6 @@ void GraphController::interestingRanges(float * xm, float * xM, float * ym, floa
float resultxMax = -FLT_MAX;
float resultyMin = FLT_MAX;
float resultyMax = -FLT_MAX;
float xMin = const_cast<GraphController *>(this)->interactiveCurveViewRange()->xMin();
float xMax = const_cast<GraphController *>(this)->interactiveCurveViewRange()->xMax();
assert(functionStore()->numberOfActiveFunctions() > 0);
if (displaysNonCartesianFunctions()) {
const int functionsCount = functionStore()->numberOfActiveFunctions();
@@ -81,8 +79,8 @@ void GraphController::interestingRanges(float * xm, float * xM, float * ym, floa
resultxMax = Range1D::k_default;
}
} else {
resultxMin = xMin;
resultxMax = xMax;
resultxMin = const_cast<GraphController *>(this)->interactiveCurveViewRange()->xMin();
resultxMax = const_cast<GraphController *>(this)->interactiveCurveViewRange()->xMax();
}
/* In practice, a step smaller than a pixel's width is needed for sampling
* the values of a function. Otherwise some relevant extremal values may be
@@ -97,8 +95,8 @@ void GraphController::interestingRanges(float * xm, float * xM, float * ym, floa
* y-range for even functions (y = 1/x). */
assert(!std::isnan(f->tMin()));
assert(!std::isnan(f->tMax()));
double tMin = maxFloat(f->tMin(), xMin);
double tMax = minFloat(f->tMax(), xMax);
double tMin = maxFloat(f->tMin(), resultxMin);
double tMax = minFloat(f->tMax(), resultxMax);
interestingFunctionRange(f, tMin, tMax, step, &resultxMin, &resultxMax, &resultyMin, &resultyMax);
}
if (resultyMin > resultyMax) {