diff --git a/GUI/View/Canvas/MaskToolbox.cpp b/GUI/View/Canvas/MaskToolbox.cpp index e4c5c34d249d7d4ec83e8f18ce687c23f2e0803f..1a283b1d16ea4289a8e8785c8e573f359972cb0d 100644 --- a/GUI/View/Canvas/MaskToolbox.cpp +++ b/GUI/View/Canvas/MaskToolbox.cpp @@ -115,8 +115,6 @@ MaskToolbox::MaskToolbox(MaskEditorActions* actions, QWidget* parent) connect(m_activityButtonGroup, &QButtonGroup::idClicked, [this](int) { emit activityChanged(currentActivity()); }); - m_previousActivity = currentActivity(); - //... Modifier tools ASSERT(actions); @@ -171,16 +169,9 @@ MaskToolbox::MaskToolbox(MaskEditorActions* actions, QWidget* parent) add_separator(); } -//! Handles ZOOM requests from MaskGraphicsView while user press and holds -//! space bar. As soon as space bar is released, activity is returned to previous state. void MaskToolbox::onChangeActivityRequest(MaskFlags::MaskMode mask_mode) { - if (mask_mode == MaskFlags::PREVIOUS_MODE) - setCurrentActivity(m_previousActivity); - else { - m_previousActivity = currentActivity(); - setCurrentActivity(mask_mode); - } + setCurrentActivity(mask_mode); emit activityChanged(currentActivity()); } diff --git a/GUI/View/Canvas/MaskToolbox.h b/GUI/View/Canvas/MaskToolbox.h index 939b4a8bdcfc49c2aaa0cbffb37c0b286704e319..9b586666bfbe69a4b1446238ff8afe38f6b9aa6f 100644 --- a/GUI/View/Canvas/MaskToolbox.h +++ b/GUI/View/Canvas/MaskToolbox.h @@ -43,7 +43,6 @@ private: void setCurrentActivity(MaskFlags::MaskMode mask_mode); QButtonGroup* m_activityButtonGroup; - MaskFlags::MaskMode m_previousActivity; }; #endif // BORNAGAIN_GUI_VIEW_CANVAS_MASKTOOLBOX_H diff --git a/GUI/View/Scene/MaskFlags.h b/GUI/View/Scene/MaskFlags.h index 79613636f768864735b6d12b3fc6249e47ba3570..f7b62edf890cd6334b0648da88a7c8b0037d3c84 100644 --- a/GUI/View/Scene/MaskFlags.h +++ b/GUI/View/Scene/MaskFlags.h @@ -31,7 +31,6 @@ enum EMaskMode { ELLIPSE_MODE, ROI_MODE, MASKALL_MODE, - PREVIOUS_MODE }; Q_DECLARE_FLAGS(MaskMode, EMaskMode) diff --git a/GUI/View/Scene/MaskGraphicsView.cpp b/GUI/View/Scene/MaskGraphicsView.cpp index 144c782b1325ed56993bcc9535c93a96a31b0b62..813653b6a4e6c8a0cb9df41a9f273d4a9e35f678 100644 --- a/GUI/View/Scene/MaskGraphicsView.cpp +++ b/GUI/View/Scene/MaskGraphicsView.cpp @@ -89,18 +89,6 @@ void MaskGraphicsView::keyPressEvent(QKeyEvent* event) } } -void MaskGraphicsView::keyReleaseEvent(QKeyEvent* event) -{ - switch (event->key()) { - case Qt::Key_Space: - if (!event->isAutoRepeat()) - emit changeActivityRequest(MaskFlags::PREVIOUS_MODE); - break; - default: - QWidget::keyPressEvent(event); - } -} - bool MaskGraphicsView::isControlButtonIsPressed(QWheelEvent* event) { return event->modifiers().testFlag(Qt::ControlModifier); diff --git a/GUI/View/Scene/MaskGraphicsView.h b/GUI/View/Scene/MaskGraphicsView.h index b1788f56aba943e930d5de4e162c297760aa6a9f..25beca38746fc314191898f0018fb30d7bcd8c4c 100644 --- a/GUI/View/Scene/MaskGraphicsView.h +++ b/GUI/View/Scene/MaskGraphicsView.h @@ -41,7 +41,6 @@ private: void wheelEvent(QWheelEvent* event) override; void resizeEvent(QResizeEvent* event) override; void keyPressEvent(QKeyEvent* event) override; - void keyReleaseEvent(QKeyEvent* event) override; bool isControlButtonIsPressed(QWheelEvent* event); void cancelCurrentDrawing(); diff --git a/GUI/View/Setup/ProjectionsToolpanel.cpp b/GUI/View/Setup/ProjectionsToolpanel.cpp index 119298ca2e14c17e1321b209312e981df1a25f7c..21379c672cae0a431a47b90e9754b4c01abce98f 100644 --- a/GUI/View/Setup/ProjectionsToolpanel.cpp +++ b/GUI/View/Setup/ProjectionsToolpanel.cpp @@ -50,18 +50,11 @@ ProjectionsToolpanel::ProjectionsToolpanel(ProjectionActions* editorActions, QWi connect(m_activityButtonGroup, &QButtonGroup::idClicked, this, &ProjectionsToolpanel::onActivityGroupChange); - - m_previousActivity = currentActivity(); } void ProjectionsToolpanel::onChangeActivityRequest(MaskFlags::MaskMode mask_mode) { - if (mask_mode == MaskFlags::PREVIOUS_MODE) - setCurrentActivity(m_previousActivity); - else { - m_previousActivity = currentActivity(); - setCurrentActivity(mask_mode); - } + setCurrentActivity(mask_mode); emit activityChanged(currentActivity()); } diff --git a/GUI/View/Setup/ProjectionsToolpanel.h b/GUI/View/Setup/ProjectionsToolpanel.h index eb1836200191bda8d56617461646e300d9568428..d0f8985ef9d2a0f17c51463cdda5efbb90d5509c 100644 --- a/GUI/View/Setup/ProjectionsToolpanel.h +++ b/GUI/View/Setup/ProjectionsToolpanel.h @@ -49,7 +49,6 @@ private: ProjectionActions* m_editorActions; QButtonGroup* m_activityButtonGroup; - MaskFlags::MaskMode m_previousActivity; }; #endif // BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONSTOOLPANEL_H