diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index 19cc6a6940556c82c245db2b499951091dd8512a..fcb481f84b4d0c6aaec9086c8ad979a6aa67d5fa 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -230,12 +230,12 @@ std::vector<size_t> IDetector::activeIndices() const
void IDetector::addMask(const IShape2D& shape, bool mask_value)
{
- m_mask->addMask(shape, mask_value, false);
+ m_mask->maskToStack(shape, mask_value, false);
}
void IDetector::addBinMask(const IShape2D& shape, bool mask_value)
{
- m_mask->addMask(shape, mask_value, true);
+ m_mask->maskToStack(shape, mask_value, true);
}
void IDetector::maskAll()
diff --git a/Device/Mask/MaskStack.cpp b/Device/Mask/MaskStack.cpp
index 622a6608f2c6751df04936b651f0cebc7b1018a5..57e3cc4ed4ef90bd31244dd55e1e61557fe41f7a 100644
--- a/Device/Mask/MaskStack.cpp
+++ b/Device/Mask/MaskStack.cpp
@@ -36,7 +36,7 @@ MaskPattern* MaskPattern::clone() const
}
-void MaskStack::addMask(const IShape2D& shape, bool mask_value, bool in_bins)
+void MaskStack::maskToStack(const IShape2D& shape, bool mask_value, bool in_bins)
{
m_stack.emplace_back(new MaskPattern(shape.clone(), mask_value, in_bins));
}
diff --git a/Device/Mask/MaskStack.h b/Device/Mask/MaskStack.h
index 04d9da0fe6d5c219f1fd0eefeafa06f9831e8b6d..893a0138f5a8b4afa1f9cd73789de40dcb873678 100644
--- a/Device/Mask/MaskStack.h
+++ b/Device/Mask/MaskStack.h
@@ -41,7 +41,7 @@ class MaskStack {
public:
//! Add mask to the stack of detector masks.
//! Argument mask_value=true means that the area will be excluded from the analysis.
- void addMask(const IShape2D& shape, bool mask_value, bool in_bins);
+ void maskToStack(const IShape2D& shape, bool mask_value, bool in_bins);
bool isMasked(size_t i_flat, const Frame& frame) const;
diff --git a/GUI/Model/Data/MaskResultsPresenter.cpp b/GUI/Model/Data/MaskResultsPresenter.cpp
index f24bce2ce6d4fdc83fc72544ab3b1c1713655616..c65c470bf3118339911513f5a20a8a38305583f6 100644
--- a/GUI/Model/Data/MaskResultsPresenter.cpp
+++ b/GUI/Model/Data/MaskResultsPresenter.cpp
@@ -91,13 +91,13 @@ Datafield* MaskResultsPresenter::createMaskPresentation() const
roi = roiItem->createShape(scale);
else {
std::unique_ptr<IShape2D> shape((*maskIter)->createShape(scale));
- detectorMask.addMask(*shape, (*maskIter)->maskValue(), true);
+ detectorMask.maskToStack(*shape, (*maskIter)->maskValue(), true);
}
}
// ROI mask has to be the last one, it can not be "unmasked" by other shapes
if (roi)
- detectorMask.addMask(*roi, true, true);
+ detectorMask.maskToStack(*roi, true, true);
if (!detectorMask.hasMasks())
return nullptr;
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 71c43b48137ac0c37a7a9a5821b8f739eae2166b..8ff27037512c5efd2f061a7a856cff4a8430ef6e 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -112,7 +112,7 @@ void setMaskContainer(MaskContainerItem* destMaskItems, const IDetector& detecto
Q_UNUSED(plane);
auto* planeItem = new MaskAllItem();
planeItem->setMaskValue(mask_value);
- destMaskItems->addMask(planeItem);
+ destMaskItems->addMaskItem(planeItem);
}
else
@@ -128,7 +128,7 @@ void setMaskContainer(MaskContainerItem* destMaskItems, const IDetector& detecto
roiItem->setYLow(scale * yBounds.first);
roiItem->setXUp(scale * xBounds.second);
roiItem->setYUp(scale * yBounds.second);
- destMaskItems->addMask(roiItem);
+ destMaskItems->addMaskItem(roiItem);
}
}
diff --git a/GUI/Model/Mask/MaskItems.cpp b/GUI/Model/Mask/MaskItems.cpp
index f2e4157e2265d47c822ddf05f583b3305f472632..2a5390e9e901b6a56f5d273872d92bb362ef86a0 100644
--- a/GUI/Model/Mask/MaskItems.cpp
+++ b/GUI/Model/Mask/MaskItems.cpp
@@ -64,7 +64,7 @@ void MaskContainerItem::insertMask(int row, MaskItem* maskItem)
m_maskItems.insert_at(row, maskItem);
}
-void MaskContainerItem::addMask(MaskItem* maskItem)
+void MaskContainerItem::addMaskItem(MaskItem* maskItem)
{
// takes owning of maskItem!
m_maskItems.push_back(maskItem);
@@ -179,7 +179,7 @@ void MaskContainerItem::readFrom(QXmlStreamReader* r, MessageService*)
QString tag = r->name().toString();
if (tag == Tag::Mask) {
- addMask(nullptr);
+ addMaskItem(nullptr);
m_maskItems.back().readFrom(r);
XML::gotoEndElementOfTag(r, tag);
@@ -909,11 +909,11 @@ void MaskContainerModel::insertMask(int row, MaskItem* maskItem)
QAbstractListModel::endInsertRows();
}
-void MaskContainerModel::addMask(MaskItem* maskItem)
+void MaskContainerModel::maskToModel(MaskItem* maskItem)
{
qsizetype row = maskContainer->size() - 1;
QAbstractListModel::beginInsertRows(maskContainer->rootIndex, row, row);
- maskContainer->addMask(maskItem);
+ maskContainer->addMaskItem(maskItem);
QAbstractListModel::endInsertRows();
}
@@ -975,5 +975,5 @@ void MaskContainerModel::copy(const MaskContainerModel* src)
clear();
if (src)
for (auto mask : src->maskContainer->maskItems())
- addMask(mask);
+ maskToModel(mask);
}
diff --git a/GUI/Model/Mask/MaskItems.h b/GUI/Model/Mask/MaskItems.h
index e793da8cb5d8d088126da22475be2af493210ef7..eec5f20fcd763100ef2d83887042a7e24906b821 100644
--- a/GUI/Model/Mask/MaskItems.h
+++ b/GUI/Model/Mask/MaskItems.h
@@ -220,7 +220,7 @@ public:
//! Insert mask at given row.
virtual void insertMask(int row, MaskItem* maskItem);
- virtual void addMask(MaskItem* maskItem);
+ virtual void addMaskItem(MaskItem* maskItem);
//! Move mask to a given row
virtual void moveMask(int from_row, int to_row);
@@ -285,7 +285,7 @@ public:
//! Insert mask at given row.
void insertMask(int row, MaskItem* maskItem);
- void addMask(MaskItem* maskItem);
+ void maskToModel(MaskItem* maskItem);
//! Remove a given mask
void removeMask(MaskItem* maskItem);
diff --git a/GUI/View/Shape/IShape2DView.cpp b/GUI/View/Shape/IShape2DView.cpp
index 93d75743499d72e691bb676f0d15d2d7e29c324b..8a725ad88e1394701499a75fda5ca144d8e596a8 100644
--- a/GUI/View/Shape/IShape2DView.cpp
+++ b/GUI/View/Shape/IShape2DView.cpp
@@ -68,9 +68,9 @@ void IShape2DView::setViewSceneAdaptor(const SceneAdaptor* adaptor)
void IShape2DView::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
{
- const bool isMasked = itemMaskValue(parameterizedItem());
- painter->setBrush(MaskEditorHelper::getMaskBrush(isMasked));
- painter->setPen(MaskEditorHelper::getMaskPen(isMasked));
+ const bool is_masked = itemMaskValue(parameterizedItem());
+ painter->setBrush(MaskEditorHelper::getMaskBrush(is_masked));
+ painter->setPen(MaskEditorHelper::getMaskPen(is_masked));
painter->setRenderHints(QPainter::Antialiasing);
painter->drawPath(maskedShape());
}
@@ -81,7 +81,7 @@ QPainterPath IShape2DView::maskedShape() const
MaskEditorHelper::RECTANGLE, MaskEditorHelper::POLYGON, MaskEditorHelper::VERTICALLINE,
MaskEditorHelper::HORIZONTALLINE, MaskEditorHelper::ELLIPSE};
- QPainterPath resultingShape = mapToScene(shape());
+ QPainterPath result = mapToScene(shape());
for (const QGraphicsItem* item : scene()->items()) {
const auto* view = dynamic_cast<const IShape2DView*>(item);
if (!view)
@@ -90,21 +90,21 @@ QPainterPath IShape2DView::maskedShape() const
continue;
if (itemMaskValue(view->parameterizedItem()))
continue;
- if (const auto* maskItem = dynamic_cast<const MaskItem*>(view->parameterizedItem()))
- if (!maskItem->isVisible())
+ if (const auto* mask_item = dynamic_cast<const MaskItem*>(view->parameterizedItem()))
+ if (!mask_item->isVisible())
continue;
if (!(view->zValue() > zValue()))
continue;
- const QPainterPath maskItemShape = view->mapToScene(view->shape());
- if (!maskItemShape.intersects(resultingShape))
+ const QPainterPath mask_shape = view->mapToScene(view->shape());
+ if (!mask_shape.intersects(result))
continue;
// Item lays on top and is non-masking -> subtract the path of the item
- resultingShape = resultingShape.subtracted(maskItemShape);
+ result = result.subtracted(mask_shape);
}
- return mapFromScene(resultingShape);
+ return mapFromScene(result);
}
qreal IShape2DView::toSceneX(qreal value) const