in MaskFlags rename Activity -> MaskMode

GUI/View/Canvas/MaskEditorCanvas.h

@@ -40,7 +40,7 @@ public:
     MaskGraphicsScene* getScene() { return m_scene; }
 
 signals:
-    void changeActivityRequest(MaskFlags::Activity);
+    void changeActivityRequest(MaskFlags::MaskMode);
     void deleteSelectedRequest();
 
 public slots:

GUI/View/Canvas/MaskToolbox.cpp

@@ -173,7 +173,7 @@ MaskToolbox::MaskToolbox(MaskEditorActions* actions, QWidget* parent)
 
 //! 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::Activity value)
+void MaskToolbox::onChangeActivityRequest(MaskFlags::MaskMode value)
 {
     if (value == MaskFlags::PREVIOUS_MODE)
         setCurrentActivity(m_previousActivity);
@@ -191,12 +191,12 @@ void MaskToolbox::add_separator()
     addWidget(new QLabel(" "));
 }
 
-MaskFlags::Activity MaskToolbox::currentActivity() const
+MaskFlags::MaskMode MaskToolbox::currentActivity() const
 {
     return MaskFlags::EMaskMode(m_activityButtonGroup->checkedId());
 }
 
-void MaskToolbox::setCurrentActivity(MaskFlags::Activity value)
+void MaskToolbox::setCurrentActivity(MaskFlags::MaskMode value)
 {
     m_activityButtonGroup->button(value)->setChecked(true);
 }

GUI/View/Canvas/MaskToolbox.h

@@ -29,21 +29,21 @@ public:
     MaskToolbox(MaskEditorActions* actions, QWidget* parent = nullptr);
 
 signals:
-    void activityChanged(MaskFlags::Activity);
+    void activityChanged(MaskFlags::MaskMode);
     void presentationChange(bool);
     void maskValueChanged(MaskFlags::MaskValue);
 
 public slots:
-    void onChangeActivityRequest(MaskFlags::Activity value);
+    void onChangeActivityRequest(MaskFlags::MaskMode value);
 
 private:
     void add_separator();
 
-    MaskFlags::Activity currentActivity() const;
-    void setCurrentActivity(MaskFlags::Activity value);
+    MaskFlags::MaskMode currentActivity() const;
+    void setCurrentActivity(MaskFlags::MaskMode value);
 
     QButtonGroup* m_activityButtonGroup;
-    MaskFlags::Activity m_previousActivity;
+    MaskFlags::MaskMode m_previousActivity;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_CANVAS_MASKTOOLBOX_H

GUI/View/Canvas/ProjectionsEditorCanvas.cpp

@@ -150,7 +150,7 @@ void ProjectionsEditorCanvas::onResetViewRequest()
     gProjectDocument.value()->setModified();
 }
 
-void ProjectionsEditorCanvas::onActivityChanged(MaskFlags::Activity value)
+void ProjectionsEditorCanvas::onActivityChanged(MaskFlags::MaskMode value)
 {
     m_currentActivity = value;
     m_scene->onActivityChanged(value);

GUI/View/Canvas/ProjectionsEditorCanvas.h

@@ -43,8 +43,8 @@ public:
     void resetContextPC();
 
 signals:
-    void changeProjectionsTabRequest(MaskFlags::Activity);
-    void changeActivityRequest(MaskFlags::Activity);
+    void changeProjectionsTabRequest(MaskFlags::MaskMode);
+    void changeActivityRequest(MaskFlags::MaskMode);
     void deleteSelectedRequest();
     void marginsChanged(double left, double right);
 
@@ -53,7 +53,7 @@ public slots:
     void onLeavingColorMap();
     void onPositionChanged(double x, double y);
     void onResetViewRequest();
-    void onActivityChanged(MaskFlags::Activity value);
+    void onActivityChanged(MaskFlags::MaskMode value);
 
 private:
     void onLineItemMoved(MaskObject* sender);
@@ -68,7 +68,7 @@ private:
     std::unique_ptr<MaskItem> m_liveProjection; //!< temporary projection item matching mouse move
     Data2DItem* m_data2DItem;
 
-    MaskFlags::Activity m_currentActivity;
+    MaskFlags::MaskMode m_currentActivity;
     bool m_block_update = false;
 };
 

GUI/View/Canvas/ProjectionsWidget.cpp

@@ -55,7 +55,7 @@ void ProjectionsWidget::disconnectItem()
     m_yProjection->disconnectItems();
 }
 
-void ProjectionsWidget::onActivityChanged(MaskFlags::Activity value)
+void ProjectionsWidget::onActivityChanged(MaskFlags::MaskMode value)
 {
     setConnected(false);
 

GUI/View/Canvas/ProjectionsWidget.h

@@ -32,10 +32,10 @@ public:
     void disconnectItem();
 
 signals:
-    void changeActivityRequest(MaskFlags::Activity value);
+    void changeActivityRequest(MaskFlags::MaskMode value);
 
 public slots:
-    void onActivityChanged(MaskFlags::Activity value);
+    void onActivityChanged(MaskFlags::MaskMode value);
     void onMarginsChanged(double left, double right);
 
 private slots:

GUI/View/Scene/MaskFlags.h

@@ -33,14 +33,14 @@ enum EMaskMode {
     MASKALL_MODE,
     PREVIOUS_MODE
 };
-Q_DECLARE_FLAGS(Activity, EMaskMode)
+Q_DECLARE_FLAGS(MaskMode, EMaskMode)
 
 enum EMaskValue { MASK_OFF, MASK_ON };
 Q_DECLARE_FLAGS(MaskValue, EMaskValue)
 
 } // namespace MaskFlags
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(MaskFlags::Activity)
+Q_DECLARE_OPERATORS_FOR_FLAGS(MaskFlags::MaskMode)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskFlags::MaskValue)
 
 #endif // BORNAGAIN_GUI_VIEW_SCENE_MASKFLAGS_H

GUI/View/Scene/MaskGraphicsScene.cpp

@@ -29,13 +29,13 @@ namespace {
 
 const qreal min_distance_to_create_rect = 10;
 
-bool isRectangleShapeMode(MaskFlags::Activity activity)
+bool isRectangleShapeMode(MaskFlags::MaskMode activity)
 {
     return activity == MaskFlags::RECTANGLE_MODE || activity == MaskFlags::ELLIPSE_MODE
            || activity == MaskFlags::ROI_MODE;
 }
 
-bool isLineMode(MaskFlags::Activity activity)
+bool isLineMode(MaskFlags::MaskMode activity)
 {
     return activity == MaskFlags::VERTICAL_LINE_MODE || activity == MaskFlags::HORIZONTAL_LINE_MODE;
 }
@@ -118,7 +118,7 @@ void MaskGraphicsScene::updateSize(const QSize& newSize)
 //  public slots
 //  ************************************************************************************************
 
-void MaskGraphicsScene::onActivityChanged(MaskFlags::Activity activity)
+void MaskGraphicsScene::onActivityChanged(MaskFlags::MaskMode activity)
 {
     if (!m_proxy)
         return;

GUI/View/Scene/MaskGraphicsScene.h

@@ -56,7 +56,7 @@ signals:
     void lineItemDeleted(MaskObject* sender);
 
 public slots:
-    void onActivityChanged(MaskFlags::Activity activity);
+    void onActivityChanged(MaskFlags::MaskMode activity);
     void onMaskValueChanged(MaskFlags::MaskValue value);
     void onRowsAboutToBeRemoved(const QModelIndex&, int first, int last);
 
@@ -114,7 +114,7 @@ private:
     QPointF m_mouse_position;
     bool m_drawing_in_progress;
     MaskFlags::MaskValue m_mask_value;
-    MaskFlags::Activity m_activity;
+    MaskFlags::MaskMode m_activity;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSSCENE_H

GUI/View/Scene/MaskGraphicsView.h

@@ -34,7 +34,7 @@ public slots:
     void onResetViewRequest();
 
 signals:
-    void changeActivityRequest(MaskFlags::Activity);
+    void changeActivityRequest(MaskFlags::MaskMode);
     void deleteSelectedRequest();
 
 private:

GUI/View/Setup/ProjectionsToolpanel.cpp

@@ -54,7 +54,7 @@ ProjectionsToolpanel::ProjectionsToolpanel(ProjectionActions* editorActions, QWi
     m_previousActivity = currentActivity();
 }
 
-void ProjectionsToolpanel::onChangeActivityRequest(MaskFlags::Activity value)
+void ProjectionsToolpanel::onChangeActivityRequest(MaskFlags::MaskMode value)
 {
     if (value == MaskFlags::PREVIOUS_MODE)
         setCurrentActivity(m_previousActivity);
@@ -67,7 +67,7 @@ void ProjectionsToolpanel::onChangeActivityRequest(MaskFlags::Activity value)
 
 //! Change activity only if current activity is one of drawing mode (horizontal, vertical
 //! projections drawing).
-void ProjectionsToolpanel::onProjectionTabChange(MaskFlags::Activity value)
+void ProjectionsToolpanel::onProjectionTabChange(MaskFlags::MaskMode value)
 {
     if (currentActivity() == MaskFlags::HORIZONTAL_LINE_MODE
         || currentActivity() == MaskFlags::VERTICAL_LINE_MODE)
@@ -143,12 +143,12 @@ void ProjectionsToolpanel::add_separator()
     addWidget(new QLabel(" "));
 }
 
-MaskFlags::Activity ProjectionsToolpanel::currentActivity() const
+MaskFlags::MaskMode ProjectionsToolpanel::currentActivity() const
 {
     return MaskFlags::EMaskMode(m_activityButtonGroup->checkedId());
 }
 
-void ProjectionsToolpanel::setCurrentActivity(MaskFlags::Activity value)
+void ProjectionsToolpanel::setCurrentActivity(MaskFlags::MaskMode value)
 {
     int button_index = static_cast<int>(value);
     m_activityButtonGroup->button(button_index)->setChecked(true);

GUI/View/Setup/ProjectionsToolpanel.h

@@ -30,11 +30,11 @@ public:
     ProjectionsToolpanel(ProjectionActions* editorActions, QWidget* parent = nullptr);
 
 public slots:
-    void onChangeActivityRequest(MaskFlags::Activity value);
-    void onProjectionTabChange(MaskFlags::Activity value);
+    void onChangeActivityRequest(MaskFlags::MaskMode value);
+    void onProjectionTabChange(MaskFlags::MaskMode value);
 
 signals:
-    void activityChanged(MaskFlags::Activity);
+    void activityChanged(MaskFlags::MaskMode);
 
 private slots:
     void onActivityGroupChange(int);
@@ -44,12 +44,12 @@ private:
     void setup_shapes_group();
     void setup_extratools_group();
     void add_separator();
-    MaskFlags::Activity currentActivity() const;
-    void setCurrentActivity(MaskFlags::Activity value);
+    MaskFlags::MaskMode currentActivity() const;
+    void setCurrentActivity(MaskFlags::MaskMode value);
 
     ProjectionActions* m_editorActions;
     QButtonGroup* m_activityButtonGroup;
-    MaskFlags::Activity m_previousActivity;
+    MaskFlags::MaskMode m_previousActivity;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONSTOOLPANEL_H