disambiguate fct names

Device/Detector/IDetector.cpp

@@ -230,7 +230,7 @@ std::vector<size_t> IDetector::activeIndices() const
 
 void IDetector::addMask(const IShape2D& shape, bool mask_value)
 {
-    m_mask->addMask(shape, mask_value);
+    m_mask->maskToStack(shape, mask_value);
 }
 
 void IDetector::maskAll()

Device/Mask/MaskStack.cpp

@@ -32,7 +32,8 @@ MaskPattern* MaskPattern::clone() const
     return new MaskPattern(shape->clone(), doMask);
 }
 
-void MaskStack::addMask(const IShape2D& shape, bool mask_value)
+
+void MaskStack::maskToStack(const IShape2D& shape, bool mask_value)
 {
     m_stack.emplace_back(new MaskPattern(shape.clone(), mask_value));
 }

Device/Mask/MaskStack.h

@@ -40,7 +40,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);
+    void maskToStack(const IShape2D& shape, bool mask_value);
 
     bool isMasked(size_t i_flat, const Frame& frame) const;
 

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());
+                detectorMask.maskToStack(*shape, (*maskIter)->maskValue());
             }
         }
 
     // ROI mask has to be the last one, it can not be "unmasked" by other shapes
     if (roi)
-        detectorMask.addMask(*roi, true);
+        detectorMask.maskToStack(*roi, true);
 
     if (!detectorMask.hasMasks())
         return nullptr;

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);
     }
 }
 

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);
 }

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);