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/shared] Fix draw curve issues when tStep << tStart

Browse Source 
Change-Id: Iaf054cff1f78f3c800564a0e6c133192bdfab260
This commit is contained in:
Hugo Saint-Vignes
2020-07-28 17:14:40 +02:00
committed by Émilie Feral
parent 22a15f5ed6
commit 0322a1a6a7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/shared/curve_view.cpp
View File

@@ -610,6 +610,7 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, float tStart, float tEnd
float previousY = NAN;
float y = NAN;
int i = 0;
bool isLastSegment = false;
do {
previousT = t;
t = tStart + (i++) * tStep;
@@ -618,9 +619,11 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, float tStart, float tEnd
}
if (t >= tEnd) {
t = tEnd - FLT_EPSILON;
isLastSegment = true;
}
if (previousT == t) {
break;
// No need to draw segment. Happens when tStep << tStart .
continue;
}
previousX = x;
previousY = y;
@@ -631,7 +634,7 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, float tStart, float tEnd
drawHorizontalOrVerticalSegment(ctx, rect, Axis::Vertical, x, std::min(0.0f, y), std::max(0.0f, y), color, 1);
}
joinDots(ctx, rect, xyFloatEvaluation, model, context, drawStraightLinesEarly, previousT, previousX, previousY, t, x, y, color, thick, k_maxNumberOfIterations, xyDoubleEvaluation);
} while (true);
} while (!isLastSegment);
}
void CurveView::drawCartesianCurve(KDContext * ctx, KDRect rect, float xMin, float xMax, EvaluateXYForFloatParameter xyFloatEvaluation, void * model, void * context, KDColor color, bool thick, bool colorUnderCurve, float colorLowerBound, float colorUpperBound, EvaluateXYForDoubleParameter xyDoubleEvaluation) const {