From 62152de771bdeadec4b20c68e0bcb8c07b920bd1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Dec 2023 10:31:42 +0100
Subject: [PATCH] rename member -> m_active_mask
---
GUI/View/Scene/MaskGraphicsScene.cpp | 50 ++++++++++++++--------------
GUI/View/Scene/MaskGraphicsScene.h | 2 +-
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/GUI/View/Scene/MaskGraphicsScene.cpp b/GUI/View/Scene/MaskGraphicsScene.cpp
index 2d33037b77e..9ee2ff30bb0 100644
--- a/GUI/View/Scene/MaskGraphicsScene.cpp
+++ b/GUI/View/Scene/MaskGraphicsScene.cpp
@@ -167,8 +167,8 @@ void MaskGraphicsScene::onRowsAboutToBeRemoved(const QModelIndex&, int first, in
void MaskGraphicsScene::cancelCurrentDrawing()
{
if (m_drawing_in_progress) {
- ASSERT(m_currentItem);
- m_maskContainerModel->removeMask(dynamic_cast<MaskItem*>(m_currentItem));
+ ASSERT(m_active_mask);
+ m_maskContainerModel->removeMask(dynamic_cast<MaskItem*>(m_active_mask));
setDrawingInProgress(false);
}
}
@@ -254,9 +254,9 @@ void MaskGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
QGraphicsScene::mouseReleaseEvent(event);
else if (::isRectangleShapeMode(m_mask_mode)) {
clearSelection();
- if (m_currentItem) {
+ if (m_active_mask) {
// drawing ended up with item drawn, let's make it selected
- if (IShapeDisplay* view = m_ItemToView[m_currentItem])
+ if (IShapeDisplay* view = m_ItemToView[m_active_mask])
view->setSelected(true);
} else {
// drawing ended without item to be draw (too short mouse move)
@@ -459,7 +459,7 @@ void MaskGraphicsScene::setDrawingInProgress(bool value)
if (value)
gProjectDocument.value()->setModified(); // manual mask creation
else
- m_currentItem = nullptr;
+ m_active_mask = nullptr;
}
void MaskGraphicsScene::makeViewAtMousePosSelected(QGraphicsSceneMouseEvent* event)
@@ -482,7 +482,7 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
//... Create new item?
- if (!m_currentItem) {
+ if (!m_active_mask) {
if (line.length() < min_distance_to_create_rect)
return; // selected area is too small => don't create object yet
@@ -497,11 +497,11 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
ASSERT_NEVER;
m_maskContainerModel->insertMask(0, newMaskItem);
- m_currentItem = dynamic_cast<MaskObject*>(newMaskItem);
- ASSERT(m_currentItem);
+ m_active_mask = dynamic_cast<MaskObject*>(newMaskItem);
+ ASSERT(m_active_mask);
if (m_mask_mode != MaskFlags::ROI_MODE)
- dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_mask_value);
+ dynamic_cast<MaskItem*>(m_active_mask)->setMaskValue(m_mask_value);
m_maskContainerModel->maskContItem()->updateMaskNames();
}
@@ -514,20 +514,20 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
const qreal ymin = m_adaptor->fromSceneY(std::min(click_pos.y(), mouse_pos.y()));
const qreal ymax = m_adaptor->fromSceneY(std::max(click_pos.y(), mouse_pos.y()));
- if (auto* rectItem = dynamic_cast<RectangleItem*>(m_currentItem)) {
+ if (auto* rectItem = dynamic_cast<RectangleItem*>(m_active_mask)) {
// RectangleItem or RegionOfInterestItem
rectItem->setXLow(xmin);
rectItem->setYLow(ymax);
rectItem->setXUp(xmax);
rectItem->setYUp(ymin);
- } else if (auto* ellItem = dynamic_cast<EllipseItem*>(m_currentItem)) {
+ } else if (auto* ellItem = dynamic_cast<EllipseItem*>(m_active_mask)) {
ellItem->setXCenter((xmax + xmin) / 2);
ellItem->setYCenter((ymax + ymin) / 2);
ellItem->setXRadius((xmax - xmin) / 2);
ellItem->setYRadius((ymin - ymax) / 2);
}
- emit m_currentItem->maskGeometryChanged();
+ emit m_active_mask->maskGeometryChanged();
// produce views for the created shape
updateViews();
}
@@ -536,18 +536,18 @@ void MaskGraphicsScene::processPolygonItem(QGraphicsSceneMouseEvent* event)
{
ASSERT(m_mask_mode == MaskFlags::POLYGON_MODE);
- if (!m_currentItem) {
+ if (!m_active_mask) {
setDrawingInProgress(true);
auto* new_poly = new PolygonItem;
m_maskContainerModel->insertMask(0, new_poly);
new_poly->setMaskValue(m_mask_value);
- m_currentItem = new_poly;
+ m_active_mask = new_poly;
m_selectionModel->clearSelection();
- m_selectionModel->select(m_maskContainerModel->indexOfItem(m_currentItem),
+ m_selectionModel->select(m_maskContainerModel->indexOfItem(m_active_mask),
QItemSelectionModel::Select);
m_maskContainerModel->maskContItem()->updateMaskNames();
}
- ASSERT(dynamic_cast<PolygonItem*>(m_currentItem));
+ ASSERT(dynamic_cast<PolygonItem*>(m_active_mask));
if (PolygonDisplay* polygon = currentPolygon()) {
if (polygon->closePolygonIfNecessary()) {
@@ -561,7 +561,7 @@ void MaskGraphicsScene::processPolygonItem(QGraphicsSceneMouseEvent* event)
ASSERT(m_adaptor);
const double x = m_adaptor->fromSceneX(click_pos.x());
const double y = m_adaptor->fromSceneY(click_pos.y());
- dynamic_cast<PolygonItem*>(m_currentItem)->addPoint(x, y);
+ dynamic_cast<PolygonItem*>(m_active_mask)->addPoint(x, y);
updateScene();
}
@@ -574,13 +574,13 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
processVerticalLineItem(click_pos);
if (m_mask_mode == MaskFlags::HORIZONTAL_LINE_MODE)
processHorizontalLineItem(click_pos);
- emit dynamic_cast<MaskItem*>(m_currentItem)->maskGeometryChanged();
+ emit dynamic_cast<MaskItem*>(m_active_mask)->maskGeometryChanged();
m_selectionModel->clearSelection();
- m_selectionModel->select(m_maskContainerModel->indexOfItem(m_currentItem),
+ m_selectionModel->select(m_maskContainerModel->indexOfItem(m_active_mask),
QItemSelectionModel::Select);
m_maskContainerModel->maskContItem()->updateMaskNames();
- dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_mask_value);
+ dynamic_cast<MaskItem*>(m_active_mask)->setMaskValue(m_mask_value);
emit lineItemProcessed();
@@ -591,7 +591,7 @@ void MaskGraphicsScene::processVerticalLineItem(const QPointF& pos)
{
auto* item = new VerticalLineItem;
m_maskContainerModel->insertMask(0, item);
- m_currentItem = item;
+ m_active_mask = item;
ASSERT(m_adaptor);
item->setPosX(m_adaptor->fromSceneX(pos.x()));
}
@@ -600,7 +600,7 @@ void MaskGraphicsScene::processHorizontalLineItem(const QPointF& pos)
{
auto* item = new HorizontalLineItem;
m_maskContainerModel->insertMask(0, item);
- m_currentItem = item;
+ m_active_mask = item;
ASSERT(m_adaptor);
item->setPosY(m_adaptor->fromSceneY(pos.y()));
}
@@ -612,7 +612,7 @@ void MaskGraphicsScene::processMaskAllItem(QGraphicsSceneMouseEvent* event)
setDrawingInProgress(true);
auto* item = new MaskAllItem;
m_maskContainerModel->insertMask(0, item);
- m_currentItem = item;
+ m_active_mask = item;
m_selectionModel->clearSelection();
setDrawingInProgress(false);
}
@@ -718,7 +718,7 @@ bool MaskGraphicsScene::isAreaContains(QGraphicsSceneMouseEvent* event, MaskType
PolygonDisplay* MaskGraphicsScene::currentPolygon() const
{
- if (m_drawing_in_progress && m_mask_mode == MaskFlags::POLYGON_MODE && m_currentItem)
- return dynamic_cast<PolygonDisplay*>(m_ItemToView[m_currentItem]);
+ if (m_drawing_in_progress && m_mask_mode == MaskFlags::POLYGON_MODE && m_active_mask)
+ return dynamic_cast<PolygonDisplay*>(m_ItemToView[m_active_mask]);
return nullptr;
}
diff --git a/GUI/View/Scene/MaskGraphicsScene.h b/GUI/View/Scene/MaskGraphicsScene.h
index ee58309aaaf..1bedf6871b0 100644
--- a/GUI/View/Scene/MaskGraphicsScene.h
+++ b/GUI/View/Scene/MaskGraphicsScene.h
@@ -110,7 +110,7 @@ private:
bool m_block_selection = false;
bool m_mouse_is_pressed = false;
Data2DItem* m_data_item = nullptr;
- MaskObject* m_currentItem = nullptr;
+ MaskObject* m_active_mask = nullptr;
QPointF m_mouse_position;
bool m_drawing_in_progress;
MaskFlags::MaskValue m_mask_value;
--
GitLab