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/shared] Avoid infinite loop in curve view

Browse Source 
Change-Id: I77dd7f798979d4fbf78d6c40b2b22d57827920bb
This commit is contained in:
Émilie Feral
2017-02-17 13:05:12 +01:00
parent 4b3e5f30b6
commit 67db352c68
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/shared/curve_view.cpp
View File

@@ -99,6 +99,11 @@ void CurveView::drawLabels(KDContext * ctx, KDRect rect, Axis axis, bool shiftOr
float end = max(axis);
int i = 0;
for (float x = start; x < end; x += 2.0f*step) {
/* When |start| >> step, start + step = start. In that case, quit the
* infinite loop. */
if (x == x-step) {
return;
}
KDSize textSize = KDText::stringSize(label(axis, i), KDText::FontSize::Small);
KDPoint origin(floatToPixel(Axis::Horizontal, x) - textSize.width()/2, floatToPixel(Axis::Vertical, 0.0f) + k_labelMargin);
KDRect graduation((int)floatToPixel(Axis::Horizontal, x), (int)floatToPixel(Axis::Vertical, 0.0f) -(k_labelGraduationLength-2)/2, 1, k_labelGraduationLength);
@@ -190,6 +195,11 @@ void CurveView::drawGridLines(KDContext * ctx, KDRect rect, Axis axis, float ste
float start = step*((int)(min(axis)/step));
Axis otherAxis = (axis == Axis::Horizontal) ? Axis::Vertical : Axis::Horizontal;
for (float x =start; x < max(axis); x += step) {
/* When |start| >> step, start + step = start. In that case, quit the
* infinite loop. */
if (x == x-step) {
return;
}
if (rectMin <= x && x <= rectMax) {
drawLine(ctx, rect, otherAxis, x, color);
}
@@ -245,6 +255,11 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, Model * curve, KDColor c
float rectMin = pixelToFloat(Axis::Horizontal, rect.left() - k_externRectMargin);
float rectMax = pixelToFloat(Axis::Horizontal, rect.right() + k_externRectMargin);
for (float x = rectMin; x < rectMax; x += xStep) {
/* When |rectMin| >> xStep, rectMin + xStep = rectMin. In that case, quit
* the infinite loop. */
if (x == x-xStep) {
return;
}
float y = evaluateModelWithParameter(curve, x);
if (isnan(y)) {
continue;
@@ -281,6 +296,11 @@ void CurveView::drawHistogram(KDContext * ctx, KDRect rect, Model * model, float
int rectMaxBinNumber = floorf((rectMax - firstBarAbscissa)/barWidth);
float rectMaxUpperBound = firstBarAbscissa + (rectMaxBinNumber+1)*barWidth + barWidth;
for (float x = rectMinLowerBound; x < rectMaxUpperBound; x += barWidth) {
/* When |rectMinLowerBound| >> barWidth, rectMinLowerBound + barWidth = rectMinLowerBound.
* In that case, quit the infinite loop. */
if (x == x-barWidth) {
return;
}
float centerX = fillBar ? x+barWidth/2.0f : x;
float y = evaluateModelWithParameter(model, centerX);
if (isnan(y)) {