Skip to content

Fix Selection Reset During Navigation #157

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

Merged
alxvth merged 1 commit into from
Jan 9, 2025
Merged

Fix Selection Reset During Navigation #157

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
67 changes: 33 additions & 34 deletions src/ScatterplotWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,25 @@ ScatterplotWidget::ScatterplotWidget() :

bool ScatterplotWidget::event(QEvent* event)
{
if (!event)
return QOpenGLWidget::event(event);

// Set navigation flag on Alt press/release
if (event->type() == QEvent::KeyRelease)
{
if (const auto* keyEvent = static_cast<QKeyEvent*>(event))
if (keyEvent->key() == Qt::Key_Alt)
_isNavigating = false;

}
else if (event->type() == QEvent::KeyPress)
{
if (const auto* keyEvent = static_cast<QKeyEvent*>(event))
if (keyEvent->key() == Qt::Key_Alt)
_isNavigating = true;

}

// Interactions when Alt is pressed
if (isInitialized() && QGuiApplication::keyboardModifiers() == Qt::AltModifier) {

Expand All @@ -165,16 +184,14 @@ bool ScatterplotWidget::event(QEvent* event)

case QEvent::MouseButtonPress:
{

if (auto* mouseEvent = static_cast<QMouseEvent*>(event))
if (const auto* mouseEvent = static_cast<QMouseEvent*>(event))
{
if(mouseEvent->button() == Qt::MiddleButton)
resetView();

// Navigation
if (mouseEvent->buttons() == Qt::LeftButton)
{
_isNavigating = true;
_pixelSelectionTool.setEnabled(false);
setCursor(Qt::ClosedHandCursor);
_mousePositions << mouseEvent->pos();
Expand All @@ -187,53 +204,35 @@ bool ScatterplotWidget::event(QEvent* event)

case QEvent::MouseButtonRelease:
{
if (_isNavigating)
{
_isNavigating = false;
_pixelSelectionTool.setEnabled(true);
setCursor(Qt::ArrowCursor);
_mousePositions.clear();
update();
}
_pixelSelectionTool.setEnabled(true);
setCursor(Qt::ArrowCursor);
_mousePositions.clear();
update();

break;
}

case QEvent::MouseMove:
{
if (auto* mouseEvent = static_cast<QMouseEvent*>(event))
if (const auto* mouseEvent = static_cast<QMouseEvent*>(event))
{
if (_isNavigating)
{
_mousePositions << mouseEvent->pos();
_mousePositions << mouseEvent->pos();

if (mouseEvent->buttons() & Qt::LeftButton && _mousePositions.size() >= 2) {
const auto& previousMousePosition = _mousePositions[_mousePositions.size() - 2];
const auto& currentMousePosition = _mousePositions[_mousePositions.size() - 1];
const auto panVector = currentMousePosition - previousMousePosition;
if (mouseEvent->buttons() == Qt::LeftButton && _mousePositions.size() >= 2)
{
const auto& previousMousePosition = _mousePositions[_mousePositions.size() - 2];
const auto& currentMousePosition = _mousePositions[_mousePositions.size() - 1];
const auto panVector = currentMousePosition - previousMousePosition;

panBy(panVector);
}
panBy(panVector);
}
}

break;
}

case QEvent::KeyRelease:
{
if (auto* keyEvent = static_cast<QKeyEvent*>(event))
{
// Reset navigation
if (keyEvent && keyEvent->key() == Qt::Key_Alt)
{
_isNavigating = false;
}

}
break;
}
}

}

return QOpenGLWidget::event(event);
Expand Down
Loading