From 0d15c5ebf2aadad4504d1cd2423c64c22beabb11 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sat, 6 Nov 2021 13:23:31 +0100
Subject: [PATCH] ctd
---
.../ImportDataUtils.cpp | 4 +--
.../ImportDataUtils.h | 8 +++---
.../RealDataMaskWidget.cpp | 6 ++---
.../RealDataMaskWidget.h | 8 +++---
.../RealDataPresenter.cpp | 6 ++---
.../RealDataPresenter.h | 8 +++---
.../RealDataPropertiesWidget.cpp | 4 +--
.../RealDataPropertiesWidget.h | 8 +++---
.../RealDataSelectorWidget.cpp | 10 +++----
.../RealDataSelectorWidget.h | 8 +++---
.../RealDataTreeModel.cpp | 4 +--
.../RealDataTreeModel.h | 8 +++---
.../ColorMapSceneAdaptor.cpp | 4 +--
.../ColorMapSceneAdaptor.h | 10 +++----
.../{MaskWidgets => Mask}/EllipseView.cpp | 4 +--
GUI/View/{MaskWidgets => Mask}/EllipseView.h | 10 +++----
.../{MaskWidgets => Mask}/ISceneAdaptor.h | 8 +++---
.../{MaskWidgets => Mask}/IShape2DView.cpp | 6 ++---
GUI/View/{MaskWidgets => Mask}/IShape2DView.h | 10 +++----
GUI/View/{MaskWidgets => Mask}/LineViews.cpp | 6 ++---
GUI/View/{MaskWidgets => Mask}/LineViews.h | 10 +++----
.../{MaskWidgets => Mask}/MaskAllView.cpp | 6 ++---
GUI/View/{MaskWidgets => Mask}/MaskAllView.h | 10 +++----
.../MaskContainerView.cpp | 6 ++---
.../{MaskWidgets => Mask}/MaskContainerView.h | 12 ++++-----
.../MaskDrawingContext.cpp | 4 +--
.../MaskDrawingContext.h | 10 +++----
GUI/View/{MaskWidgets => Mask}/MaskEditor.cpp | 14 +++++-----
GUI/View/{MaskWidgets => Mask}/MaskEditor.h | 8 +++---
.../MaskEditorActions.cpp | 8 +++---
.../{MaskWidgets => Mask}/MaskEditorActions.h | 10 +++----
.../MaskEditorCanvas.cpp | 10 +++----
.../{MaskWidgets => Mask}/MaskEditorCanvas.h | 10 +++----
.../{MaskWidgets => Mask}/MaskEditorFlags.h | 8 +++---
.../MaskEditorHelper.cpp | 4 +--
.../{MaskWidgets => Mask}/MaskEditorHelper.h | 8 +++---
.../MaskEditorPropertyPanel.cpp | 4 +--
.../MaskEditorPropertyPanel.h | 10 +++----
.../MaskEditorToolBar.cpp | 26 +++++++++----------
.../{MaskWidgets => Mask}/MaskEditorToolBar.h | 10 +++----
.../MaskGraphicsProxy.cpp | 6 ++---
.../{MaskWidgets => Mask}/MaskGraphicsProxy.h | 10 +++----
.../MaskGraphicsScene.cpp | 12 ++++-----
.../{MaskWidgets => Mask}/MaskGraphicsScene.h | 12 ++++-----
.../MaskGraphicsView.cpp | 8 +++---
.../{MaskWidgets => Mask}/MaskGraphicsView.h | 10 +++----
.../MaskResultsPresenter.cpp | 4 +--
.../MaskResultsPresenter.h | 10 +++----
.../{MaskWidgets => Mask}/MaskViewFactory.cpp | 18 ++++++-------
.../{MaskWidgets => Mask}/MaskViewFactory.h | 8 +++---
.../{MaskWidgets => Mask}/MaskWidgets.qrc | 0
.../PolygonPointView.cpp | 4 +--
.../{MaskWidgets => Mask}/PolygonPointView.h | 10 +++----
.../{MaskWidgets => Mask}/PolygonView.cpp | 6 ++---
GUI/View/{MaskWidgets => Mask}/PolygonView.h | 10 +++----
.../RectangleBaseView.cpp | 4 +--
.../{MaskWidgets => Mask}/RectangleBaseView.h | 12 ++++-----
.../{MaskWidgets => Mask}/RectangleView.cpp | 4 +--
.../{MaskWidgets => Mask}/RectangleView.h | 10 +++----
.../RegionOfInterestView.cpp | 6 ++---
.../RegionOfInterestView.h | 10 +++----
.../SizeHandleElement.cpp | 4 +--
.../{MaskWidgets => Mask}/SizeHandleElement.h | 10 +++----
.../image}/maskeditor_arrow.svg | 0
.../image}/maskeditor_bringtofront.svg | 0
.../image}/maskeditor_details.svg | 0
.../image}/maskeditor_ellipse.svg | 0
.../images => Mask/image}/maskeditor_hand.svg | 0
.../image}/maskeditor_horizontalline.svg | 0
.../image}/maskeditor_lightbulb.svg | 0
.../image}/maskeditor_maskall.svg | 0
.../image}/maskeditor_maskfalse.svg | 0
.../image}/maskeditor_masktrue.svg | 0
.../image}/maskeditor_polygon.svg | 0
.../image}/maskeditor_rectangle.svg | 0
.../image}/maskeditor_refresh.svg | 0
.../images => Mask/image}/maskeditor_roi.svg | 0
.../images => Mask/image}/maskeditor_save.svg | 0
.../image}/maskeditor_sendtoback.svg | 0
.../image}/maskeditor_toolpanel.svg | 0
.../image}/maskeditor_verticalline.svg | 0
.../ProjectionsEditorCanvas.cpp | 4 +--
.../ProjectionsEditorCanvas.h | 2 +-
.../ProjectionsWidgets/ProjectionsToolBar.cpp | 8 +++---
.../ProjectionsWidgets/ProjectionsToolBar.h | 2 +-
.../ProjectionsWidgets/ProjectionsWidget.h | 2 +-
GUI/View/Toplevel/ImportDataView.cpp | 2 +-
GUI/View/Toplevel/ImportDataView.h | 2 +-
88 files changed, 269 insertions(+), 269 deletions(-)
rename GUI/View/{ImportDataWidgets => Import}/ImportDataUtils.cpp (97%)
rename GUI/View/{ImportDataWidgets => Import}/ImportDataUtils.h (86%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataMaskWidget.cpp (92%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataMaskWidget.h (81%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataPresenter.cpp (92%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataPresenter.h (80%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataPropertiesWidget.cpp (97%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataPropertiesWidget.h (84%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataSelectorWidget.cpp (97%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataSelectorWidget.h (88%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataTreeModel.cpp (98%)
rename GUI/View/{ImportDataWidgets => Import}/RealDataTreeModel.h (90%)
rename GUI/View/{MaskWidgets => Mask}/ColorMapSceneAdaptor.cpp (93%)
rename GUI/View/{MaskWidgets => Mask}/ColorMapSceneAdaptor.h (80%)
rename GUI/View/{MaskWidgets => Mask}/EllipseView.cpp (98%)
rename GUI/View/{MaskWidgets => Mask}/EllipseView.h (86%)
rename GUI/View/{MaskWidgets => Mask}/ISceneAdaptor.h (89%)
rename GUI/View/{MaskWidgets => Mask}/IShape2DView.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/IShape2DView.h (89%)
rename GUI/View/{MaskWidgets => Mask}/LineViews.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/LineViews.h (90%)
rename GUI/View/{MaskWidgets => Mask}/MaskAllView.cpp (91%)
rename GUI/View/{MaskWidgets => Mask}/MaskAllView.h (82%)
rename GUI/View/{MaskWidgets => Mask}/MaskContainerView.cpp (90%)
rename GUI/View/{MaskWidgets => Mask}/MaskContainerView.h (82%)
rename GUI/View/{MaskWidgets => Mask}/MaskDrawingContext.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/MaskDrawingContext.h (85%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditor.cpp (93%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditor.h (89%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorActions.cpp (96%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorActions.h (88%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorCanvas.cpp (94%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorCanvas.h (86%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorFlags.h (87%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorHelper.cpp (92%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorHelper.h (85%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorPropertyPanel.cpp (98%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorPropertyPanel.h (85%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorToolBar.cpp (89%)
rename GUI/View/{MaskWidgets => Mask}/MaskEditorToolBar.h (86%)
rename GUI/View/{MaskWidgets => Mask}/MaskGraphicsProxy.cpp (94%)
rename GUI/View/{MaskWidgets => Mask}/MaskGraphicsProxy.h (84%)
rename GUI/View/{MaskWidgets => Mask}/MaskGraphicsScene.cpp (98%)
rename GUI/View/{MaskWidgets => Mask}/MaskGraphicsScene.h (92%)
rename GUI/View/{MaskWidgets => Mask}/MaskGraphicsView.cpp (95%)
rename GUI/View/{MaskWidgets => Mask}/MaskGraphicsView.h (84%)
rename GUI/View/{MaskWidgets => Mask}/MaskResultsPresenter.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/MaskResultsPresenter.h (83%)
rename GUI/View/{MaskWidgets => Mask}/MaskViewFactory.cpp (85%)
rename GUI/View/{MaskWidgets => Mask}/MaskViewFactory.h (78%)
rename GUI/View/{MaskWidgets => Mask}/MaskWidgets.qrc (100%)
rename GUI/View/{MaskWidgets => Mask}/PolygonPointView.cpp (95%)
rename GUI/View/{MaskWidgets => Mask}/PolygonPointView.h (85%)
rename GUI/View/{MaskWidgets => Mask}/PolygonView.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/PolygonView.h (87%)
rename GUI/View/{MaskWidgets => Mask}/RectangleBaseView.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/RectangleBaseView.h (84%)
rename GUI/View/{MaskWidgets => Mask}/RectangleView.cpp (97%)
rename GUI/View/{MaskWidgets => Mask}/RectangleView.h (85%)
rename GUI/View/{MaskWidgets => Mask}/RegionOfInterestView.cpp (89%)
rename GUI/View/{MaskWidgets => Mask}/RegionOfInterestView.h (78%)
rename GUI/View/{MaskWidgets => Mask}/SizeHandleElement.cpp (98%)
rename GUI/View/{MaskWidgets => Mask}/SizeHandleElement.h (88%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_arrow.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_bringtofront.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_details.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_ellipse.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_hand.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_horizontalline.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_lightbulb.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_maskall.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_maskfalse.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_masktrue.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_polygon.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_rectangle.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_refresh.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_roi.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_save.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_sendtoback.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_toolpanel.svg (100%)
rename GUI/View/{MaskWidgets/images => Mask/image}/maskeditor_verticalline.svg (100%)
diff --git a/GUI/View/ImportDataWidgets/ImportDataUtils.cpp b/GUI/View/Import/ImportDataUtils.cpp
similarity index 97%
rename from GUI/View/ImportDataWidgets/ImportDataUtils.cpp
rename to GUI/View/Import/ImportDataUtils.cpp
index a4b0708c05d..7fc4bcf346c 100644
--- a/GUI/View/ImportDataWidgets/ImportDataUtils.cpp
+++ b/GUI/View/Import/ImportDataUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/ImportDataUtils.cpp
+//! @file GUI/View/Import/ImportDataUtils.cpp
//! @brief Implements ImportDataUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ImportDataWidgets/ImportDataUtils.h"
+#include "GUI/View/Import/ImportDataUtils.h"
#include "Device/Data/OutputData.h"
#include "Device/InputOutput/DataFormatUtils.h"
#include "GUI/Model/Data/ImportDataInfo.h"
diff --git a/GUI/View/ImportDataWidgets/ImportDataUtils.h b/GUI/View/Import/ImportDataUtils.h
similarity index 86%
rename from GUI/View/ImportDataWidgets/ImportDataUtils.h
rename to GUI/View/Import/ImportDataUtils.h
index 4422de23972..9c96a58a32c 100644
--- a/GUI/View/ImportDataWidgets/ImportDataUtils.h
+++ b/GUI/View/Import/ImportDataUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/ImportDataUtils.h
+//! @file GUI/View/Import/ImportDataUtils.h
//! @brief Defines ImportDataUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
-#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTILS_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTILS_H
#include "Device/Histo/IntensityDataIOFactory.h"
#include <QString>
@@ -44,4 +44,4 @@ QString Import1dData(RealDataItem* realDataItem, const AbstractDataLoader* selec
}; // namespace GUI::View::ImportDataUtils
-#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTILS_H
diff --git a/GUI/View/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
similarity index 92%
rename from GUI/View/ImportDataWidgets/RealDataMaskWidget.cpp
rename to GUI/View/Import/RealDataMaskWidget.cpp
index 50c01b0963c..7c79fc5df06 100644
--- a/GUI/View/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataMaskWidget.cpp
+//! @file GUI/View/Import/RealDataMaskWidget.cpp
//! @brief Implements class RealDataMaskWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/ImportDataWidgets/RealDataMaskWidget.h"
+#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/View/MaskWidgets/MaskEditor.h"
+#include "GUI/View/Mask/MaskEditor.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/View/ImportDataWidgets/RealDataMaskWidget.h b/GUI/View/Import/RealDataMaskWidget.h
similarity index 81%
rename from GUI/View/ImportDataWidgets/RealDataMaskWidget.h
rename to GUI/View/Import/RealDataMaskWidget.h
index 12d1374c303..3fe698f19aa 100644
--- a/GUI/View/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/View/Import/RealDataMaskWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataMaskWidget.h
+//! @file GUI/View/Import/RealDataMaskWidget.h
//! @brief Defines class RealDataMaskWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
-#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -44,4 +44,4 @@ private:
MaskEditor* m_maskEditor;
};
-#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/RealDataPresenter.cpp b/GUI/View/Import/RealDataPresenter.cpp
similarity index 92%
rename from GUI/View/ImportDataWidgets/RealDataPresenter.cpp
rename to GUI/View/Import/RealDataPresenter.cpp
index 35fb25c7ef3..510d8ee2056 100644
--- a/GUI/View/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/View/Import/RealDataPresenter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataPresenter.cpp
+//! @file GUI/View/Import/RealDataPresenter.cpp
//! @brief Implements class RealDataPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/View/ImportDataWidgets/RealDataPresenter.h"
+#include "GUI/View/Import/RealDataPresenter.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/ImportDataWidgets/RealDataMaskWidget.h"
+#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/View/Intensity/IntensityDataWidget.h"
#include "GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
#include "GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h"
diff --git a/GUI/View/ImportDataWidgets/RealDataPresenter.h b/GUI/View/Import/RealDataPresenter.h
similarity index 80%
rename from GUI/View/ImportDataWidgets/RealDataPresenter.h
rename to GUI/View/Import/RealDataPresenter.h
index 06b41a2ce2b..e0a2415530a 100644
--- a/GUI/View/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/View/Import/RealDataPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataPresenter.h
+//! @file GUI/View/Import/RealDataPresenter.h
//! @brief Defines class RealDataPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
-#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
#include "GUI/Widget/Common/ItemComboWidget.h"
@@ -34,4 +34,4 @@ protected:
QStringList activePresentationList(SessionItem* item);
};
-#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
diff --git a/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
similarity index 97%
rename from GUI/View/ImportDataWidgets/RealDataPropertiesWidget.cpp
rename to GUI/View/Import/RealDataPropertiesWidget.cpp
index 598c1a68c3f..0937e8d3ff8 100644
--- a/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataPropertiesWidget.cpp
+//! @file GUI/View/Import/RealDataPropertiesWidget.cpp
//! @brief Implements class RealDataPropertiesWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h"
+#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
diff --git a/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h b/GUI/View/Import/RealDataPropertiesWidget.h
similarity index 84%
rename from GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h
rename to GUI/View/Import/RealDataPropertiesWidget.h
index 52317a238de..baf562e9365 100644
--- a/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h
+++ b/GUI/View/Import/RealDataPropertiesWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h
+//! @file GUI/View/Import/RealDataPropertiesWidget.h
//! @brief Defines class RealDataPropertiesWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
-#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPROPERTIESWIDGET_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPROPERTIESWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPROPERTIESWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
similarity index 97%
rename from GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp
rename to GUI/View/Import/RealDataSelectorWidget.cpp
index 30045f33f5f..761a6f1061d 100644
--- a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp
+//! @file GUI/View/Import/RealDataSelectorWidget.cpp
//! @brief Implements class RealDataSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ImportDataWidgets/RealDataSelectorWidget.h"
+#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/IO/AbstractDataLoader1D.h"
@@ -21,9 +21,9 @@
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Tool/MessageBox.h"
-#include "GUI/View/ImportDataWidgets/ImportDataUtils.h"
-#include "GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h"
-#include "GUI/View/ImportDataWidgets/RealDataTreeModel.h"
+#include "GUI/View/Import/ImportDataUtils.h"
+#include "GUI/View/Import/RealDataPropertiesWidget.h"
+#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
diff --git a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/View/Import/RealDataSelectorWidget.h
similarity index 88%
rename from GUI/View/ImportDataWidgets/RealDataSelectorWidget.h
rename to GUI/View/Import/RealDataSelectorWidget.h
index 72db98a61b1..feaed26261f 100644
--- a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/View/Import/RealDataSelectorWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataSelectorWidget.h
+//! @file GUI/View/Import/RealDataSelectorWidget.h
//! @brief Defines class RealDataSelectorWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
-#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATASELECTORWIDGET_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATASELECTORWIDGET_H
#include <QModelIndex>
#include <QWidget>
@@ -78,4 +78,4 @@ public:
QAction* m_removeDataAction;
};
-#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATASELECTORWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/RealDataTreeModel.cpp b/GUI/View/Import/RealDataTreeModel.cpp
similarity index 98%
rename from GUI/View/ImportDataWidgets/RealDataTreeModel.cpp
rename to GUI/View/Import/RealDataTreeModel.cpp
index ea8ce48d3a7..555641ecac9 100644
--- a/GUI/View/ImportDataWidgets/RealDataTreeModel.cpp
+++ b/GUI/View/Import/RealDataTreeModel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataTreeModel.cpp
+//! @file GUI/View/Import/RealDataTreeModel.cpp
//! @brief Implements class RealDataTreeModel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ImportDataWidgets/RealDataTreeModel.h"
+#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
diff --git a/GUI/View/ImportDataWidgets/RealDataTreeModel.h b/GUI/View/Import/RealDataTreeModel.h
similarity index 90%
rename from GUI/View/ImportDataWidgets/RealDataTreeModel.h
rename to GUI/View/Import/RealDataTreeModel.h
index 3e8d7ef3803..160c5f347d2 100644
--- a/GUI/View/ImportDataWidgets/RealDataTreeModel.h
+++ b/GUI/View/Import/RealDataTreeModel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ImportDataWidgets/RealDataTreeModel.h
+//! @file GUI/View/Import/RealDataTreeModel.h
//! @brief Defines class RealDataTreeModel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
-#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATATREEMODEL_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATATREEMODEL_H
#include <QAbstractItemModel>
#include <QSet>
@@ -63,4 +63,4 @@ private:
QSet<int> m_visibleRanks;
};
-#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATATREEMODEL_H
diff --git a/GUI/View/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/View/Mask/ColorMapSceneAdaptor.cpp
similarity index 93%
rename from GUI/View/MaskWidgets/ColorMapSceneAdaptor.cpp
rename to GUI/View/Mask/ColorMapSceneAdaptor.cpp
index 79a8ce75f75..6af3db7f5d1 100644
--- a/GUI/View/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/View/Mask/ColorMapSceneAdaptor.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/ColorMapSceneAdaptor.cpp
+//! @file GUI/View/Mask/ColorMapSceneAdaptor.cpp
//! @brief Implements class ColorMapSceneAdaptor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/ColorMapSceneAdaptor.h"
+#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
#include "GUI/View/Intensity/ColorMap.h"
ColorMapSceneAdaptor::ColorMapSceneAdaptor() : m_plot(0) {}
diff --git a/GUI/View/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/View/Mask/ColorMapSceneAdaptor.h
similarity index 80%
rename from GUI/View/MaskWidgets/ColorMapSceneAdaptor.h
rename to GUI/View/Mask/ColorMapSceneAdaptor.h
index 1bdd2e5ecfe..db5f96277f9 100644
--- a/GUI/View/MaskWidgets/ColorMapSceneAdaptor.h
+++ b/GUI/View/Mask/ColorMapSceneAdaptor.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/ColorMapSceneAdaptor.h
+//! @file GUI/View/Mask/ColorMapSceneAdaptor.h
//! @brief Defines class ColorMapSceneAdaptor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_COLORMAPSCENEADAPTOR_H
+#define BORNAGAIN_GUI_VIEW_MASK_COLORMAPSCENEADAPTOR_H
-#include "GUI/View/MaskWidgets/ISceneAdaptor.h"
+#include "GUI/View/Mask/ISceneAdaptor.h"
class ColorMap;
//! Performs conversion of MaskItems coordinates between ColorMap and GraphicsScene.
@@ -42,4 +42,4 @@ private:
ColorMap* m_plot;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_COLORMAPSCENEADAPTOR_H
diff --git a/GUI/View/MaskWidgets/EllipseView.cpp b/GUI/View/Mask/EllipseView.cpp
similarity index 98%
rename from GUI/View/MaskWidgets/EllipseView.cpp
rename to GUI/View/Mask/EllipseView.cpp
index 2071f3b20da..8437443521a 100644
--- a/GUI/View/MaskWidgets/EllipseView.cpp
+++ b/GUI/View/Mask/EllipseView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/EllipseView.cpp
+//! @file GUI/View/Mask/EllipseView.cpp
//! @brief Implements EllipseView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/EllipseView.h"
+#include "GUI/View/Mask/EllipseView.h"
#include "GUI/Model/Data/MaskItems.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/View/MaskWidgets/EllipseView.h b/GUI/View/Mask/EllipseView.h
similarity index 86%
rename from GUI/View/MaskWidgets/EllipseView.h
rename to GUI/View/Mask/EllipseView.h
index 7ae9c2cdb0d..4dd8338b9ef 100644
--- a/GUI/View/MaskWidgets/EllipseView.h
+++ b/GUI/View/Mask/EllipseView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/EllipseView.h
+//! @file GUI/View/Mask/EllipseView.h
//! @brief Defines EllipseView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_ELLIPSEVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_ELLIPSEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_ELLIPSEVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_ELLIPSEVIEW_H
-#include "GUI/View/MaskWidgets/RectangleBaseView.h"
+#include "GUI/View/Mask/RectangleBaseView.h"
class EllipseItem;
@@ -55,4 +55,4 @@ private:
EllipseItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_ELLIPSEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_ELLIPSEVIEW_H
diff --git a/GUI/View/MaskWidgets/ISceneAdaptor.h b/GUI/View/Mask/ISceneAdaptor.h
similarity index 89%
rename from GUI/View/MaskWidgets/ISceneAdaptor.h
rename to GUI/View/Mask/ISceneAdaptor.h
index c4665cf4896..1d241a3edb7 100644
--- a/GUI/View/MaskWidgets/ISceneAdaptor.h
+++ b/GUI/View/Mask/ISceneAdaptor.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/ISceneAdaptor.h
+//! @file GUI/View/Mask/ISceneAdaptor.h
//! @brief Defines interface class ISceneAdaptor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISCENEADAPTOR_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISCENEADAPTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_ISCENEADAPTOR_H
+#define BORNAGAIN_GUI_VIEW_MASK_ISCENEADAPTOR_H
#include <QObject>
#include <QRectF>
@@ -55,4 +55,4 @@ public:
qreal fromSceneY(qreal value) const { return value; }
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISCENEADAPTOR_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_ISCENEADAPTOR_H
diff --git a/GUI/View/MaskWidgets/IShape2DView.cpp b/GUI/View/Mask/IShape2DView.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/IShape2DView.cpp
rename to GUI/View/Mask/IShape2DView.cpp
index ff1973731fc..0fa53d88147 100644
--- a/GUI/View/MaskWidgets/IShape2DView.cpp
+++ b/GUI/View/Mask/IShape2DView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/IShape2DView.cpp
+//! @file GUI/View/Mask/IShape2DView.cpp
//! @brief Implements interface IShape2DView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/IShape2DView.h"
+#include "GUI/View/Mask/IShape2DView.h"
#include "GUI/Model/Data/MaskItems.h"
-#include "GUI/View/MaskWidgets/ISceneAdaptor.h"
+#include "GUI/View/Mask/ISceneAdaptor.h"
#include <QAction>
#include <QGraphicsScene>
#include <QGraphicsSceneContextMenuEvent>
diff --git a/GUI/View/MaskWidgets/IShape2DView.h b/GUI/View/Mask/IShape2DView.h
similarity index 89%
rename from GUI/View/MaskWidgets/IShape2DView.h
rename to GUI/View/Mask/IShape2DView.h
index b6e86d3b7b2..34e5e82b999 100644
--- a/GUI/View/MaskWidgets/IShape2DView.h
+++ b/GUI/View/Mask/IShape2DView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/IShape2DView.h
+//! @file GUI/View/Mask/IShape2DView.h
//! @brief Defines interface IShape2DView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISHAPE2DVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISHAPE2DVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_ISHAPE2DVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_ISHAPE2DVIEW_H
-#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
+#include "GUI/View/Mask/MaskEditorHelper.h"
#include <QGraphicsObject>
class SessionItem;
@@ -73,4 +73,4 @@ private:
virtual void onItemDestroyed() = 0;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISHAPE2DVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_ISHAPE2DVIEW_H
diff --git a/GUI/View/MaskWidgets/LineViews.cpp b/GUI/View/Mask/LineViews.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/LineViews.cpp
rename to GUI/View/Mask/LineViews.cpp
index abc676cf7b9..e81d6b8ba33 100644
--- a/GUI/View/MaskWidgets/LineViews.cpp
+++ b/GUI/View/Mask/LineViews.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/LineViews.cpp
+//! @file GUI/View/Mask/LineViews.cpp
//! @brief Implements classes VerticalLineView and HorizontalLineView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/LineViews.h"
+#include "GUI/View/Mask/LineViews.h"
#include "GUI/Model/Data/MaskItems.h"
-#include "GUI/View/MaskWidgets/ColorMapSceneAdaptor.h"
+#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
#include <QCursor>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/MaskWidgets/LineViews.h b/GUI/View/Mask/LineViews.h
similarity index 90%
rename from GUI/View/MaskWidgets/LineViews.h
rename to GUI/View/Mask/LineViews.h
index b5340804fbd..a0c3516f371 100644
--- a/GUI/View/MaskWidgets/LineViews.h
+++ b/GUI/View/Mask/LineViews.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/LineViews.h
+//! @file GUI/View/Mask/LineViews.h
//! @brief Defines classes VerticalLineView and HorizontalLineView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_LINEVIEWS_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_LINEVIEWS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_LINEVIEWS_H
+#define BORNAGAIN_GUI_VIEW_MASK_LINEVIEWS_H
-#include "GUI/View/MaskWidgets/IShape2DView.h"
+#include "GUI/View/Mask/IShape2DView.h"
class VerticalLineItem;
class HorizontalLineItem;
@@ -79,4 +79,4 @@ private:
HorizontalLineItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_LINEVIEWS_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_LINEVIEWS_H
diff --git a/GUI/View/MaskWidgets/MaskAllView.cpp b/GUI/View/Mask/MaskAllView.cpp
similarity index 91%
rename from GUI/View/MaskWidgets/MaskAllView.cpp
rename to GUI/View/Mask/MaskAllView.cpp
index 4085f56c182..c903402ed80 100644
--- a/GUI/View/MaskWidgets/MaskAllView.cpp
+++ b/GUI/View/Mask/MaskAllView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskAllView.cpp
+//! @file GUI/View/Mask/MaskAllView.cpp
//! @brief Implements MaskAllView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskAllView.h"
+#include "GUI/View/Mask/MaskAllView.h"
#include "GUI/Model/Data/MaskItems.h"
-#include "GUI/View/MaskWidgets/ColorMapSceneAdaptor.h"
+#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
#include <QBrush>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/MaskWidgets/MaskAllView.h b/GUI/View/Mask/MaskAllView.h
similarity index 82%
rename from GUI/View/MaskWidgets/MaskAllView.h
rename to GUI/View/Mask/MaskAllView.h
index c794fa54b9a..d01c7880f2d 100644
--- a/GUI/View/MaskWidgets/MaskAllView.h
+++ b/GUI/View/Mask/MaskAllView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskAllView.h
+//! @file GUI/View/Mask/MaskAllView.h
//! @brief Defines MaskAllView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKALLVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKALLVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKALLVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKALLVIEW_H
-#include "GUI/View/MaskWidgets/IShape2DView.h"
+#include "GUI/View/Mask/IShape2DView.h"
class MaskAllItem;
@@ -45,4 +45,4 @@ private:
MaskAllItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKALLVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKALLVIEW_H
diff --git a/GUI/View/MaskWidgets/MaskContainerView.cpp b/GUI/View/Mask/MaskContainerView.cpp
similarity index 90%
rename from GUI/View/MaskWidgets/MaskContainerView.cpp
rename to GUI/View/Mask/MaskContainerView.cpp
index 06ee9f711f5..db3a2ad24e1 100644
--- a/GUI/View/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/View/Mask/MaskContainerView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskContainerView.cpp
+//! @file GUI/View/Mask/MaskContainerView.cpp
//! @brief Implements MaskContainerView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskContainerView.h"
+#include "GUI/View/Mask/MaskContainerView.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/View/MaskWidgets/ISceneAdaptor.h"
+#include "GUI/View/Mask/ISceneAdaptor.h"
#include <QBrush>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/MaskWidgets/MaskContainerView.h b/GUI/View/Mask/MaskContainerView.h
similarity index 82%
rename from GUI/View/MaskWidgets/MaskContainerView.h
rename to GUI/View/Mask/MaskContainerView.h
index 731a4fe00cd..f246dc0e11e 100644
--- a/GUI/View/MaskWidgets/MaskContainerView.h
+++ b/GUI/View/Mask/MaskContainerView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskContainerView.h
+//! @file GUI/View/Mask/MaskContainerView.h
//! @brief Defines MaskContainerView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKCONTAINERVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKCONTAINERVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKCONTAINERVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKCONTAINERVIEW_H
-#include "GUI/View/MaskWidgets/IShape2DView.h"
-#include "GUI/View/MaskWidgets/SizeHandleElement.h"
+#include "GUI/View/Mask/IShape2DView.h"
+#include "GUI/View/Mask/SizeHandleElement.h"
#include <QMap>
class MaskContainerItem;
@@ -54,4 +54,4 @@ private:
SessionItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKCONTAINERVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKCONTAINERVIEW_H
diff --git a/GUI/View/MaskWidgets/MaskDrawingContext.cpp b/GUI/View/Mask/MaskDrawingContext.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/MaskDrawingContext.cpp
rename to GUI/View/Mask/MaskDrawingContext.cpp
index dcf67ffb4f0..07b6932a233 100644
--- a/GUI/View/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/View/Mask/MaskDrawingContext.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskDrawingContext.cpp
+//! @file GUI/View/Mask/MaskDrawingContext.cpp
//! @brief Implements class MaskDrawingContext
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskDrawingContext.h"
+#include "GUI/View/Mask/MaskDrawingContext.h"
#include "GUI/Model/Data/MaskItems.h"
MaskDrawingContext::MaskDrawingContext()
diff --git a/GUI/View/MaskWidgets/MaskDrawingContext.h b/GUI/View/Mask/MaskDrawingContext.h
similarity index 85%
rename from GUI/View/MaskWidgets/MaskDrawingContext.h
rename to GUI/View/Mask/MaskDrawingContext.h
index b9db8c88b15..00f1c5200c2 100644
--- a/GUI/View/MaskWidgets/MaskDrawingContext.h
+++ b/GUI/View/Mask/MaskDrawingContext.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskDrawingContext.h
+//! @file GUI/View/Mask/MaskDrawingContext.h
//! @brief Defines class MaskDrawingContext
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKDRAWINGCONTEXT_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKDRAWINGCONTEXT_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKDRAWINGCONTEXT_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKDRAWINGCONTEXT_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
//! Helper class for MaskGraphicsScene to hold drawing conditions
@@ -55,4 +55,4 @@ private:
bool m_drawing_in_progress;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKDRAWINGCONTEXT_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKDRAWINGCONTEXT_H
diff --git a/GUI/View/MaskWidgets/MaskEditor.cpp b/GUI/View/Mask/MaskEditor.cpp
similarity index 93%
rename from GUI/View/MaskWidgets/MaskEditor.cpp
rename to GUI/View/Mask/MaskEditor.cpp
index a5e01793030..62109a24281 100644
--- a/GUI/View/MaskWidgets/MaskEditor.cpp
+++ b/GUI/View/Mask/MaskEditor.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditor.cpp
+//! @file GUI/View/Mask/MaskEditor.cpp
//! @brief Implements class MaskEditor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskEditor.h"
+#include "GUI/View/Mask/MaskEditor.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/View/MaskWidgets/MaskEditorActions.h"
-#include "GUI/View/MaskWidgets/MaskEditorCanvas.h"
-#include "GUI/View/MaskWidgets/MaskEditorPropertyPanel.h"
-#include "GUI/View/MaskWidgets/MaskEditorToolBar.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/View/Mask/MaskEditorActions.h"
+#include "GUI/View/Mask/MaskEditorCanvas.h"
+#include "GUI/View/Mask/MaskEditorPropertyPanel.h"
+#include "GUI/View/Mask/MaskEditorToolBar.h"
+#include "GUI/View/Mask/MaskGraphicsScene.h"
#include <QBoxLayout>
#include <QContextMenuEvent>
#include <QSplitter>
diff --git a/GUI/View/MaskWidgets/MaskEditor.h b/GUI/View/Mask/MaskEditor.h
similarity index 89%
rename from GUI/View/MaskWidgets/MaskEditor.h
rename to GUI/View/Mask/MaskEditor.h
index 313d1dc90fd..77c77181c80 100644
--- a/GUI/View/MaskWidgets/MaskEditor.h
+++ b/GUI/View/Mask/MaskEditor.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditor.h
+//! @file GUI/View/Mask/MaskEditor.h
//! @brief Defines class MaskEditor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITOR_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITOR_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITOR_H
#include <QMainWindow>
#include <QModelIndex>
@@ -59,4 +59,4 @@ private:
MaskEditorCanvas* m_editorCanvas;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITOR_H
diff --git a/GUI/View/MaskWidgets/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
similarity index 96%
rename from GUI/View/MaskWidgets/MaskEditorActions.cpp
rename to GUI/View/Mask/MaskEditorActions.cpp
index 1643f1babd0..05ad04c5cc6 100644
--- a/GUI/View/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorActions.cpp
+//! @file GUI/View/Mask/MaskEditorActions.cpp
//! @brief Implement class MaskEditorActions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskEditorActions.h"
+#include "GUI/View/Mask/MaskEditorActions.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Session/SessionModel.h"
#include <QAction>
@@ -35,13 +35,13 @@ MaskEditorActions::MaskEditorActions(QWidget* parent)
connect(m_toggleMaskValueAction, &QAction::triggered, this,
&MaskEditorActions::onToggleMaskValueAction);
- m_bringToFrontAction->setIcon(QIcon(":/MaskWidgets/images/maskeditor_bringtofront.svg"));
+ m_bringToFrontAction->setIcon(QIcon(":/Mask/img/maskeditor_bringtofront.svg"));
m_bringToFrontAction->setToolTip("Rise selected mask one level up (PgUp)");
m_bringToFrontAction->setShortcuts(QKeySequence::MoveToPreviousPage);
connect(m_bringToFrontAction, &QAction::triggered, this,
&MaskEditorActions::onBringToFrontAction);
- m_sendToBackAction->setIcon(QIcon(":/MaskWidgets/images/maskeditor_sendtoback.svg"));
+ m_sendToBackAction->setIcon(QIcon(":/Mask/img/maskeditor_sendtoback.svg"));
m_sendToBackAction->setToolTip("Lower selected mask one level down (PgDown)");
m_sendToBackAction->setShortcuts(QKeySequence::MoveToNextPage);
connect(m_sendToBackAction, &QAction::triggered, this, &MaskEditorActions::onSendToBackAction);
diff --git a/GUI/View/MaskWidgets/MaskEditorActions.h b/GUI/View/Mask/MaskEditorActions.h
similarity index 88%
rename from GUI/View/MaskWidgets/MaskEditorActions.h
rename to GUI/View/Mask/MaskEditorActions.h
index b42263de6c4..3fe6a84f873 100644
--- a/GUI/View/MaskWidgets/MaskEditorActions.h
+++ b/GUI/View/Mask/MaskEditorActions.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorActions.h
+//! @file GUI/View/Mask/MaskEditorActions.h
//! @brief Defines class MaskEditorActions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORACTIONS_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORACTIONS_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORACTIONS_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QList>
#include <QModelIndex>
#include <QObject>
@@ -78,4 +78,4 @@ private:
QItemSelectionModel* m_selectionModel;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORACTIONS_H
diff --git a/GUI/View/MaskWidgets/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp
similarity index 94%
rename from GUI/View/MaskWidgets/MaskEditorCanvas.cpp
rename to GUI/View/Mask/MaskEditorCanvas.cpp
index 09edb868ea6..64a85c919f3 100644
--- a/GUI/View/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/View/Mask/MaskEditorCanvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorCanvas.cpp
+//! @file GUI/View/Mask/MaskEditorCanvas.cpp
//! @brief Implements class MaskEditorCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,16 +12,16 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskEditorCanvas.h"
+#include "GUI/View/Mask/MaskEditorCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/View/Intensity/ColorMap.h"
#include "GUI/View/Intensity/PlotStatusLabel.h"
#include "GUI/View/Intensity/SavePlotAssistant.h"
#include "GUI/View/Main/ProjectManager.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsView.h"
-#include "GUI/View/MaskWidgets/MaskResultsPresenter.h"
+#include "GUI/View/Mask/MaskGraphicsScene.h"
+#include "GUI/View/Mask/MaskGraphicsView.h"
+#include "GUI/View/Mask/MaskResultsPresenter.h"
#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
diff --git a/GUI/View/MaskWidgets/MaskEditorCanvas.h b/GUI/View/Mask/MaskEditorCanvas.h
similarity index 86%
rename from GUI/View/MaskWidgets/MaskEditorCanvas.h
rename to GUI/View/Mask/MaskEditorCanvas.h
index b9081d47f48..4b555d5a5eb 100644
--- a/GUI/View/MaskWidgets/MaskEditorCanvas.h
+++ b/GUI/View/Mask/MaskEditorCanvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorCanvas.h
+//! @file GUI/View/Mask/MaskEditorCanvas.h
//! @brief Defines class MaskEditorCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORCANVAS_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORCANVAS_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORCANVAS_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QWidget>
class MaskGraphicsScene;
@@ -64,4 +64,4 @@ private:
MaskResultsPresenter* m_resultsPresenter;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORCANVAS_H
diff --git a/GUI/View/MaskWidgets/MaskEditorFlags.h b/GUI/View/Mask/MaskEditorFlags.h
similarity index 87%
rename from GUI/View/MaskWidgets/MaskEditorFlags.h
rename to GUI/View/Mask/MaskEditorFlags.h
index dd2615138cf..7609b37a33f 100644
--- a/GUI/View/MaskWidgets/MaskEditorFlags.h
+++ b/GUI/View/Mask/MaskEditorFlags.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorFlags.h
+//! @file GUI/View/Mask/MaskEditorFlags.h
//! @brief Defines class MaskEditorFlags
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORFLAGS_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORFLAGS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORFLAGS_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORFLAGS_H
#include <QWidget>
@@ -50,4 +50,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Stacking)
Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::MaskValue)
Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::PresentationType)
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORFLAGS_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORFLAGS_H
diff --git a/GUI/View/MaskWidgets/MaskEditorHelper.cpp b/GUI/View/Mask/MaskEditorHelper.cpp
similarity index 92%
rename from GUI/View/MaskWidgets/MaskEditorHelper.cpp
rename to GUI/View/Mask/MaskEditorHelper.cpp
index 3333afe34c7..c6c2d638278 100644
--- a/GUI/View/MaskWidgets/MaskEditorHelper.cpp
+++ b/GUI/View/Mask/MaskEditorHelper.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorHelper.cpp
+//! @file GUI/View/Mask/MaskEditorHelper.cpp
//! @brief Implements class MaskEditorHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
+#include "GUI/View/Mask/MaskEditorHelper.h"
#include <QBrush>
#include <QColor>
#include <QPen>
diff --git a/GUI/View/MaskWidgets/MaskEditorHelper.h b/GUI/View/Mask/MaskEditorHelper.h
similarity index 85%
rename from GUI/View/MaskWidgets/MaskEditorHelper.h
rename to GUI/View/Mask/MaskEditorHelper.h
index 5fdf9173fb2..04399bdd82d 100644
--- a/GUI/View/MaskWidgets/MaskEditorHelper.h
+++ b/GUI/View/Mask/MaskEditorHelper.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorHelper.h
+//! @file GUI/View/Mask/MaskEditorHelper.h
//! @brief Defines class MaskEditorHelper
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORHELPER_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORHELPER_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORHELPER_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORHELPER_H
#include <QGraphicsItem>
@@ -49,4 +49,4 @@ public:
static QRectF getMarkerRectangle(const QPointF& pos);
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORHELPER_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORHELPER_H
diff --git a/GUI/View/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
similarity index 98%
rename from GUI/View/MaskWidgets/MaskEditorPropertyPanel.cpp
rename to GUI/View/Mask/MaskEditorPropertyPanel.cpp
index 695a87a6652..516c549b380 100644
--- a/GUI/View/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorPropertyPanel.cpp
+//! @file GUI/View/Mask/MaskEditorPropertyPanel.cpp
//! @brief Implements class MaskEditorPropertyPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskEditorPropertyPanel.h"
+#include "GUI/View/Mask/MaskEditorPropertyPanel.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/View/PropertyEditor/ComponentEditor.h"
diff --git a/GUI/View/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/View/Mask/MaskEditorPropertyPanel.h
similarity index 85%
rename from GUI/View/MaskWidgets/MaskEditorPropertyPanel.h
rename to GUI/View/Mask/MaskEditorPropertyPanel.h
index e1af695381c..4054823d16c 100644
--- a/GUI/View/MaskWidgets/MaskEditorPropertyPanel.h
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorPropertyPanel.h
+//! @file GUI/View/Mask/MaskEditorPropertyPanel.h
//! @brief Defines class MaskEditorPropertyPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORPROPERTYPANEL_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORPROPERTYPANEL_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QModelIndex>
#include <QWidget>
@@ -67,4 +67,4 @@ private:
IntensityDataItem* m_intensityDataItem;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORPROPERTYPANEL_H
diff --git a/GUI/View/MaskWidgets/MaskEditorToolBar.cpp b/GUI/View/Mask/MaskEditorToolBar.cpp
similarity index 89%
rename from GUI/View/MaskWidgets/MaskEditorToolBar.cpp
rename to GUI/View/Mask/MaskEditorToolBar.cpp
index 6292bf5d29d..dee68f3614d 100644
--- a/GUI/View/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/View/Mask/MaskEditorToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorToolBar.cpp
+//! @file GUI/View/Mask/MaskEditorToolBar.cpp
//! @brief Implements class MaskEditorToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskEditorToolBar.h"
+#include "GUI/View/Mask/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/MaskWidgets/MaskEditorActions.h"
+#include "GUI/View/Mask/MaskEditorActions.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
@@ -109,7 +109,7 @@ void MaskEditorToolBar::setup_selection_group()
add_separator();
QToolButton* selectionButton = new QToolButton(this);
- selectionButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_arrow.svg"));
+ selectionButton->setIcon(QIcon(":/Mask/img/maskeditor_arrow.svg"));
selectionButton->setToolTip("Select/modify mask");
selectionButton->setCheckable(true);
addWidget(selectionButton);
@@ -144,43 +144,43 @@ void MaskEditorToolBar::setup_maskvalue_group()
void MaskEditorToolBar::setup_shapes_group()
{
QToolButton* roiButton = new QToolButton(this);
- roiButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_roi.svg"));
+ roiButton->setIcon(QIcon(":/Mask/img/maskeditor_roi.svg"));
roiButton->setToolTip("Create region of interest");
roiButton->setCheckable(true);
addWidget(roiButton);
QToolButton* rectangleButton = new QToolButton(this);
- rectangleButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_rectangle.svg"));
+ rectangleButton->setIcon(QIcon(":/Mask/img/maskeditor_rectangle.svg"));
rectangleButton->setToolTip("Create rectangle mask");
rectangleButton->setCheckable(true);
addWidget(rectangleButton);
QToolButton* polygonButton = new QToolButton(this);
- polygonButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_polygon.svg"));
+ polygonButton->setIcon(QIcon(":/Mask/img/maskeditor_polygon.svg"));
polygonButton->setToolTip("Create polygon mask");
polygonButton->setCheckable(true);
addWidget(polygonButton);
QToolButton* verticalLineButton = new QToolButton(this);
- verticalLineButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_verticalline.svg"));
+ verticalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_verticalline.svg"));
verticalLineButton->setToolTip("Create vertical line mask");
verticalLineButton->setCheckable(true);
addWidget(verticalLineButton);
QToolButton* horizontalLineButton = new QToolButton(this);
- horizontalLineButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_horizontalline.svg"));
+ horizontalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_horizontalline.svg"));
horizontalLineButton->setToolTip("Create horizontal line mask");
horizontalLineButton->setCheckable(true);
addWidget(horizontalLineButton);
QToolButton* ellipseButton = new QToolButton(this);
- ellipseButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_ellipse.svg"));
+ ellipseButton->setIcon(QIcon(":/Mask/img/maskeditor_ellipse.svg"));
ellipseButton->setToolTip("Create ellipse mask");
ellipseButton->setCheckable(true);
addWidget(ellipseButton);
// QToolButton *maskAllButton = new QToolButton(this);
- // maskAllButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_maskall.svg"));
+ // maskAllButton->setIcon(QIcon(":/Mask/img/maskeditor_maskall.svg"));
// maskAllButton->setToolTip("Create masked area covering whole detector plane\n"
// "Will be placed beneath all masks. Only one instance is
// allowed.");
@@ -208,7 +208,7 @@ void MaskEditorToolBar::setup_maskmodify_group()
void MaskEditorToolBar::setup_extratools_group()
{
QToolButton* presentationButton = new QToolButton(this);
- presentationButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_lightbulb.svg"));
+ presentationButton->setIcon(QIcon(":/Mask/img/maskeditor_lightbulb.svg"));
presentationButton->setToolTip("Press and hold to see mask results.");
addWidget(presentationButton);
@@ -218,7 +218,7 @@ void MaskEditorToolBar::setup_extratools_group()
&MaskEditorToolBar::onPresentationTypeReleased);
QToolButton* propertyPanelButton = new QToolButton(this);
- propertyPanelButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_toolpanel.svg"));
+ propertyPanelButton->setIcon(QIcon(":/Mask/img/maskeditor_toolpanel.svg"));
propertyPanelButton->setToolTip("Open panel with additional properties");
addWidget(propertyPanelButton);
diff --git a/GUI/View/MaskWidgets/MaskEditorToolBar.h b/GUI/View/Mask/MaskEditorToolBar.h
similarity index 86%
rename from GUI/View/MaskWidgets/MaskEditorToolBar.h
rename to GUI/View/Mask/MaskEditorToolBar.h
index d6627d5a3a7..8b2e3054b36 100644
--- a/GUI/View/MaskWidgets/MaskEditorToolBar.h
+++ b/GUI/View/Mask/MaskEditorToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskEditorToolBar.h
+//! @file GUI/View/Mask/MaskEditorToolBar.h
//! @brief Defines class MaskEditorToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORTOOLBAR_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORTOOLBAR_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QToolBar>
class MaskEditorActions;
@@ -59,4 +59,4 @@ private:
MaskEditorFlags::Activity m_previousActivity;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKEDITORTOOLBAR_H
diff --git a/GUI/View/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/View/Mask/MaskGraphicsProxy.cpp
similarity index 94%
rename from GUI/View/MaskWidgets/MaskGraphicsProxy.cpp
rename to GUI/View/Mask/MaskGraphicsProxy.cpp
index 078138c2609..104ed4c014a 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/View/Mask/MaskGraphicsProxy.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskGraphicsProxy.cpp
+//! @file GUI/View/Mask/MaskGraphicsProxy.cpp
//! @brief Implements class MaskGraphicsProxy
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskGraphicsProxy.h"
+#include "GUI/View/Mask/MaskGraphicsProxy.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/View/Intensity/ColorMap.h"
-#include "GUI/View/MaskWidgets/ColorMapSceneAdaptor.h"
+#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
#include <QGraphicsSceneMouseEvent>
MaskGraphicsProxy::MaskGraphicsProxy()
diff --git a/GUI/View/MaskWidgets/MaskGraphicsProxy.h b/GUI/View/Mask/MaskGraphicsProxy.h
similarity index 84%
rename from GUI/View/MaskWidgets/MaskGraphicsProxy.h
rename to GUI/View/Mask/MaskGraphicsProxy.h
index bbe17efe368..06db94f4b21 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/View/Mask/MaskGraphicsProxy.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskGraphicsProxy.h
+//! @file GUI/View/Mask/MaskGraphicsProxy.h
//! @brief Defines class MaskGraphicsProxy
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSPROXY_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSPROXY_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSPROXY_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSPROXY_H
-#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
+#include "GUI/View/Mask/MaskEditorHelper.h"
#include <QGraphicsProxyWidget>
class SessionItem;
@@ -53,4 +53,4 @@ private:
bool m_send_signals_to_colormap;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSPROXY_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSPROXY_H
diff --git a/GUI/View/MaskWidgets/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
similarity index 98%
rename from GUI/View/MaskWidgets/MaskGraphicsScene.cpp
rename to GUI/View/Mask/MaskGraphicsScene.cpp
index e371773b975..47a0400644b 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskGraphicsScene.cpp
+//! @file GUI/View/Mask/MaskGraphicsScene.cpp
//! @brief Implements class MaskGraphicsScene
//!
//! @homepage http://www.bornagainproject.org
@@ -12,17 +12,17 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/MaskWidgets/ColorMapSceneAdaptor.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsProxy.h"
-#include "GUI/View/MaskWidgets/MaskViewFactory.h"
-#include "GUI/View/MaskWidgets/PolygonView.h"
+#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
+#include "GUI/View/Mask/MaskGraphicsProxy.h"
+#include "GUI/View/Mask/MaskViewFactory.h"
+#include "GUI/View/Mask/PolygonView.h"
#include <QGraphicsItem>
#include <QGraphicsSceneMoveEvent>
#include <QItemSelection>
diff --git a/GUI/View/MaskWidgets/MaskGraphicsScene.h b/GUI/View/Mask/MaskGraphicsScene.h
similarity index 92%
rename from GUI/View/MaskWidgets/MaskGraphicsScene.h
rename to GUI/View/Mask/MaskGraphicsScene.h
index c2c26af32b2..e7eac831cf9 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsScene.h
+++ b/GUI/View/Mask/MaskGraphicsScene.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskGraphicsScene.h
+//! @file GUI/View/Mask/MaskGraphicsScene.h
//! @brief Defines class MaskGraphicsScene
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSSCENE_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSSCENE_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSSCENE_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSSCENE_H
-#include "GUI/View/MaskWidgets/MaskDrawingContext.h"
-#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
+#include "GUI/View/Mask/MaskDrawingContext.h"
+#include "GUI/View/Mask/MaskEditorHelper.h"
#include <QGraphicsScene>
#include <QMap>
#include <QModelIndex>
@@ -122,4 +122,4 @@ private:
MaskDrawingContext m_context;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSSCENE_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSSCENE_H
diff --git a/GUI/View/MaskWidgets/MaskGraphicsView.cpp b/GUI/View/Mask/MaskGraphicsView.cpp
similarity index 95%
rename from GUI/View/MaskWidgets/MaskGraphicsView.cpp
rename to GUI/View/Mask/MaskGraphicsView.cpp
index 766f2dbdb92..52cffc2c9ed 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/View/Mask/MaskGraphicsView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskGraphicsView.cpp
+//! @file GUI/View/Mask/MaskGraphicsView.cpp
//! @brief Implements class MaskGraphicsView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskGraphicsView.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsProxy.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsScene.h"
+#include "GUI/View/Mask/MaskGraphicsView.h"
+#include "GUI/View/Mask/MaskGraphicsProxy.h"
+#include "GUI/View/Mask/MaskGraphicsScene.h"
#include <QGraphicsScene>
#include <QScrollBar>
#include <QTransform>
diff --git a/GUI/View/MaskWidgets/MaskGraphicsView.h b/GUI/View/Mask/MaskGraphicsView.h
similarity index 84%
rename from GUI/View/MaskWidgets/MaskGraphicsView.h
rename to GUI/View/Mask/MaskGraphicsView.h
index d41b7a91617..10e0de7a0c4 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsView.h
+++ b/GUI/View/Mask/MaskGraphicsView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskGraphicsView.h
+//! @file GUI/View/Mask/MaskGraphicsView.h
//! @brief Defines class MaskGraphicsView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSVIEW_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QGraphicsView>
class QWheelEvent;
@@ -56,4 +56,4 @@ private:
double m_current_zoom_value;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKGRAPHICSVIEW_H
diff --git a/GUI/View/MaskWidgets/MaskResultsPresenter.cpp b/GUI/View/Mask/MaskResultsPresenter.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/MaskResultsPresenter.cpp
rename to GUI/View/Mask/MaskResultsPresenter.cpp
index 5bd65af623c..4f0d341a454 100644
--- a/GUI/View/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/View/Mask/MaskResultsPresenter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskResultsPresenter.cpp
+//! @file GUI/View/Mask/MaskResultsPresenter.cpp
//! @brief Implements class MaskResultsPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskResultsPresenter.h"
+#include "GUI/View/Mask/MaskResultsPresenter.h"
#include "Device/Mask/DetectorMask.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
diff --git a/GUI/View/MaskWidgets/MaskResultsPresenter.h b/GUI/View/Mask/MaskResultsPresenter.h
similarity index 83%
rename from GUI/View/MaskWidgets/MaskResultsPresenter.h
rename to GUI/View/Mask/MaskResultsPresenter.h
index 68ff35fa069..0a8bdcf80b1 100644
--- a/GUI/View/MaskWidgets/MaskResultsPresenter.h
+++ b/GUI/View/Mask/MaskResultsPresenter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskResultsPresenter.h
+//! @file GUI/View/Mask/MaskResultsPresenter.h
//! @brief Defines class MaskResultsPresenter
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKRESULTSPRESENTER_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKRESULTSPRESENTER_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QModelIndex>
#include <QObject>
#include <memory>
@@ -51,4 +51,4 @@ private:
bool m_interpolation_flag_backup;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKRESULTSPRESENTER_H
diff --git a/GUI/View/MaskWidgets/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
similarity index 85%
rename from GUI/View/MaskWidgets/MaskViewFactory.cpp
rename to GUI/View/Mask/MaskViewFactory.cpp
index ef51924ccf7..7caa57c8ac8 100644
--- a/GUI/View/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskViewFactory.cpp
+//! @file GUI/View/Mask/MaskViewFactory.cpp
//! @brief Implements class MaskViewFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,18 +12,18 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/MaskViewFactory.h"
+#include "GUI/View/Mask/MaskViewFactory.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/MaskWidgets/EllipseView.h"
-#include "GUI/View/MaskWidgets/LineViews.h"
-#include "GUI/View/MaskWidgets/MaskAllView.h"
-#include "GUI/View/MaskWidgets/MaskContainerView.h"
-#include "GUI/View/MaskWidgets/PolygonPointView.h"
-#include "GUI/View/MaskWidgets/PolygonView.h"
-#include "GUI/View/MaskWidgets/RegionOfInterestView.h"
+#include "GUI/View/Mask/EllipseView.h"
+#include "GUI/View/Mask/LineViews.h"
+#include "GUI/View/Mask/MaskAllView.h"
+#include "GUI/View/Mask/MaskContainerView.h"
+#include "GUI/View/Mask/PolygonPointView.h"
+#include "GUI/View/Mask/PolygonView.h"
+#include "GUI/View/Mask/RegionOfInterestView.h"
#include <boost/polymorphic_cast.hpp>
using boost::polymorphic_downcast;
diff --git a/GUI/View/MaskWidgets/MaskViewFactory.h b/GUI/View/Mask/MaskViewFactory.h
similarity index 78%
rename from GUI/View/MaskWidgets/MaskViewFactory.h
rename to GUI/View/Mask/MaskViewFactory.h
index e8851c1e4dd..6db3063d7e3 100644
--- a/GUI/View/MaskWidgets/MaskViewFactory.h
+++ b/GUI/View/Mask/MaskViewFactory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/MaskViewFactory.h
+//! @file GUI/View/Mask/MaskViewFactory.h
//! @brief Defines class MaskViewFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKVIEWFACTORY_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKVIEWFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_MASKVIEWFACTORY_H
+#define BORNAGAIN_GUI_VIEW_MASK_MASKVIEWFACTORY_H
#include <QString>
@@ -28,4 +28,4 @@ public:
static IShape2DView* createMaskView(SessionItem* item, ISceneAdaptor* adaptor = 0);
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKVIEWFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_MASKVIEWFACTORY_H
diff --git a/GUI/View/MaskWidgets/MaskWidgets.qrc b/GUI/View/Mask/MaskWidgets.qrc
similarity index 100%
rename from GUI/View/MaskWidgets/MaskWidgets.qrc
rename to GUI/View/Mask/MaskWidgets.qrc
diff --git a/GUI/View/MaskWidgets/PolygonPointView.cpp b/GUI/View/Mask/PolygonPointView.cpp
similarity index 95%
rename from GUI/View/MaskWidgets/PolygonPointView.cpp
rename to GUI/View/Mask/PolygonPointView.cpp
index a68b1b9f4fe..b907ccb7b8c 100644
--- a/GUI/View/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/View/Mask/PolygonPointView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/PolygonPointView.cpp
+//! @file GUI/View/Mask/PolygonPointView.cpp
//! @brief Implements PolygonPointView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/PolygonPointView.h"
+#include "GUI/View/Mask/PolygonPointView.h"
#include "GUI/Model/Data/MaskItems.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/View/MaskWidgets/PolygonPointView.h b/GUI/View/Mask/PolygonPointView.h
similarity index 85%
rename from GUI/View/MaskWidgets/PolygonPointView.h
rename to GUI/View/Mask/PolygonPointView.h
index 4e50f9979dc..ae1ab069f2f 100644
--- a/GUI/View/MaskWidgets/PolygonPointView.h
+++ b/GUI/View/Mask/PolygonPointView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/PolygonPointView.h
+//! @file GUI/View/Mask/PolygonPointView.h
//! @brief Defines PolygonPointView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONPOINTVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONPOINTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_POLYGONPOINTVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_POLYGONPOINTVIEW_H
-#include "GUI/View/MaskWidgets/IShape2DView.h"
+#include "GUI/View/Mask/IShape2DView.h"
class PolygonPointItem;
@@ -58,4 +58,4 @@ private:
bool m_on_hover;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONPOINTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_POLYGONPOINTVIEW_H
diff --git a/GUI/View/MaskWidgets/PolygonView.cpp b/GUI/View/Mask/PolygonView.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/PolygonView.cpp
rename to GUI/View/Mask/PolygonView.cpp
index 88aaca5970a..d8e51f687c1 100644
--- a/GUI/View/MaskWidgets/PolygonView.cpp
+++ b/GUI/View/Mask/PolygonView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/PolygonView.cpp
+//! @file GUI/View/Mask/PolygonView.cpp
//! @brief Implements PolygonView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/PolygonView.h"
+#include "GUI/View/Mask/PolygonView.h"
#include "GUI/Model/Data/MaskItems.h"
-#include "GUI/View/MaskWidgets/PolygonPointView.h"
+#include "GUI/View/Mask/PolygonPointView.h"
#include <QCursor>
#include <QPainter>
diff --git a/GUI/View/MaskWidgets/PolygonView.h b/GUI/View/Mask/PolygonView.h
similarity index 87%
rename from GUI/View/MaskWidgets/PolygonView.h
rename to GUI/View/Mask/PolygonView.h
index ffb9c3f6e69..e7e00c26753 100644
--- a/GUI/View/MaskWidgets/PolygonView.h
+++ b/GUI/View/Mask/PolygonView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/PolygonView.h
+//! @file GUI/View/Mask/PolygonView.h
//! @brief Defines PolygonView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_POLYGONVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_POLYGONVIEW_H
-#include "GUI/View/MaskWidgets/IShape2DView.h"
+#include "GUI/View/Mask/IShape2DView.h"
#include <QPolygonF>
class PolygonItem;
@@ -65,4 +65,4 @@ private:
bool m_close_polygon_request;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_POLYGONVIEW_H
diff --git a/GUI/View/MaskWidgets/RectangleBaseView.cpp b/GUI/View/Mask/RectangleBaseView.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/RectangleBaseView.cpp
rename to GUI/View/Mask/RectangleBaseView.cpp
index 3cf99881f7a..2f25ce9e4a1 100644
--- a/GUI/View/MaskWidgets/RectangleBaseView.cpp
+++ b/GUI/View/Mask/RectangleBaseView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/RectangleBaseView.cpp
+//! @file GUI/View/Mask/RectangleBaseView.cpp
//! @brief Implements RectangleBaseView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/RectangleBaseView.h"
+#include "GUI/View/Mask/RectangleBaseView.h"
#include "Base/Utils/Assert.h"
namespace {
diff --git a/GUI/View/MaskWidgets/RectangleBaseView.h b/GUI/View/Mask/RectangleBaseView.h
similarity index 84%
rename from GUI/View/MaskWidgets/RectangleBaseView.h
rename to GUI/View/Mask/RectangleBaseView.h
index 2fe3c0df9ce..460cfd3c6bb 100644
--- a/GUI/View/MaskWidgets/RectangleBaseView.h
+++ b/GUI/View/Mask/RectangleBaseView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/RectangleBaseView.h
+//! @file GUI/View/Mask/RectangleBaseView.h
//! @brief Defines RectangleBaseView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEBASEVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEBASEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_RECTANGLEBASEVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_RECTANGLEBASEVIEW_H
-#include "GUI/View/MaskWidgets/IShape2DView.h"
-#include "GUI/View/MaskWidgets/SizeHandleElement.h"
+#include "GUI/View/Mask/IShape2DView.h"
+#include "GUI/View/Mask/SizeHandleElement.h"
#include <QMap>
//! Base view for all rectangular-like masks.
@@ -57,4 +57,4 @@ protected:
SizeHandleElement* m_activeHandleElement;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEBASEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_RECTANGLEBASEVIEW_H
diff --git a/GUI/View/MaskWidgets/RectangleView.cpp b/GUI/View/Mask/RectangleView.cpp
similarity index 97%
rename from GUI/View/MaskWidgets/RectangleView.cpp
rename to GUI/View/Mask/RectangleView.cpp
index 2f12bf75e27..1a6f9d1f376 100644
--- a/GUI/View/MaskWidgets/RectangleView.cpp
+++ b/GUI/View/Mask/RectangleView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/RectangleView.cpp
+//! @file GUI/View/Mask/RectangleView.cpp
//! @brief Implements RectangleView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/RectangleView.h"
+#include "GUI/View/Mask/RectangleView.h"
#include "GUI/Model/Data/MaskItems.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/View/MaskWidgets/RectangleView.h b/GUI/View/Mask/RectangleView.h
similarity index 85%
rename from GUI/View/MaskWidgets/RectangleView.h
rename to GUI/View/Mask/RectangleView.h
index d22b907934c..f014c150296 100644
--- a/GUI/View/MaskWidgets/RectangleView.h
+++ b/GUI/View/Mask/RectangleView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/RectangleView.h
+//! @file GUI/View/Mask/RectangleView.h
//! @brief Defines RectangleView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_RECTANGLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_RECTANGLEVIEW_H
-#include "GUI/View/MaskWidgets/RectangleBaseView.h"
+#include "GUI/View/Mask/RectangleBaseView.h"
class RectangleItem;
@@ -56,4 +56,4 @@ private:
RectangleItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_RECTANGLEVIEW_H
diff --git a/GUI/View/MaskWidgets/RegionOfInterestView.cpp b/GUI/View/Mask/RegionOfInterestView.cpp
similarity index 89%
rename from GUI/View/MaskWidgets/RegionOfInterestView.cpp
rename to GUI/View/Mask/RegionOfInterestView.cpp
index 350c6eabee5..3ada6809009 100644
--- a/GUI/View/MaskWidgets/RegionOfInterestView.cpp
+++ b/GUI/View/Mask/RegionOfInterestView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/RegionOfInterestView.cpp
+//! @file GUI/View/Mask/RegionOfInterestView.cpp
//! @brief Defines RegionOfInterestView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/RegionOfInterestView.h"
+#include "GUI/View/Mask/RegionOfInterestView.h"
#include "GUI/Model/Data/MaskItems.h"
-#include "GUI/View/MaskWidgets/ISceneAdaptor.h"
+#include "GUI/View/Mask/ISceneAdaptor.h"
#include <QPainter>
RegionOfInterestView::RegionOfInterestView(RegionOfInterestItem* item) : RectangleView(item) {}
diff --git a/GUI/View/MaskWidgets/RegionOfInterestView.h b/GUI/View/Mask/RegionOfInterestView.h
similarity index 78%
rename from GUI/View/MaskWidgets/RegionOfInterestView.h
rename to GUI/View/Mask/RegionOfInterestView.h
index 3fe0ba41750..14771b2bcee 100644
--- a/GUI/View/MaskWidgets/RegionOfInterestView.h
+++ b/GUI/View/Mask/RegionOfInterestView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/RegionOfInterestView.h
+//! @file GUI/View/Mask/RegionOfInterestView.h
//! @brief Defines RegionOfInterestView class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_REGIONOFINTERESTVIEW_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_REGIONOFINTERESTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTVIEW_H
-#include "GUI/View/MaskWidgets/RectangleView.h"
+#include "GUI/View/Mask/RectangleView.h"
class RegionOfInterestItem;
@@ -38,4 +38,4 @@ protected:
void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_REGIONOFINTERESTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_REGIONOFINTERESTVIEW_H
diff --git a/GUI/View/MaskWidgets/SizeHandleElement.cpp b/GUI/View/Mask/SizeHandleElement.cpp
similarity index 98%
rename from GUI/View/MaskWidgets/SizeHandleElement.cpp
rename to GUI/View/Mask/SizeHandleElement.cpp
index ed783129143..85a677696a2 100644
--- a/GUI/View/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/View/Mask/SizeHandleElement.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/SizeHandleElement.cpp
+//! @file GUI/View/Mask/SizeHandleElement.cpp
//! @brief Implements SizeHandleElement class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/MaskWidgets/SizeHandleElement.h"
+#include "GUI/View/Mask/SizeHandleElement.h"
#include <QGraphicsSceneHoverEvent>
#include <QPainter>
diff --git a/GUI/View/MaskWidgets/SizeHandleElement.h b/GUI/View/Mask/SizeHandleElement.h
similarity index 88%
rename from GUI/View/MaskWidgets/SizeHandleElement.h
rename to GUI/View/Mask/SizeHandleElement.h
index 6a11a1dc2d6..e811fac2bcd 100644
--- a/GUI/View/MaskWidgets/SizeHandleElement.h
+++ b/GUI/View/Mask/SizeHandleElement.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/MaskWidgets/SizeHandleElement.h
+//! @file GUI/View/Mask/SizeHandleElement.h
//! @brief Defines SizeHandleElement class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_SIZEHANDLEELEMENT_H
-#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_SIZEHANDLEELEMENT_H
+#ifndef BORNAGAIN_GUI_VIEW_MASK_SIZEHANDLEELEMENT_H
+#define BORNAGAIN_GUI_VIEW_MASK_SIZEHANDLEELEMENT_H
-#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
+#include "GUI/View/Mask/MaskEditorHelper.h"
#include <QCursor>
#include <QGraphicsObject>
#include <QMap>
@@ -72,4 +72,4 @@ private:
static QMap<EHandleLocation, EHandleLocation> m_opposite_handle_location;
};
-#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_SIZEHANDLEELEMENT_H
+#endif // BORNAGAIN_GUI_VIEW_MASK_SIZEHANDLEELEMENT_H
diff --git a/GUI/View/MaskWidgets/images/maskeditor_arrow.svg b/GUI/View/Mask/image/maskeditor_arrow.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_arrow.svg
rename to GUI/View/Mask/image/maskeditor_arrow.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_bringtofront.svg b/GUI/View/Mask/image/maskeditor_bringtofront.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_bringtofront.svg
rename to GUI/View/Mask/image/maskeditor_bringtofront.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_details.svg b/GUI/View/Mask/image/maskeditor_details.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_details.svg
rename to GUI/View/Mask/image/maskeditor_details.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_ellipse.svg b/GUI/View/Mask/image/maskeditor_ellipse.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_ellipse.svg
rename to GUI/View/Mask/image/maskeditor_ellipse.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_hand.svg b/GUI/View/Mask/image/maskeditor_hand.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_hand.svg
rename to GUI/View/Mask/image/maskeditor_hand.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_horizontalline.svg b/GUI/View/Mask/image/maskeditor_horizontalline.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_horizontalline.svg
rename to GUI/View/Mask/image/maskeditor_horizontalline.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_lightbulb.svg b/GUI/View/Mask/image/maskeditor_lightbulb.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_lightbulb.svg
rename to GUI/View/Mask/image/maskeditor_lightbulb.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_maskall.svg b/GUI/View/Mask/image/maskeditor_maskall.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_maskall.svg
rename to GUI/View/Mask/image/maskeditor_maskall.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_maskfalse.svg b/GUI/View/Mask/image/maskeditor_maskfalse.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_maskfalse.svg
rename to GUI/View/Mask/image/maskeditor_maskfalse.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_masktrue.svg b/GUI/View/Mask/image/maskeditor_masktrue.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_masktrue.svg
rename to GUI/View/Mask/image/maskeditor_masktrue.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_polygon.svg b/GUI/View/Mask/image/maskeditor_polygon.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_polygon.svg
rename to GUI/View/Mask/image/maskeditor_polygon.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_rectangle.svg b/GUI/View/Mask/image/maskeditor_rectangle.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_rectangle.svg
rename to GUI/View/Mask/image/maskeditor_rectangle.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_refresh.svg b/GUI/View/Mask/image/maskeditor_refresh.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_refresh.svg
rename to GUI/View/Mask/image/maskeditor_refresh.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_roi.svg b/GUI/View/Mask/image/maskeditor_roi.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_roi.svg
rename to GUI/View/Mask/image/maskeditor_roi.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_save.svg b/GUI/View/Mask/image/maskeditor_save.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_save.svg
rename to GUI/View/Mask/image/maskeditor_save.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_sendtoback.svg b/GUI/View/Mask/image/maskeditor_sendtoback.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_sendtoback.svg
rename to GUI/View/Mask/image/maskeditor_sendtoback.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_toolpanel.svg b/GUI/View/Mask/image/maskeditor_toolpanel.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_toolpanel.svg
rename to GUI/View/Mask/image/maskeditor_toolpanel.svg
diff --git a/GUI/View/MaskWidgets/images/maskeditor_verticalline.svg b/GUI/View/Mask/image/maskeditor_verticalline.svg
similarity index 100%
rename from GUI/View/MaskWidgets/images/maskeditor_verticalline.svg
rename to GUI/View/Mask/image/maskeditor_verticalline.svg
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp b/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
index 9470c8370d2..fe71701ca45 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
@@ -19,8 +19,8 @@
#include "GUI/View/Intensity/ColorMap.h"
#include "GUI/View/Intensity/PlotStatusLabel.h"
#include "GUI/View/Intensity/ScientificPlotEvent.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/View/MaskWidgets/MaskGraphicsView.h"
+#include "GUI/View/Mask/MaskGraphicsScene.h"
+#include "GUI/View/Mask/MaskGraphicsView.h"
#include <QItemSelectionModel>
#include <QVBoxLayout>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h b/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
index 19b5d30b4d3..ce8c1d03cca 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QModelIndex>
#include <QWidget>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
index 1fa4acbbbe7..a1cbbbc1cc9 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -104,7 +104,7 @@ void ProjectionsToolBar::setup_selection_group()
add_separator();
QToolButton* selectionButton = new QToolButton(this);
- selectionButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_arrow.svg"));
+ selectionButton->setIcon(QIcon(":/Mask/img/maskeditor_arrow.svg"));
selectionButton->setToolTip(selection_mode_tooltip);
selectionButton->setCheckable(true);
addWidget(selectionButton);
@@ -116,13 +116,13 @@ void ProjectionsToolBar::setup_selection_group()
void ProjectionsToolBar::setup_shapes_group()
{
auto horizontalLineButton = new QToolButton(this);
- horizontalLineButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_horizontalline.svg"));
+ horizontalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_horizontalline.svg"));
horizontalLineButton->setToolTip(horizontal_mode_tooltip);
horizontalLineButton->setCheckable(true);
addWidget(horizontalLineButton);
auto verticalLineButton = new QToolButton(this);
- verticalLineButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_verticalline.svg"));
+ verticalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_verticalline.svg"));
verticalLineButton->setToolTip(vertical_mode_tooltip);
verticalLineButton->setCheckable(true);
addWidget(verticalLineButton);
@@ -136,7 +136,7 @@ void ProjectionsToolBar::setup_shapes_group()
void ProjectionsToolBar::setup_extratools_group()
{
auto saveButton = new QToolButton(this);
- saveButton->setIcon(QIcon(":/MaskWidgets/images/maskeditor_save.svg"));
+ saveButton->setIcon(QIcon(":/Mask/img/maskeditor_save.svg"));
saveButton->setToolTip("Save created projections in multi-column ASCII file.");
addWidget(saveButton);
connect(saveButton, &QToolButton::clicked, m_editorActions,
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
index 2ffa8562961..ff3df919a56 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QToolBar>
class ProjectionsEditorActions;
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsWidget.h b/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
index 927cbed7efb..c7f428c4a92 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/View/Mask/MaskEditorFlags.h"
#include "GUI/Widget/Common/SessionItemWidget.h"
class ProjectionsPlot;
diff --git a/GUI/View/Toplevel/ImportDataView.cpp b/GUI/View/Toplevel/ImportDataView.cpp
index 12de8c0471b..89c162355a6 100644
--- a/GUI/View/Toplevel/ImportDataView.cpp
+++ b/GUI/View/Toplevel/ImportDataView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/ImportDataWidgets/RealDataSelectorWidget.h"
+#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "GUI/View/Main/MainWindow.h"
#include <QAction>
#include <QSplitter>
diff --git a/GUI/View/Toplevel/ImportDataView.h b/GUI/View/Toplevel/ImportDataView.h
index 4bf0579f8c1..c43f5a9a2b5 100644
--- a/GUI/View/Toplevel/ImportDataView.h
+++ b/GUI/View/Toplevel/ImportDataView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
#define BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
-#include "GUI/View/ImportDataWidgets/RealDataPresenter.h"
+#include "GUI/View/Import/RealDataPresenter.h"
#include "GUI/Widget/Common/ItemStackPresenter.h"
class RealDataModel;
--
GitLab