Skip to content

Fix polylineplot snapping two points at exact same time #32953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grliszas14 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

Fix polylineplot snapping two points at exact same time #32953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/framework/uicomponents/qml/Muse/UiComponents/polylineplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,17 +1035,21 @@ QPointF PolylinePlot::snapToNeighbor(qreal dragPxX, QPointF pDomain) const
return pDomain;
}

// Snap close to — but not exactly onto — a neighbor.
// Can't have multiple automation points at the exact same timepoint.
static constexpr double SNAP_EPSILON = 1e-9;

if (currentIdx + 1 < m_points.size()) {
const qreal neighborPxX = toPxX(this, normalizedFromDomain(m_points[currentIdx + 1]).x());
if (std::abs(dragPxX - neighborPxX) <= m_snapThresholdPx) {
pDomain.setX(m_points[currentIdx + 1].x());
pDomain.setX(m_points[currentIdx + 1].x() - SNAP_EPSILON);
}
}

if (currentIdx > 0) {
const qreal neighborPxX = toPxX(this, normalizedFromDomain(m_points[currentIdx - 1]).x());
if (std::abs(dragPxX - neighborPxX) <= m_snapThresholdPx) {
pDomain.setX(m_points[currentIdx - 1].x());
pDomain.setX(m_points[currentIdx - 1].x() + SNAP_EPSILON);
}
}

Expand Down Expand Up @@ -1289,7 +1293,7 @@ void PolylinePlot::mousePressEvent(QMouseEvent* e)
1.0 - clamp01(ghostPoint.point.y() / height()));

const QPointF pDomain = domainFromNormalized(pN);
emit pointAdded(pDomain.x(), pDomain.y(), /*completed*/ true);
emit pointAdded(pDomain.x(), pDomain.y(), /*completed*/ false);
}

updateActivePoint();
Expand Down Expand Up @@ -1357,6 +1361,12 @@ void PolylinePlot::mouseReleaseEvent(QMouseEvent* e)
return;
}

// click-without-drag on line: finalize the point that was added during press
if (isClick && m_pressedOnLine && m_pressedPointIndex >= 0 && m_pressedPointIndex < m_points.size()) {
const QPointF pDomain = m_points[m_pressedPointIndex];
emit pointAdded(pDomain.x(), pDomain.y(), /*completed*/ true);
}

emit interactionFinished();
resetGestureState();
}
Expand Down
Loading