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/curve_view] Inline pixelLength

Browse Source
This commit is contained in:
Ruben Dashyan
2019-07-12 10:52:54 +02:00
committed by EmilieNumworks
parent 95be59fdc6
commit ab0bfe2039
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/shared/curve_view.cpp
View File

@@ -564,15 +564,15 @@ void CurveView::jointDots(KDContext * ctx, KDRect rect, EvaluateModelWithParamet
return;
}
// No need to draw if both dots are outside visible area
if ((pyf < -stampSize && pvf < -stampSize) || (pyf > pixelLength(Axis::Vertical)+stampSize && pvf > pixelLength(Axis::Vertical)+stampSize)) {
if ((pyf < -stampSize && pvf < -stampSize) || (pyf > m_frame.height()+stampSize && pvf > m_frame.height()+stampSize)) {
return;
}
// If one of the dot is infinite, we cap it with a dot outside area
if (std::isinf(pyf)) {
pyf = pyf > 0 ? pixelLength(Axis::Vertical)+stampSize : -stampSize;
pyf = pyf > 0 ? m_frame.height()+stampSize : -stampSize;
}
if (std::isinf(pvf)) {
pvf = pvf > 0 ? pixelLength(Axis::Vertical)+stampSize : -stampSize;
pvf = pvf > 0 ? m_frame.height()+stampSize : -stampSize;
}
if (pyf - ((float)circleDiameter)/2.0f < pvf && pvf < pyf + ((float)circleDiameter)/2.0f) {
// the dots are already joined
@@ -614,7 +614,7 @@ void CurveView::straightJoinDots(KDContext * ctx, KDRect rect, float pxf, float
void CurveView::stampAtLocation(KDContext * ctx, KDRect rect, float pxf, float pyf, KDColor color) const {
// We avoid drawing when no part of the stamp is visible
if (pyf < -stampSize - FLT_EPSILON || pyf > pixelLength(Axis::Vertical)+stampSize + FLT_EPSILON) {
if (pyf < -stampSize - FLT_EPSILON || pyf > m_frame.height()+stampSize + FLT_EPSILON) {
return;
}
/* When converting floats to KDCoordinate, we need to add -1 if the float is