further mask classes renamed

GUI/View/Mask/MaskAllView.cpp → GUI/View/Mask/AllMasksDisplay.cpp

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/MaskAllView.cpp
-//! @brief     Implements MaskAllView class
+//! @file      GUI/View/Mask/AllMasksDisplay.cpp
+//! @brief     Implements AllMasksDisplay class
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,33 +12,33 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Mask/MaskAllView.h"
+#include "GUI/View/Mask/AllMasksDisplay.h"
 #include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QBrush>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
-MaskAllView::MaskAllView(MaskAllItem* item)
+AllMasksDisplay::AllMasksDisplay(MaskAllItem* item)
     : IMaskElementDisplay(item)
     , m_item(item)
 {
     setFlag(QGraphicsItem::ItemIsSelectable);
 }
 
-MaskItemObject* MaskAllView::parameterizedItem() const
+MaskItemObject* AllMasksDisplay::parameterizedItem() const
 {
     return m_item;
 }
 
-void MaskAllView::update_view()
+void AllMasksDisplay::update_view()
 {
     //    prepareGeometryChange();
     m_bounding_rect = m_adaptor->viewportRectangle();
     update();
 }
 
-void MaskAllView::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
+void AllMasksDisplay::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
 {
     //    painter->setRenderHints(QPainter::Antialiasing);
     QColor color(250, 250, 240, 150);

GUI/View/Mask/MaskAllView.h → GUI/View/Mask/AllMasksDisplay.h

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/MaskAllView.h
-//! @brief     Defines MaskAllView class
+//! @file      GUI/View/Mask/AllMasksDisplay.h
+//! @brief     Defines AllMasksDisplay class
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKALLVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASK_MASKALLVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_ALLMASKSDISPLAY_H
+#define BORNAGAIN_GUI_VIEW_MASK_ALLMASKSDISPLAY_H
 
 #include "GUI/View/Shape/IMaskElementDisplay.h"
 
@@ -21,12 +21,12 @@ class MaskAllItem;
 
 //! This is a view of MaskAllItem which covers whole detector plane with mask value=true.
 
-class MaskAllView : public IMaskElementDisplay {
+class AllMasksDisplay : public IMaskElementDisplay {
     Q_OBJECT
 public:
     int type() const override { return MaskEditorHelper::MASKALL; }
 
-    explicit MaskAllView(MaskAllItem* item);
+    explicit AllMasksDisplay(MaskAllItem* item);
 
     MaskItemObject* parameterizedItem() const override;
 
@@ -40,4 +40,4 @@ private:
     MaskAllItem* m_item;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_MASK_MASKALLVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_ALLMASKSDISPLAY_H

GUI/View/Mask/MaskViewFactory.cpp

@@ -15,8 +15,8 @@
 #include "GUI/View/Mask/MaskViewFactory.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Mask/MaskItems.h"
-#include "GUI/View/Mask/MaskAllView.h"
-#include "GUI/View/Mask/RegionOfInterestView.h"
+#include "GUI/View/Mask/AllMasksDisplay.h"
+#include "GUI/View/Mask/RegionOfInterestDisplay.h"
 #include "GUI/View/Shape/EllipseDisplay.h"
 #include "GUI/View/Shape/LineViews.h"
 #include "GUI/View/Shape/MaskContainerDisplay.h"
@@ -56,10 +56,10 @@ IMaskElementDisplay* MaskViewFactory::createMaskView(MaskItemObject* item, Scene
         result = new EllipseDisplay(mask);
 
     else if (auto* mask = dynamic_cast<MaskAllItem*>(item))
-        result = new MaskAllView(mask);
+        result = new AllMasksDisplay(mask);
 
     else if (auto* mask = dynamic_cast<RegionOfInterestItem*>(item))
-        result = new RegionOfInterestView(mask);
+        result = new RegionOfInterestDisplay(mask);
 
     else
         ASSERT_NEVER;

GUI/View/Mask/RegionOfInterestView.cpp → GUI/View/Mask/RegionOfInterestDisplay.cpp

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/RegionOfInterestView.cpp
-//! @brief     Defines RegionOfInterestView class
+//! @file      GUI/View/Mask/RegionOfInterestDisplay.cpp
+//! @brief     Defines RegionOfInterestDisplay class
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,29 +12,29 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Mask/RegionOfInterestView.h"
+#include "GUI/View/Mask/RegionOfInterestDisplay.h"
 #include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/View/Shape/SceneAdaptor.h"
 #include <QPainter>
 
-RegionOfInterestView::RegionOfInterestView(RegionOfInterestItem* item)
+RegionOfInterestDisplay::RegionOfInterestDisplay(RegionOfInterestItem* item)
     : RectangleDisplay(item)
 {
 }
 
-QRectF RegionOfInterestView::boundingRect() const
+QRectF RegionOfInterestDisplay::boundingRect() const
 {
     return mapFromScene(m_adaptor->viewportRectangle()).boundingRect();
 }
 
-void RegionOfInterestView::update_view()
+void RegionOfInterestDisplay::update_view()
 {
     RectangleDisplay::update_view();
     m_bounding_rect = m_adaptor->viewportRectangle();
     update();
 }
 
-void RegionOfInterestView::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
+void RegionOfInterestDisplay::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
 {
     QPainterPath outerRect;
     outerRect.addRect(boundingRect());

GUI/View/Mask/RegionOfInterestView.h → GUI/View/Mask/RegionOfInterestDisplay.h

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Mask/RegionOfInterestView.h
-//! @brief     Defines RegionOfInterestView class
+//! @file      GUI/View/Mask/RegionOfInterestDisplay.h
+//! @brief     Defines RegionOfInterestDisplay class
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTDISPLAY_H
+#define BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTDISPLAY_H
 
 #include "GUI/View/Shape/RectangleDisplay.h"
 
@@ -21,12 +21,12 @@ class RegionOfInterestItem;
 
 //! The RegionOfInterest class represent view of RegionOfInterestItem on graphics scene.
 
-class RegionOfInterestView : public RectangleDisplay {
+class RegionOfInterestDisplay : public RectangleDisplay {
     Q_OBJECT
 public:
     int type() const override { return MaskEditorHelper::REGIONOFINTEREST; }
 
-    explicit RegionOfInterestView(RegionOfInterestItem* item);
+    explicit RegionOfInterestDisplay(RegionOfInterestItem* item);
 
     QRectF boundingRect() const override;
 
@@ -37,4 +37,4 @@ protected:
     void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTDISPLAY_H