rename -> m_mask_mode

GUI/View/Scene/MaskGraphicsScene.cpp

@@ -124,13 +124,13 @@ void MaskGraphicsScene::onActivityChanged(MaskFlags::MaskMode mask_mode)
     if (!m_proxy)
         return;
 
-    if (m_drawing_in_progress && m_activity == MaskFlags::POLYGON_MODE
+    if (m_drawing_in_progress && m_mask_mode == MaskFlags::POLYGON_MODE
         && mask_mode >= MaskFlags::PAN_ZOOM_MODE)
         cancelCurrentDrawing();
 
-    m_activity = mask_mode;
+    m_mask_mode = mask_mode;
 
-    const bool zoomMode = m_activity == MaskFlags::PAN_ZOOM_MODE;
+    const bool zoomMode = m_mask_mode == MaskFlags::PAN_ZOOM_MODE;
 
     // Sets the state of all views in pan&zoom mode.
     // In pan&zoom mode, the selection is removed, all items cannot receive mouse clicks, and all
@@ -231,14 +231,14 @@ void MaskGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent* event)
 
 void MaskGraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 {
-    if (m_drawing_in_progress && ::isRectangleShapeMode(m_activity)) {
+    if (m_drawing_in_progress && ::isRectangleShapeMode(m_mask_mode)) {
         processRectangleOrEllipseItem(event);
         return;
     }
     QGraphicsScene::mouseMoveEvent(event);
 
-    if ((m_drawing_in_progress && m_activity == MaskFlags::POLYGON_MODE)
-        || ::isLineMode(m_activity)) {
+    if ((m_drawing_in_progress && m_mask_mode == MaskFlags::POLYGON_MODE)
+        || ::isLineMode(m_mask_mode)) {
         m_mouse_position = event->scenePos();
         invalidate();
     }
@@ -252,7 +252,7 @@ void MaskGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
 
     if (!m_drawing_in_progress)
         QGraphicsScene::mouseReleaseEvent(event);
-    else if (::isRectangleShapeMode(m_activity)) {
+    else if (::isRectangleShapeMode(m_mask_mode)) {
         clearSelection();
         if (m_currentItem) {
             // drawing ended up with item drawn, let's make it selected
@@ -278,19 +278,19 @@ void MaskGraphicsScene::drawForeground(QPainter* painter, const QRectF&)
     if (PolygonDisplay* polygon = currentPolygon()) {
         painter->setPen(QPen(Qt::black, 1, Qt::DashLine));
         painter->drawLine(QLineF(polygon->lastAddedPoint(), m_mouse_position));
-    } else if (::isLineMode(m_activity)) {
+    } else if (::isLineMode(m_mask_mode)) {
         ASSERT(m_adaptor);
         const QRectF& plot_scene_rectangle = m_adaptor->viewportRectangle();
         if (!plot_scene_rectangle.contains(m_mouse_position))
             return;
 
         painter->setPen(QPen(Qt::black, 1, Qt::DashLine));
-        if (m_activity == MaskFlags::VERTICAL_LINE_MODE) {
+        if (m_mask_mode == MaskFlags::VERTICAL_LINE_MODE) {
             QPointF p1(m_mouse_position.x(), plot_scene_rectangle.bottom());
             QPointF p2(m_mouse_position.x(), plot_scene_rectangle.top());
             painter->drawLine(QLineF(p1, p2));
         }
-        if (m_activity == MaskFlags::HORIZONTAL_LINE_MODE) {
+        if (m_mask_mode == MaskFlags::HORIZONTAL_LINE_MODE) {
             QPointF p1(plot_scene_rectangle.left(), m_mouse_position.y());
             QPointF p2(plot_scene_rectangle.right(), m_mouse_position.y());
             painter->drawLine(QLineF(p1, p2));
@@ -487,11 +487,11 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
             return; // selected area is too small => don't create object yet
 
         MaskItem* newMaskItem;
-        if (m_activity == MaskFlags::RECTANGLE_MODE)
+        if (m_mask_mode == MaskFlags::RECTANGLE_MODE)
             newMaskItem = new RectangleItem;
-        else if (m_activity == MaskFlags::ELLIPSE_MODE)
+        else if (m_mask_mode == MaskFlags::ELLIPSE_MODE)
             newMaskItem = new EllipseItem;
-        else if (m_activity == MaskFlags::ROI_MODE)
+        else if (m_mask_mode == MaskFlags::ROI_MODE)
             newMaskItem = new RegionOfInterestItem;
         else
             ASSERT_NEVER;
@@ -500,7 +500,7 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
         m_currentItem = dynamic_cast<MaskObject*>(newMaskItem);
         ASSERT(m_currentItem);
 
-        if (m_activity != MaskFlags::ROI_MODE)
+        if (m_mask_mode != MaskFlags::ROI_MODE)
             dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_mask_value);
 
         m_maskContainerModel->maskContItem()->updateMaskNames();
@@ -534,7 +534,7 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
 
 void MaskGraphicsScene::processPolygonItem(QGraphicsSceneMouseEvent* event)
 {
-    ASSERT(m_activity == MaskFlags::POLYGON_MODE);
+    ASSERT(m_mask_mode == MaskFlags::POLYGON_MODE);
 
     if (!m_currentItem) {
         setDrawingInProgress(true);
@@ -570,9 +570,9 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
     setDrawingInProgress(true);
     QPointF click_pos = event->buttonDownScenePos(Qt::LeftButton);
 
-    if (m_activity == MaskFlags::VERTICAL_LINE_MODE)
+    if (m_mask_mode == MaskFlags::VERTICAL_LINE_MODE)
         processVerticalLineItem(click_pos);
-    if (m_activity == MaskFlags::HORIZONTAL_LINE_MODE)
+    if (m_mask_mode == MaskFlags::HORIZONTAL_LINE_MODE)
         processHorizontalLineItem(click_pos);
     emit dynamic_cast<MaskItem*>(m_currentItem)->maskGeometryChanged();
 
@@ -650,11 +650,11 @@ bool MaskGraphicsScene::isValidForRectangleShapeDrawing(QGraphicsSceneMouseEvent
 {
     if (m_drawing_in_progress)
         return false;
-    if (!::isRectangleShapeMode(m_activity))
+    if (!::isRectangleShapeMode(m_mask_mode))
         return false;
     if (isAreaContains(event, MaskType::SIZEHANDLE))
         return false;
-    if (m_activity == MaskFlags::ROI_MODE)
+    if (m_mask_mode == MaskFlags::ROI_MODE)
         // only one ROI is allowed
         for (MaskObject* item : m_ItemToView.keys())
             if (dynamic_cast<RegionOfInterestItem*>(item))
@@ -666,7 +666,7 @@ bool MaskGraphicsScene::isValidForRectangleShapeDrawing(QGraphicsSceneMouseEvent
 
 bool MaskGraphicsScene::isValidForPolygonDrawing(QGraphicsSceneMouseEvent* event) const
 {
-    if (m_activity != MaskFlags::POLYGON_MODE)
+    if (m_mask_mode != MaskFlags::POLYGON_MODE)
         return false;
     if (!m_drawing_in_progress)
         if (isAreaContains(event, MaskType::POLYGONPOINT))
@@ -680,7 +680,7 @@ bool MaskGraphicsScene::isValidForLineDrawing(QGraphicsSceneMouseEvent* event) c
 {
     if (m_drawing_in_progress)
         return false;
-    if (!::isLineMode(m_activity))
+    if (!::isLineMode(m_mask_mode))
         return false;
     if (QGraphicsItem* graphicsItem = itemAt(event->scenePos(), QTransform()))
         if (graphicsItem->type() == MaskType::VERTICALLINE
@@ -695,7 +695,7 @@ bool MaskGraphicsScene::isValidForMaskAllDrawing(QGraphicsSceneMouseEvent*) cons
 {
     if (m_drawing_in_progress)
         return false;
-    if (m_activity != MaskFlags::MASKALL_MODE)
+    if (m_mask_mode != MaskFlags::MASKALL_MODE)
         return false;
 
     for (MaskObject* item : m_ItemToView.keys())
@@ -718,7 +718,7 @@ bool MaskGraphicsScene::isAreaContains(QGraphicsSceneMouseEvent* event, MaskType
 
 PolygonDisplay* MaskGraphicsScene::currentPolygon() const
 {
-    if (m_drawing_in_progress && m_activity == MaskFlags::POLYGON_MODE && m_currentItem)
+    if (m_drawing_in_progress && m_mask_mode == MaskFlags::POLYGON_MODE && m_currentItem)
         return dynamic_cast<PolygonDisplay*>(m_ItemToView[m_currentItem]);
     return nullptr;
 }

GUI/View/Scene/MaskGraphicsScene.h

@@ -114,7 +114,7 @@ private:
     QPointF m_mouse_position;
     bool m_drawing_in_progress;
     MaskFlags::MaskValue m_mask_value;
-    MaskFlags::MaskMode m_activity;
+    MaskFlags::MaskMode m_mask_mode;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSSCENE_H