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

[apps/curve_view] Fix KDCoordinate overflow

Browse Source 
Scenario: (with the current auto zoom algorithm)
Graph f(x) = x! -> Auto axes are x=[-13,17647;13,17647],
y=[3628793;2628807]
Press "0" "EXE" to go to x = 0 -> Axes are x=[-13,17647;13,17647],
y=[-0.8612717;13.13873]
Press auto
Press "0" "EXE" to go to x = 0 -> the assertion about KDCoordinates
breaks.
This commit is contained in:
Léa Saviot
2020-11-04 11:08:15 +01:00
committed by Émilie Feral
parent 95aa47625c
commit 7f6a3f0fc1
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/shared/curve_view.cpp
View File

@@ -1006,12 +1006,30 @@ KDRect CurveView::cursorFrame() {
KDRect cursorFrame = KDRectZero;
if (m_cursorView && m_mainViewSelected && std::isfinite(m_curveViewCursor->x()) && std::isfinite(m_curveViewCursor->y())) {
KDSize cursorSize = m_cursorView->minimalSizeForOptimalDisplay();
KDCoordinate xCursorPixelPosition = std::round(floatToPixel(Axis::Horizontal, m_curveViewCursor->x()));
KDCoordinate yCursorPixelPosition = std::round(floatToPixel(Axis::Vertical, m_curveViewCursor->y()));
cursorFrame = KDRect(xCursorPixelPosition - (cursorSize.width()-1)/2, yCursorPixelPosition - (cursorSize.height()-1)/2, cursorSize.width(), cursorSize.height());
float xCursorPixelPosition = std::round(floatToPixel(Axis::Horizontal, m_curveViewCursor->x()));
float yCursorPixelPosition = std::round(floatToPixel(Axis::Vertical, m_curveViewCursor->y()));
/* If the cursor is not visible, put its frame to zero, because it might be
* very far out of the visible frame and thus later overflow KDCoordinate.
* The "2" factor is a big safety margin. */
constexpr int maxCursorPixel = KDCOORDINATE_MAX / 2;
// Assert we are not removing visible cursors
static_assert((Ion::Display::Width * 2 < maxCursorPixel)
&& (Ion::Display::Height * 2 < maxCursorPixel),
"maxCursorPixel is should be bigger");
if (std::abs(yCursorPixelPosition) > maxCursorPixel
|| std::abs(xCursorPixelPosition) > maxCursorPixel)
{
return KDRectZero;
}
KDCoordinate xCursor = xCursorPixelPosition;
KDCoordinate yCursor = yCursorPixelPosition;
KDCoordinate xCursorFrame = xCursor - (cursorSize.width()-1)/2;
cursorFrame = KDRect(xCursorFrame, yCursor - (cursorSize.height()-1)/2, cursorSize);
if (cursorSize.height() == 0) {
KDCoordinate bannerHeight = (m_bannerView != nullptr) ? m_bannerView->minimalSizeForOptimalDisplay().height() : 0;
cursorFrame = KDRect(xCursorPixelPosition - (cursorSize.width()-1)/2, 0, cursorSize.width(),bounds().height()-bannerHeight);
cursorFrame = KDRect(xCursorFrame, 0, cursorSize.width(), bounds().height() - bannerHeight);
}
}
return cursorFrame;