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

[apps/shared/curve_view] Use drawSegment to color area under curve

Browse Source
This commit is contained in:
Ruben Dashyan
2019-07-10 14:24:12 +02:00
committed by EmilieNumworks
parent f5c3cb74e2
commit 7cbc489052
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/shared/curve_view.cpp
View File

@@ -12,6 +12,9 @@ namespace Shared {
static inline int minInt(int x, int y) { return x < y ? x : y; }
static inline float minFloat(float x, float y) { return x < y ? x : y; }
static inline float maxFloat(float x, float y) { return x > y ? x : y; }
CurveView::CurveView(CurveViewRange * curveViewRange, CurveViewCursor * curveViewCursor, BannerView * bannerView,
View * cursorView, View * okView, bool displayBanner) :
View(),
@@ -505,9 +508,6 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, EvaluateModelWithParamet
float rectMin = pixelToFloat(Axis::Horizontal, rect.left() - k_externRectMargin);
float rectMax = pixelToFloat(Axis::Horizontal, rect.right() + k_externRectMargin);
float pixelColorLowerBound = std::round(floatToPixel(Axis::Horizontal, colorLowerBound));
float pixelColorUpperBound = std::round(floatToPixel(Axis::Horizontal, colorUpperBound));
for (float x = rectMin; x < rectMax; x += xStep) {
/* When |rectMin| >> xStep, rectMin + xStep = rectMin. In that case, quit
* the infinite loop. */
@@ -518,15 +518,11 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, EvaluateModelWithParamet
if (std::isnan(y)|| std::isinf(y)) {
continue;
}
if (colorUnderCurve && colorLowerBound < x && x < colorUpperBound) {
drawSegment(ctx, rect, Axis::Vertical, x, minFloat(0.0f, y), maxFloat(0.0f, y), color, 1);
}
float pxf = floatToPixel(Axis::Horizontal, x);
float pyf = floatToPixel(Axis::Vertical, y);
if (colorUnderCurve && pxf > pixelColorLowerBound && pxf < pixelColorUpperBound) {
KDRect colorRect((int)pxf, std::round(pyf), 1, std::round(floatToPixel(Axis::Vertical, 0.0f)) - std::round(pyf));
if (floatToPixel(Axis::Vertical, 0.0f) < std::round(pyf)) {
colorRect = KDRect((int)pxf, std::round(floatToPixel(Axis::Vertical, 0.0f)), 1, std::round(pyf) - std::round(floatToPixel(Axis::Vertical, 0.0f)));
}
ctx->fillRect(colorRect, color);
}
stampAtLocation(ctx, rect, pxf, pyf, color);
if (x <= rectMin || std::isnan(evaluation(x-xStep, model, context))) {
continue;