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

[shared] Sequence/Function: on graph zoom on center if the cursor is undefined

Browse Source
This commit is contained in:
Émilie Feral
2018-05-16 18:35:35 +02:00
committed by EmilieNumworks
parent 0c93a50018
commit 05cd2b5866
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/shared/interactive_curve_view_range.cpp
View File

@@ -93,15 +93,17 @@ void InteractiveCurveViewRange::zoom(float ratio, float x, float y) {
if (ratio*std::fabs(xMax-xMin) < k_minFloat || ratio*std::fabs(yMax-yMin) < k_minFloat) {
return;
}
float newXMin = clipped(x*(1.0f-ratio)+ratio*xMin, false);
float newXMax = clipped(x*(1.0f-ratio)+ratio*xMax, true);
float centerX = std::isnan(x) || std::isinf(x) ? (xMax+xMin)/2: x;
float centerY = std::isnan(y) || std::isinf(y) ? (yMax+yMin)/2: y;
float newXMin = clipped(centerX*(1.0f-ratio)+ratio*xMin, false);
float newXMax = clipped(centerX*(1.0f-ratio)+ratio*xMax, true);
if (!std::isnan(newXMin) && !std::isnan(newXMax)) {
m_xMax = newXMax;
MemoizedCurveViewRange::setXMin(newXMin);
}
m_yAuto = false;
float newYMin = clipped(y*(1.0f-ratio)+ratio*yMin, false);
float newYMax = clipped(y*(1.0f-ratio)+ratio*yMax, true);
float newYMin = clipped(centerY*(1.0f-ratio)+ratio*yMin, false);
float newYMax = clipped(centerY*(1.0f-ratio)+ratio*yMax, true);
if (!std::isnan(newYMin) && !std::isnan(newYMax)) {
m_yMax = newYMax;
MemoizedCurveViewRange::setYMin(newYMin);