From c4b455f4856c21299f31be73c2c31cec1a1c9f38 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 11 Oct 2023 08:45:16 +0200
Subject: [PATCH] new dir GUI/Model/Mask
---
GUI/Model/Data/Data2DItem.cpp | 2 +-
GUI/Model/Data/ProjectionItems.h | 2 +-
GUI/Model/Detector/DetectorItem.h | 2 +-
GUI/Model/{Data => Mask}/MaskItemCatalog.cpp | 6 +++---
GUI/Model/{Data => Mask}/MaskItemCatalog.h | 8 ++++----
GUI/Model/{Data => Mask}/MaskItems.cpp | 4 ++--
GUI/Model/{Data => Mask}/MaskItems.h | 10 +++++-----
GUI/Model/{Data => Mask}/MaskResultsPresenter.cpp | 6 +++---
GUI/Model/{Data => Mask}/MaskResultsPresenter.h | 8 ++++----
GUI/Model/{Data => Mask}/MaskUnitsConverter.cpp | 4 ++--
GUI/Model/{Data => Mask}/MaskUnitsConverter.h | 8 ++++----
GUI/View/Import/RealDataMaskWidget.cpp | 2 +-
GUI/View/Mask/MaskAllView.cpp | 2 +-
GUI/View/Mask/MaskContainerView.cpp | 2 +-
GUI/View/Mask/MaskDrawingContext.cpp | 2 +-
GUI/View/Mask/MaskEditorActions.cpp | 2 +-
GUI/View/Mask/MaskEditorCanvas.cpp | 4 ++--
GUI/View/Mask/MaskEditorPropertyPanel.cpp | 2 +-
GUI/View/Mask/MaskGraphicsScene.cpp | 2 +-
GUI/View/Mask/MaskViewFactory.cpp | 2 +-
GUI/View/Mask/RegionOfInterestView.cpp | 2 +-
GUI/View/Projection/ProjectionsEditorCanvas.cpp | 2 +-
GUI/View/Projection/ProjectionsPlot.cpp | 2 +-
GUI/View/Projection/ProjectionsWidget.cpp | 2 +-
GUI/View/Projection/SaveProjectionsAssistant.cpp | 2 +-
GUI/View/Shape/EllipseView.cpp | 2 +-
GUI/View/Shape/IShape2DView.cpp | 2 +-
GUI/View/Shape/LineViews.cpp | 2 +-
GUI/View/Shape/PolygonPointView.cpp | 2 +-
GUI/View/Shape/PolygonView.cpp | 2 +-
GUI/View/Shape/RectangleView.cpp | 2 +-
31 files changed, 51 insertions(+), 51 deletions(-)
rename GUI/Model/{Data => Mask}/MaskItemCatalog.cpp (95%)
rename GUI/Model/{Data => Mask}/MaskItemCatalog.h (87%)
rename GUI/Model/{Data => Mask}/MaskItems.cpp (99%)
rename GUI/Model/{Data => Mask}/MaskItems.h (97%)
rename GUI/Model/{Data => Mask}/MaskResultsPresenter.cpp (96%)
rename GUI/Model/{Data => Mask}/MaskResultsPresenter.h (86%)
rename GUI/Model/{Data => Mask}/MaskUnitsConverter.cpp (97%)
rename GUI/Model/{Data => Mask}/MaskUnitsConverter.h (87%)
diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp
index 50bb82e391e..d607f568fa1 100644
--- a/GUI/Model/Data/Data2DItem.cpp
+++ b/GUI/Model/Data/Data2DItem.cpp
@@ -19,7 +19,7 @@
#include "Device/Data/Datafield.h"
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Model/Data/MaskUnitsConverter.h"
+#include "GUI/Model/Mask/MaskUnitsConverter.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Support/Util/QCP_Util.h"
#include <qcustomplot.h>
diff --git a/GUI/Model/Data/ProjectionItems.h b/GUI/Model/Data/ProjectionItems.h
index 6daa9f622bc..d05948a729e 100644
--- a/GUI/Model/Data/ProjectionItems.h
+++ b/GUI/Model/Data/ProjectionItems.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
#define BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Support/Data/ID.h"
//! A container to hold ProjectionItems, intended to store projections of color map on X, Y axes.
diff --git a/GUI/Model/Detector/DetectorItem.h b/GUI/Model/Detector/DetectorItem.h
index e316dd7579e..ccf57bb9187 100644
--- a/GUI/Model/Detector/DetectorItem.h
+++ b/GUI/Model/Detector/DetectorItem.h
@@ -17,7 +17,7 @@
#include "Device/Detector/FlatDetector.h"
#include "GUI/Model/Data/ComboProperty.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Detector/DetectorItem.h"
diff --git a/GUI/Model/Data/MaskItemCatalog.cpp b/GUI/Model/Mask/MaskItemCatalog.cpp
similarity index 95%
rename from GUI/Model/Data/MaskItemCatalog.cpp
rename to GUI/Model/Mask/MaskItemCatalog.cpp
index 38f675ae034..f5a06cbc071 100644
--- a/GUI/Model/Data/MaskItemCatalog.cpp
+++ b/GUI/Model/Mask/MaskItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskItemCatalog.cpp
+//! @file GUI/Model/Mask/MaskItemCatalog.cpp
//! @brief Implements class MaskItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/MaskItemCatalog.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItemCatalog.h"
+#include "GUI/Model/Mask/MaskItems.h"
MaskItem* MaskItemCatalog::create(Type type)
{
diff --git a/GUI/Model/Data/MaskItemCatalog.h b/GUI/Model/Mask/MaskItemCatalog.h
similarity index 87%
rename from GUI/Model/Data/MaskItemCatalog.h
rename to GUI/Model/Mask/MaskItemCatalog.h
index df783ecf873..a182f2e290d 100644
--- a/GUI/Model/Data/MaskItemCatalog.h
+++ b/GUI/Model/Mask/MaskItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskItemCatalog.h
+//! @file GUI/Model/Mask/MaskItemCatalog.h
//! @brief Defines class MaskItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -49,4 +49,4 @@ public:
static Type type(const MaskItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKITEMCATALOG_H
diff --git a/GUI/Model/Data/MaskItems.cpp b/GUI/Model/Mask/MaskItems.cpp
similarity index 99%
rename from GUI/Model/Data/MaskItems.cpp
rename to GUI/Model/Mask/MaskItems.cpp
index 53d582ec48d..f2e4157e226 100644
--- a/GUI/Model/Data/MaskItems.cpp
+++ b/GUI/Model/Mask/MaskItems.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskItems.cpp
+//! @file GUI/Model/Mask/MaskItems.cpp
//! @brief Implements MaskItems classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/InfinitePlane.h"
#include "Device/Mask/Line.h"
diff --git a/GUI/Model/Data/MaskItems.h b/GUI/Model/Mask/MaskItems.h
similarity index 97%
rename from GUI/Model/Data/MaskItems.h
rename to GUI/Model/Mask/MaskItems.h
index e8d9ad20b58..283007cb6c5 100644
--- a/GUI/Model/Data/MaskItems.h
+++ b/GUI/Model/Mask/MaskItems.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskItems.h
+//! @file GUI/Model/Mask/MaskItems.h
//! @brief Defines MaskItems classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
#include "Base/Types/OwningVector.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Data/MaskItemCatalog.h"
+#include "GUI/Model/Mask/MaskItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include <QAbstractListModel>
#include <QItemSelectionModel>
@@ -314,4 +314,4 @@ public:
MaskContainerItem* maskContainer = nullptr;
};
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
diff --git a/GUI/Model/Data/MaskResultsPresenter.cpp b/GUI/Model/Mask/MaskResultsPresenter.cpp
similarity index 96%
rename from GUI/Model/Data/MaskResultsPresenter.cpp
rename to GUI/Model/Mask/MaskResultsPresenter.cpp
index ee931fed6cb..8aa1cdd74d8 100644
--- a/GUI/Model/Data/MaskResultsPresenter.cpp
+++ b/GUI/Model/Mask/MaskResultsPresenter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskResultsPresenter.cpp
+//! @file GUI/Model/Mask/MaskResultsPresenter.cpp
//! @brief Implements class MaskResultsPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/MaskResultsPresenter.h"
+#include "GUI/Model/Mask/MaskResultsPresenter.h"
#include "Device/Data/Datafield.h"
#include "Device/Mask/DetectorMask.h"
#include "Device/Mask/IShape2D.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include <QVBoxLayout>
MaskResultsPresenter::MaskResultsPresenter(QWidget* parent)
diff --git a/GUI/Model/Data/MaskResultsPresenter.h b/GUI/Model/Mask/MaskResultsPresenter.h
similarity index 86%
rename from GUI/Model/Data/MaskResultsPresenter.h
rename to GUI/Model/Mask/MaskResultsPresenter.h
index 72ab3630bc6..defd1a2c47b 100644
--- a/GUI/Model/Data/MaskResultsPresenter.h
+++ b/GUI/Model/Mask/MaskResultsPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskResultsPresenter.h
+//! @file GUI/Model/Mask/MaskResultsPresenter.h
//! @brief Defines class MaskResultsPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKRESULTSPRESENTER_H
#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QModelIndex>
@@ -49,4 +49,4 @@ private:
bool m_interpolation_flag_backup;
};
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKRESULTSPRESENTER_H
diff --git a/GUI/Model/Data/MaskUnitsConverter.cpp b/GUI/Model/Mask/MaskUnitsConverter.cpp
similarity index 97%
rename from GUI/Model/Data/MaskUnitsConverter.cpp
rename to GUI/Model/Mask/MaskUnitsConverter.cpp
index f55d02fc97a..e661b7645c7 100644
--- a/GUI/Model/Data/MaskUnitsConverter.cpp
+++ b/GUI/Model/Mask/MaskUnitsConverter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskUnitsConverter.cpp
+//! @file GUI/Model/Mask/MaskUnitsConverter.cpp
//! @brief Implements class MaskUnitsConverter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/MaskUnitsConverter.h"
+#include "GUI/Model/Mask/MaskUnitsConverter.h"
#include "Base/Axis/FrameUtil.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Data/Data2DItem.h"
diff --git a/GUI/Model/Data/MaskUnitsConverter.h b/GUI/Model/Mask/MaskUnitsConverter.h
similarity index 87%
rename from GUI/Model/Data/MaskUnitsConverter.h
rename to GUI/Model/Mask/MaskUnitsConverter.h
index 7732bf3b2e9..efa494dedbd 100644
--- a/GUI/Model/Data/MaskUnitsConverter.h
+++ b/GUI/Model/Mask/MaskUnitsConverter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/MaskUnitsConverter.h
+//! @file GUI/Model/Mask/MaskUnitsConverter.h
//! @brief Defines class MaskUnitsConverter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
-#define BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
+#define BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
class Data2DItem;
class Datafield;
@@ -47,4 +47,4 @@ private:
EConvertionDirection m_direction;
};
-#endif // BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index d33b59cfe1a..ea983b56c8d 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Mask/MaskEditorActions.h"
#include "GUI/View/Mask/MaskEditorCanvas.h"
#include "GUI/View/Mask/MaskEditorPropertyPanel.h"
diff --git a/GUI/View/Mask/MaskAllView.cpp b/GUI/View/Mask/MaskAllView.cpp
index 2ea56b88c91..43c5d817351 100644
--- a/GUI/View/Mask/MaskAllView.cpp
+++ b/GUI/View/Mask/MaskAllView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskAllView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Shape/SceneAdaptor.h"
#include <QBrush>
#include <QPainter>
diff --git a/GUI/View/Mask/MaskContainerView.cpp b/GUI/View/Mask/MaskContainerView.cpp
index 4bfb2c3d46a..c0782988c95 100644
--- a/GUI/View/Mask/MaskContainerView.cpp
+++ b/GUI/View/Mask/MaskContainerView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskContainerView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/View/Shape/SceneAdaptor.h"
#include <QBrush>
diff --git a/GUI/View/Mask/MaskDrawingContext.cpp b/GUI/View/Mask/MaskDrawingContext.cpp
index c2e5cbd67f3..adb8a9c4757 100644
--- a/GUI/View/Mask/MaskDrawingContext.cpp
+++ b/GUI/View/Mask/MaskDrawingContext.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskDrawingContext.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
MaskDrawingContext::MaskDrawingContext()
: m_current_activity(MaskEditorFlags::PAN_ZOOM_MODE)
diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
index 3d398867fea..ad54ca2d8ae 100644
--- a/GUI/View/Mask/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskEditorActions.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/ActionFactory.h"
#include <QAction>
diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp
index 5706be28722..08b6c589d0f 100644
--- a/GUI/View/Mask/MaskEditorCanvas.cpp
+++ b/GUI/View/Mask/MaskEditorCanvas.cpp
@@ -14,11 +14,11 @@
#include "GUI/View/Mask/MaskEditorCanvas.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/View/Mask/MaskGraphicsView.h"
-#include "GUI/Model/Data/MaskResultsPresenter.h"
+#include "GUI/Model/Mask/MaskResultsPresenter.h"
#include "GUI/View/PlotScale/SavePlotAssistant.h"
#include "GUI/View/PlotUtil/ColorMap.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index fc04da00df2..97f0b5dab53 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Mask/MaskEditorPropertyPanel.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Style/GroupBoxCollapser.h"
#include "GUI/Support/Tool/LayoutUtil.h"
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index e2549a9f220..8f4d37a68b5 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Mask/MaskGraphicsProxy.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index 944f483459d..3f5aef886f2 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskViewFactory.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/View/Mask/MaskAllView.h"
#include "GUI/View/Mask/MaskContainerView.h"
diff --git a/GUI/View/Mask/RegionOfInterestView.cpp b/GUI/View/Mask/RegionOfInterestView.cpp
index 9e5a54482bd..801040020da 100644
--- a/GUI/View/Mask/RegionOfInterestView.cpp
+++ b/GUI/View/Mask/RegionOfInterestView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Mask/RegionOfInterestView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Shape/SceneAdaptor.h"
#include <QPainter>
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index b952443c836..0332757b0e8 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Projection/ProjectionsEditorCanvas.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Mask/MaskGraphicsScene.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index 4c7385ec562..5ee74fe233c 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Support/Util/QCP_Util.h"
#include "GUI/View/PlotScale/RangeUtil.h"
diff --git a/GUI/View/Projection/ProjectionsWidget.cpp b/GUI/View/Projection/ProjectionsWidget.cpp
index 2801da19ed0..a412b64d3b3 100644
--- a/GUI/View/Projection/ProjectionsWidget.cpp
+++ b/GUI/View/Projection/ProjectionsWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Projection/ProjectionsWidget.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Projection/ProjectionsPlot.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/View/Projection/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp
index b042544ebed..5fff9bf82cc 100644
--- a/GUI/View/Projection/SaveProjectionsAssistant.cpp
+++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp
@@ -17,7 +17,7 @@
#include "Base/Py/PyFmt.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Style/ApplicationSettings.h"
#include <QFileDialog>
diff --git a/GUI/View/Shape/EllipseView.cpp b/GUI/View/Shape/EllipseView.cpp
index 9fcc24b62a0..667cb3f22b2 100644
--- a/GUI/View/Shape/EllipseView.cpp
+++ b/GUI/View/Shape/EllipseView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Shape/EllipseView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/View/Shape/IShape2DView.cpp b/GUI/View/Shape/IShape2DView.cpp
index 82e59ca8f5c..c24b43ef392 100644
--- a/GUI/View/Shape/IShape2DView.cpp
+++ b/GUI/View/Shape/IShape2DView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Shape/IShape2DView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Shape/SceneAdaptor.h"
#include <QAction>
#include <QGraphicsScene>
diff --git a/GUI/View/Shape/LineViews.cpp b/GUI/View/Shape/LineViews.cpp
index 532285e56cc..a0d342a2d4a 100644
--- a/GUI/View/Shape/LineViews.cpp
+++ b/GUI/View/Shape/LineViews.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Shape/LineViews.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Shape/SceneAdaptor.h"
#include <QCursor>
#include <QPainter>
diff --git a/GUI/View/Shape/PolygonPointView.cpp b/GUI/View/Shape/PolygonPointView.cpp
index 23651ced4f2..96e34b8b135 100644
--- a/GUI/View/Shape/PolygonPointView.cpp
+++ b/GUI/View/Shape/PolygonPointView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Shape/PolygonPointView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/View/Shape/PolygonView.cpp b/GUI/View/Shape/PolygonView.cpp
index 4d480dab428..29cd87358b1 100644
--- a/GUI/View/Shape/PolygonView.cpp
+++ b/GUI/View/Shape/PolygonView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Shape/PolygonView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Shape/PolygonPointView.h"
#include <QCursor>
#include <QPainter>
diff --git a/GUI/View/Shape/RectangleView.cpp b/GUI/View/Shape/RectangleView.cpp
index 99c435741c6..51a04def805 100644
--- a/GUI/View/Shape/RectangleView.cpp
+++ b/GUI/View/Shape/RectangleView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Shape/RectangleView.h"
-#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
--
GitLab