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

[apps] Shared: In CurveView::drawCurve: compare pixels coordinate

Browse Source 
instead of float to avoid white pixels between the area under the curve
and the cursor
This commit is contained in:
Émilie Feral
2018-01-10 17:05:49 +01:00
committed by EmilieNumworks
parent e13960fd20
commit e8a844d2e4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/shared/curve_view.cpp
View File

@@ -307,6 +307,10 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, EvaluateModelWithParamet
float xStep = (xMax-xMin)/resolution();
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. */
@@ -319,7 +323,7 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, EvaluateModelWithParamet
}
float pxf = floatToPixel(Axis::Horizontal, x);
float pyf = floatToPixel(Axis::Vertical, y);
if (colorUnderCurve && x > colorLowerBound && x < colorUpperBound) {
if (colorUnderCurve && pxf > pixelColorLowerBound && pxf < pixelColorUpperBound) {
KDRect colorRect((int)pxf, std::round(pyf), 1, floatToPixel(Axis::Vertical, 0.0f) - std::round(pyf));
if (floatToPixel(Axis::Vertical, 0.0f) < std::round(pyf)) {
colorRect = KDRect((int)pxf, floatToPixel(Axis::Vertical, 0.0f), 1, std::round(pyf) - floatToPixel(Axis::Vertical, 0.0f));