From 413f0be362ad1ce9093ad7c86c3d88ca83129d9d Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 8 Apr 2023 08:36:04 +0200
Subject: [PATCH 1/4] mv-src GUI/Model/Data/RealItem. GUI/Model/Device/
---
GUI/Model/Device/InstrumentItems.cpp | 2 +-
GUI/Model/{Data => Device}/RealItem.cpp | 4 ++--
GUI/Model/{Data => Device}/RealItem.h | 8 ++++----
GUI/Model/Job/JobItem.cpp | 2 +-
GUI/Model/Model/JobModel.cpp | 2 +-
GUI/Model/Model/RealModel.cpp | 2 +-
GUI/Model/Project/LinkInstrumentManager.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 2 +-
GUI/View/Common/DataAccessWidget.h | 2 +-
GUI/View/Fit/FitObjectiveBuilder.cpp | 2 +-
GUI/View/Import/ImportDataUtil.cpp | 2 +-
GUI/View/Import/RealDataPropertiesWidget.cpp | 2 +-
GUI/View/Import/RealDataSelectorWidget.cpp | 2 +-
GUI/View/Import/RealDataTreeModel.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1D.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 2 +-
GUI/View/Toplevel/SimulationView.cpp | 2 +-
Tests/Unit/GUI/TestAutosaveController.cpp | 2 +-
Tests/Unit/GUI/TestJobModel.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestRealModel.cpp | 2 +-
Tests/Unit/GUI/Utils.cpp | 2 +-
24 files changed, 28 insertions(+), 28 deletions(-)
rename GUI/Model/{Data => Device}/RealItem.cpp (99%)
rename GUI/Model/{Data => Device}/RealItem.h (95%)
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 6507cc29cbf..f8afe04a109 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -24,7 +24,7 @@
#include "GUI/Model/Axis/PointwiseAxisItem.h"
#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamAngleItems.h"
diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Device/RealItem.cpp
similarity index 99%
rename from GUI/Model/Data/RealItem.cpp
rename to GUI/Model/Device/RealItem.cpp
index 6cd617b1f93..3bfd74ff905 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Device/RealItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/RealItem.cpp
+//! @file GUI/Model/Device/RealItem.cpp
//! @brief Implements class RealItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "Device/Coord/ICoordSystem.h"
#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
diff --git a/GUI/Model/Data/RealItem.h b/GUI/Model/Device/RealItem.h
similarity index 95%
rename from GUI/Model/Data/RealItem.h
rename to GUI/Model/Device/RealItem.h
index 8a4d5681329..05d3140a81a 100644
--- a/GUI/Model/Data/RealItem.h
+++ b/GUI/Model/Device/RealItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/RealItem.h
+//! @file GUI/Model/Device/RealItem.h
//! @brief Defines class RealItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_REALITEM_H
-#define BORNAGAIN_GUI_MODEL_DATA_REALITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_REALITEM_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_REALITEM_H
#include <QObject>
@@ -152,4 +152,4 @@ private:
std::unique_ptr<AbstractDataLoader> m_dataLoader;
};
-#endif // BORNAGAIN_GUI_MODEL_DATA_REALITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_REALITEM_H
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 2aadba0af6f..68cb5d75ff2 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -18,7 +18,7 @@
#include "Device/Detector/SimulationAreaIterator.h" // roiIndex
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index e6d9478610c..874b31f717d 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/ParameterTreeUtil.h"
diff --git a/GUI/Model/Model/RealModel.cpp b/GUI/Model/Model/RealModel.cpp
index ba217bcce5a..39759a3f74f 100644
--- a/GUI/Model/Model/RealModel.cpp
+++ b/GUI/Model/Model/RealModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Model/RealModel.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index de50ebf90da..802634054fd 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index c6914fdde1d..2aa32e35781 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
diff --git a/GUI/View/Common/DataAccessWidget.h b/GUI/View/Common/DataAccessWidget.h
index e1ad70c3a4b..9a8ed9f40f3 100644
--- a/GUI/View/Common/DataAccessWidget.h
+++ b/GUI/View/Common/DataAccessWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
#define BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include <QWidget>
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 03d65373ba8..c8676156d6d 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -18,7 +18,7 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
diff --git a/GUI/View/Import/ImportDataUtil.cpp b/GUI/View/Import/ImportDataUtil.cpp
index 8276267b40e..ebab5ce9d00 100644
--- a/GUI/View/Import/ImportDataUtil.cpp
+++ b/GUI/View/Import/ImportDataUtil.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Import/ImportDataUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/View/Loaders/QREDataLoader.h"
#include <QApplication>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 34c8ea419a6..5effb00c429 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Tool/Globals.h"
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 01ed39abb23..443a700246b 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "Device/Data/Datafield.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/Util/Error.h"
diff --git a/GUI/View/Import/RealDataTreeModel.cpp b/GUI/View/Import/RealDataTreeModel.cpp
index b374e40c0ce..390be810582 100644
--- a/GUI/View/Import/RealDataTreeModel.cpp
+++ b/GUI/View/Import/RealDataTreeModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
#include <QApplication>
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index e93bb5abcdd..10078bf1dc5 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loaders/AutomaticDataLoader1D.h"
#include "Base/Util/Assert.h"
#include "Device/IO/ReadReflectometry.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/XML/DeserializationException.h"
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
index 4e9975e5d53..39833a13795 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
#include "Base/Axis/Frame.h"
#include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
AutomaticDataLoader1DResultModel::AutomaticDataLoader1DResultModel(RealItem* item)
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index c90d51fb33e..8d99662d2d1 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/Assert.h"
#include "Device/Coord/CoordSystem1D.h"
#include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/Util/CoordName.h"
#include "GUI/Support/XML/DeserializationException.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index f21e0a7c2bf..07e45201780 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Toplevel/SimulationView.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp
index eb464f8694d..2863ee75ecf 100644
--- a/Tests/Unit/GUI/TestAutosaveController.cpp
+++ b/Tests/Unit/GUI/TestAutosaveController.cpp
@@ -1,7 +1,7 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
#include "GUI/Support/IO/ProjectUtil.h"
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index 3230782d4c7..44e054a7c42 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -1,7 +1,7 @@
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 1c94f88b616..f075af901ef 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,7 +1,7 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Data/DataItemUtil.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/Model/Model/RealModel.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index b08a6896f1c..32b8cc34ef6 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,7 +1,7 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/Tests/Unit/GUI/TestRealModel.cpp b/Tests/Unit/GUI/TestRealModel.cpp
index c028b70130a..3e52a965fb9 100644
--- a/Tests/Unit/GUI/TestRealModel.cpp
+++ b/Tests/Unit/GUI/TestRealModel.cpp
@@ -3,7 +3,7 @@
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentModel.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 367fe693adb..5f5ec3ff30c 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -18,7 +18,7 @@
#include "Device/Histo/DiffUtil.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Support/IO/ProjectUtil.h"
--
GitLab
From 776e57c95f06aa6f1b483469c3b909308d023764 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 8 Apr 2023 08:39:37 +0200
Subject: [PATCH 2/4] mv-src GUI/Model/CatDevice/MaskItemCatalog.
GUI/Model/Data/
---
GUI/Model/{CatDevice => Data}/MaskItemCatalog.cpp | 4 ++--
GUI/Model/{CatDevice => Data}/MaskItemCatalog.h | 8 ++++----
GUI/Model/Data/MaskItems.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
rename GUI/Model/{CatDevice => Data}/MaskItemCatalog.cpp (96%)
rename GUI/Model/{CatDevice => Data}/MaskItemCatalog.h (85%)
diff --git a/GUI/Model/CatDevice/MaskItemCatalog.cpp b/GUI/Model/Data/MaskItemCatalog.cpp
similarity index 96%
rename from GUI/Model/CatDevice/MaskItemCatalog.cpp
rename to GUI/Model/Data/MaskItemCatalog.cpp
index 7076daa4ad4..5c725743a0e 100644
--- a/GUI/Model/CatDevice/MaskItemCatalog.cpp
+++ b/GUI/Model/Data/MaskItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/MaskItemCatalog.cpp
+//! @file GUI/Model/Data/MaskItemCatalog.cpp
//! @brief Implements class MaskItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/MaskItemCatalog.h"
+#include "GUI/Model/Data/MaskItemCatalog.h"
#include "GUI/Model/Data/MaskItems.h"
MaskItem* MaskItemCatalog::create(Type type)
diff --git a/GUI/Model/CatDevice/MaskItemCatalog.h b/GUI/Model/Data/MaskItemCatalog.h
similarity index 85%
rename from GUI/Model/CatDevice/MaskItemCatalog.h
rename to GUI/Model/Data/MaskItemCatalog.h
index 95c49e0f8a5..df783ecf873 100644
--- a/GUI/Model/CatDevice/MaskItemCatalog.h
+++ b/GUI/Model/Data/MaskItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/MaskItemCatalog.h
+//! @file GUI/Model/Data/MaskItemCatalog.h
//! @brief Defines class MaskItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_MASKITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_MASKITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -49,4 +49,4 @@ public:
static Type type(const MaskItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_MASKITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
diff --git a/GUI/Model/Data/MaskItems.h b/GUI/Model/Data/MaskItems.h
index d9ea091233b..dbb1d8b0003 100644
--- a/GUI/Model/Data/MaskItems.h
+++ b/GUI/Model/Data/MaskItems.h
@@ -17,7 +17,7 @@
#include "Base/Types/OwningVector.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/CatDevice/MaskItemCatalog.h"
+#include "GUI/Model/Data/MaskItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include <QAbstractListModel>
--
GitLab
From bb3ab0a8b747b9ed8bfd7292953978e561ca8747 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 8 Apr 2023 09:30:18 +0200
Subject: [PATCH 3/4] reorganize GUI/Model subdirectories
dissolve Cat* directories; add Beam/ and Detector/
---
GUI/Model/{Device => Beam}/BeamAngleItems.cpp | 4 ++--
GUI/Model/{Device => Beam}/BeamAngleItems.h | 10 +++++-----
.../{Device => Beam}/BeamDistributionItem.cpp | 4 ++--
GUI/Model/{Device => Beam}/BeamDistributionItem.h | 10 +++++-----
GUI/Model/{Device => Beam}/BeamWavelengthItem.cpp | 4 ++--
GUI/Model/{Device => Beam}/BeamWavelengthItem.h | 10 +++++-----
.../DistributionItemCatalog.cpp | 4 ++--
.../{CatDevice => Beam}/DistributionItemCatalog.h | 8 ++++----
.../{CatDevice => Beam}/FootprintItemCatalog.cpp | 6 +++---
.../{CatDevice => Beam}/FootprintItemCatalog.h | 8 ++++----
GUI/Model/{Device => Beam}/FootprintItems.cpp | 4 ++--
GUI/Model/{Device => Beam}/FootprintItems.h | 8 ++++----
GUI/Model/{Device => Beam}/GrazingScanItem.cpp | 4 ++--
GUI/Model/{Device => Beam}/GrazingScanItem.h | 10 +++++-----
GUI/Model/{Device => Detector}/DetectorItem.cpp | 6 +++---
GUI/Model/{Device => Detector}/DetectorItem.h | 10 +++++-----
.../DetectorItemCatalog.cpp | 8 ++++----
.../{CatDevice => Detector}/DetectorItemCatalog.h | 8 ++++----
.../{Device => Detector}/OffspecDetectorItem.cpp | 4 ++--
.../{Device => Detector}/OffspecDetectorItem.h | 8 ++++----
.../RectangularDetectorItem.cpp | 6 +++---
.../{Device => Detector}/RectangularDetectorItem.h | 10 +++++-----
.../ResolutionFunctionItemCatalog.cpp | 6 +++---
.../ResolutionFunctionItemCatalog.h | 8 ++++----
.../ResolutionFunctionItems.cpp | 4 ++--
.../{Device => Detector}/ResolutionFunctionItems.h | 8 ++++----
.../{Device => Detector}/SphericalDetectorItem.cpp | 4 ++--
.../{Device => Detector}/SphericalDetectorItem.h | 10 +++++-----
.../BackgroundItemCatalog.cpp | 4 ++--
.../{CatDevice => Device}/BackgroundItemCatalog.h | 8 ++++----
.../InstrumentItemCatalog.cpp | 4 ++--
.../{CatDevice => Device}/InstrumentItemCatalog.h | 8 ++++----
GUI/Model/Device/InstrumentItems.cpp | 14 +++++++-------
GUI/Model/Device/InstrumentItems.h | 6 +++---
GUI/Model/Device/InstrumentModel.h | 2 +-
GUI/Model/Device/SourceItems.cpp | 8 ++++----
GUI/Model/Device/SourceItems.h | 2 +-
GUI/Model/FromCore/ItemizeSimulation.cpp | 14 +++++++-------
GUI/Model/Job/JobItem.h | 2 +-
GUI/Model/Job/MinimizerItem.cpp | 2 +-
GUI/Model/{CatJob => Job}/MinimizerItemCatalog.cpp | 4 ++--
GUI/Model/{CatJob => Job}/MinimizerItemCatalog.h | 8 ++++----
GUI/Model/Model/ParameterTreeUtil.cpp | 12 ++++++------
GUI/Model/Sample/CompoundItem.h | 2 +-
.../FormFactorItemCatalog.cpp | 4 ++--
.../{CatSample => Sample}/FormFactorItemCatalog.h | 8 ++++----
.../InterferenceItemCatalog.cpp | 4 ++--
.../InterferenceItemCatalog.h | 8 ++++----
GUI/Model/Sample/InterferenceItems.h | 4 ++--
GUI/Model/Sample/ItemWithParticles.h | 2 +-
.../ItemWithParticlesCatalog.cpp | 4 ++--
.../ItemWithParticlesCatalog.h | 8 ++++----
.../{CatSample => Sample}/Lattice2DItemCatalog.cpp | 4 ++--
.../{CatSample => Sample}/Lattice2DItemCatalog.h | 8 ++++----
GUI/Model/Sample/LayerItem.h | 2 +-
GUI/Model/Sample/MesocrystalItem.h | 4 ++--
GUI/Model/Sample/ParticleItem.h | 2 +-
GUI/Model/Sample/ParticleLayoutItem.h | 4 ++--
.../{CatSample => Sample}/ProfileItemCatalogs.cpp | 4 ++--
.../{CatSample => Sample}/ProfileItemCatalogs.h | 8 ++++----
.../{CatSample => Sample}/RotationItemCatalog.cpp | 4 ++--
.../{CatSample => Sample}/RotationItemCatalog.h | 8 ++++----
.../{CatSample => Sample}/RoughnessItemCatalog.cpp | 4 ++--
.../{CatSample => Sample}/RoughnessItemCatalog.h | 8 ++++----
GUI/View/Device/DetectorAlignmentForm.cpp | 2 +-
GUI/View/Device/FootprintForm.cpp | 2 +-
GUI/View/Device/RectangularDetectorForm.cpp | 2 +-
GUI/View/Device/ResolutionForm.cpp | 4 ++--
GUI/View/Device/SphericalDetectorForm.cpp | 2 +-
GUI/View/Instrument/AlphaScanEditor.cpp | 2 +-
GUI/View/Instrument/DetectorEditor.cpp | 4 ++--
GUI/View/Instrument/DistributionEditor.cpp | 2 +-
GUI/View/Instrument/GISASBeamEditor.cpp | 6 +++---
GUI/View/Instrument/OffspecDetectorEditor.cpp | 2 +-
GUI/View/Instrument/ScanEditor.cpp | 2 +-
GUI/View/SampleDesigner/CoreAndShellForm.cpp | 2 +-
GUI/View/SampleDesigner/LayerEditorUtil.h | 4 ++--
GUI/View/SampleDesigner/ParticleForm.cpp | 2 +-
GUI/View/SampleDesigner/SampleEditorController.cpp | 2 +-
GUI/View/SampleDesigner/SampleEditorController.h | 4 ++--
Tests/Unit/GUI/TestDetectorItems.cpp | 6 +++---
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
82 files changed, 224 insertions(+), 224 deletions(-)
rename GUI/Model/{Device => Beam}/BeamAngleItems.cpp (96%)
rename GUI/Model/{Device => Beam}/BeamAngleItems.h (83%)
rename GUI/Model/{Device => Beam}/BeamDistributionItem.cpp (96%)
rename GUI/Model/{Device => Beam}/BeamDistributionItem.h (86%)
rename GUI/Model/{Device => Beam}/BeamWavelengthItem.cpp (95%)
rename GUI/Model/{Device => Beam}/BeamWavelengthItem.h (76%)
rename GUI/Model/{CatDevice => Beam}/DistributionItemCatalog.cpp (95%)
rename GUI/Model/{CatDevice => Beam}/DistributionItemCatalog.h (84%)
rename GUI/Model/{CatDevice => Beam}/FootprintItemCatalog.cpp (91%)
rename GUI/Model/{CatDevice => Beam}/FootprintItemCatalog.h (83%)
rename GUI/Model/{Device => Beam}/FootprintItems.cpp (96%)
rename GUI/Model/{Device => Beam}/FootprintItems.h (91%)
rename GUI/Model/{Device => Beam}/GrazingScanItem.cpp (98%)
rename GUI/Model/{Device => Beam}/GrazingScanItem.h (89%)
rename GUI/Model/{Device => Detector}/DetectorItem.cpp (96%)
rename GUI/Model/{Device => Detector}/DetectorItem.h (90%)
rename GUI/Model/{CatDevice => Detector}/DetectorItemCatalog.cpp (86%)
rename GUI/Model/{CatDevice => Detector}/DetectorItemCatalog.h (83%)
rename GUI/Model/{Device => Detector}/OffspecDetectorItem.cpp (96%)
rename GUI/Model/{Device => Detector}/OffspecDetectorItem.h (84%)
rename GUI/Model/{Device => Detector}/RectangularDetectorItem.cpp (98%)
rename GUI/Model/{Device => Detector}/RectangularDetectorItem.h (91%)
rename GUI/Model/{CatDevice => Detector}/ResolutionFunctionItemCatalog.cpp (90%)
rename GUI/Model/{CatDevice => Detector}/ResolutionFunctionItemCatalog.h (83%)
rename GUI/Model/{Device => Detector}/ResolutionFunctionItems.cpp (95%)
rename GUI/Model/{Device => Detector}/ResolutionFunctionItems.h (89%)
rename GUI/Model/{Device => Detector}/SphericalDetectorItem.cpp (97%)
rename GUI/Model/{Device => Detector}/SphericalDetectorItem.h (82%)
rename GUI/Model/{CatDevice => Device}/BackgroundItemCatalog.cpp (93%)
rename GUI/Model/{CatDevice => Device}/BackgroundItemCatalog.h (83%)
rename GUI/Model/{CatDevice => Device}/InstrumentItemCatalog.cpp (94%)
rename GUI/Model/{CatDevice => Device}/InstrumentItemCatalog.h (83%)
rename GUI/Model/{CatJob => Job}/MinimizerItemCatalog.cpp (93%)
rename GUI/Model/{CatJob => Job}/MinimizerItemCatalog.h (81%)
rename GUI/Model/{CatSample => Sample}/FormFactorItemCatalog.cpp (98%)
rename GUI/Model/{CatSample => Sample}/FormFactorItemCatalog.h (89%)
rename GUI/Model/{CatSample => Sample}/InterferenceItemCatalog.cpp (96%)
rename GUI/Model/{CatSample => Sample}/InterferenceItemCatalog.h (84%)
rename GUI/Model/{CatSample => Sample}/ItemWithParticlesCatalog.cpp (95%)
rename GUI/Model/{CatSample => Sample}/ItemWithParticlesCatalog.h (84%)
rename GUI/Model/{CatSample => Sample}/Lattice2DItemCatalog.cpp (94%)
rename GUI/Model/{CatSample => Sample}/Lattice2DItemCatalog.h (83%)
rename GUI/Model/{CatSample => Sample}/ProfileItemCatalogs.cpp (97%)
rename GUI/Model/{CatSample => Sample}/ProfileItemCatalogs.h (89%)
rename GUI/Model/{CatSample => Sample}/RotationItemCatalog.cpp (95%)
rename GUI/Model/{CatSample => Sample}/RotationItemCatalog.h (84%)
rename GUI/Model/{CatSample => Sample}/RoughnessItemCatalog.cpp (92%)
rename GUI/Model/{CatSample => Sample}/RoughnessItemCatalog.h (83%)
diff --git a/GUI/Model/Device/BeamAngleItems.cpp b/GUI/Model/Beam/BeamAngleItems.cpp
similarity index 96%
rename from GUI/Model/Device/BeamAngleItems.cpp
rename to GUI/Model/Beam/BeamAngleItems.cpp
index df3f719a9b6..078554f8237 100644
--- a/GUI/Model/Device/BeamAngleItems.cpp
+++ b/GUI/Model/Beam/BeamAngleItems.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/BeamAngleItems.cpp
+//! @file GUI/Model/Beam/BeamAngleItems.cpp
//! @brief Implements class BeamAngleItems
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/BeamAngleItems.h"
+#include "GUI/Model/Beam/BeamAngleItems.h"
#include "Base/Const/Units.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
diff --git a/GUI/Model/Device/BeamAngleItems.h b/GUI/Model/Beam/BeamAngleItems.h
similarity index 83%
rename from GUI/Model/Device/BeamAngleItems.h
rename to GUI/Model/Beam/BeamAngleItems.h
index d2f9e098a92..9fcc3f76c74 100644
--- a/GUI/Model/Device/BeamAngleItems.h
+++ b/GUI/Model/Beam/BeamAngleItems.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/BeamAngleItems.h
+//! @file GUI/Model/Beam/BeamAngleItems.h
//! @brief Defines class BeamAngleItems
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_BEAMANGLEITEMS_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_BEAMANGLEITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_BEAMANGLEITEMS_H
+#define BORNAGAIN_GUI_MODEL_BEAM_BEAMANGLEITEMS_H
-#include "GUI/Model/Device/BeamDistributionItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
class BeamAzimuthalAngleItem : public BeamDistributionItem {
public:
@@ -45,4 +45,4 @@ private:
const DistributionItem* currentDistribution);
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_BEAMANGLEITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_BEAMANGLEITEMS_H
diff --git a/GUI/Model/Device/BeamDistributionItem.cpp b/GUI/Model/Beam/BeamDistributionItem.cpp
similarity index 96%
rename from GUI/Model/Device/BeamDistributionItem.cpp
rename to GUI/Model/Beam/BeamDistributionItem.cpp
index 70d7ecc6f5f..3c2397641e4 100644
--- a/GUI/Model/Device/BeamDistributionItem.cpp
+++ b/GUI/Model/Beam/BeamDistributionItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/BeamDistributionItem.cpp
+//! @file GUI/Model/Beam/BeamDistributionItem.cpp
//! @brief Implements class BeamDistributionItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/BeamDistributionItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Model/Device/BeamDistributionItem.h b/GUI/Model/Beam/BeamDistributionItem.h
similarity index 86%
rename from GUI/Model/Device/BeamDistributionItem.h
rename to GUI/Model/Beam/BeamDistributionItem.h
index 1a8d0054012..31f932c93d7 100644
--- a/GUI/Model/Device/BeamDistributionItem.h
+++ b/GUI/Model/Beam/BeamDistributionItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/BeamDistributionItem.h
+//! @file GUI/Model/Beam/BeamDistributionItem.h
//! @brief Defines class BeamDistributionItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_BEAMDISTRIBUTIONITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_BEAMDISTRIBUTIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_BEAMDISTRIBUTIONITEM_H
+#define BORNAGAIN_GUI_MODEL_BEAM_BEAMDISTRIBUTIONITEM_H
-#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
+#include "GUI/Model/Beam/DistributionItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "Param/Distrib/ParameterDistribution.h"
@@ -58,4 +58,4 @@ T* BeamDistributionItem::setDistributionItemType()
return dynamic_cast<T*>(m_distribution.currentItem());
}
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_BEAMDISTRIBUTIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_BEAMDISTRIBUTIONITEM_H
diff --git a/GUI/Model/Device/BeamWavelengthItem.cpp b/GUI/Model/Beam/BeamWavelengthItem.cpp
similarity index 95%
rename from GUI/Model/Device/BeamWavelengthItem.cpp
rename to GUI/Model/Beam/BeamWavelengthItem.cpp
index 080dab381fc..921dfe153d3 100644
--- a/GUI/Model/Device/BeamWavelengthItem.cpp
+++ b/GUI/Model/Beam/BeamWavelengthItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/BeamWavelengthItem.cpp
+//! @file GUI/Model/Beam/BeamWavelengthItem.cpp
//! @brief Implements class BeamWavelengthItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
namespace {
diff --git a/GUI/Model/Device/BeamWavelengthItem.h b/GUI/Model/Beam/BeamWavelengthItem.h
similarity index 76%
rename from GUI/Model/Device/BeamWavelengthItem.h
rename to GUI/Model/Beam/BeamWavelengthItem.h
index b3fb1487293..2bcfb08db9b 100644
--- a/GUI/Model/Device/BeamWavelengthItem.h
+++ b/GUI/Model/Beam/BeamWavelengthItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/BeamWavelengthItem.h
+//! @file GUI/Model/Beam/BeamWavelengthItem.h
//! @brief Defines class BeamWavelengthItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_BEAMWAVELENGTHITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_BEAMWAVELENGTHITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_BEAMWAVELENGTHITEM_H
+#define BORNAGAIN_GUI_MODEL_BEAM_BEAMWAVELENGTHITEM_H
-#include "GUI/Model/Device/BeamDistributionItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
class BeamWavelengthItem : public BeamDistributionItem {
public:
@@ -30,4 +30,4 @@ protected:
BeamWavelengthItem(bool onlySymmetricDistributions);
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_BEAMWAVELENGTHITEM_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_BEAMWAVELENGTHITEM_H
diff --git a/GUI/Model/CatDevice/DistributionItemCatalog.cpp b/GUI/Model/Beam/DistributionItemCatalog.cpp
similarity index 95%
rename from GUI/Model/CatDevice/DistributionItemCatalog.cpp
rename to GUI/Model/Beam/DistributionItemCatalog.cpp
index 9ba4ce73213..1d8f4bf4e38 100644
--- a/GUI/Model/CatDevice/DistributionItemCatalog.cpp
+++ b/GUI/Model/Beam/DistributionItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/DistributionItemCatalog.cpp
+//! @file GUI/Model/Beam/DistributionItemCatalog.cpp
//! @brief Implements class DistributionItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
+#include "GUI/Model/Beam/DistributionItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
diff --git a/GUI/Model/CatDevice/DistributionItemCatalog.h b/GUI/Model/Beam/DistributionItemCatalog.h
similarity index 84%
rename from GUI/Model/CatDevice/DistributionItemCatalog.h
rename to GUI/Model/Beam/DistributionItemCatalog.h
index a37157043ab..5456d413ac6 100644
--- a/GUI/Model/CatDevice/DistributionItemCatalog.h
+++ b/GUI/Model/Beam/DistributionItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/DistributionItemCatalog.h
+//! @file GUI/Model/Beam/DistributionItemCatalog.h
//! @brief Defines class DistributionItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_DISTRIBUTIONITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_DISTRIBUTIONITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_DISTRIBUTIONITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_BEAM_DISTRIBUTIONITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -51,4 +51,4 @@ public:
static Type type(const DistributionItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_DISTRIBUTIONITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_DISTRIBUTIONITEMCATALOG_H
diff --git a/GUI/Model/CatDevice/FootprintItemCatalog.cpp b/GUI/Model/Beam/FootprintItemCatalog.cpp
similarity index 91%
rename from GUI/Model/CatDevice/FootprintItemCatalog.cpp
rename to GUI/Model/Beam/FootprintItemCatalog.cpp
index 914a867616a..8e06f70091d 100644
--- a/GUI/Model/CatDevice/FootprintItemCatalog.cpp
+++ b/GUI/Model/Beam/FootprintItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/FootprintItemCatalog.cpp
+//! @file GUI/Model/Beam/FootprintItemCatalog.cpp
//! @brief Implements class FootprintItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/FootprintItemCatalog.h"
+#include "GUI/Model/Beam/FootprintItemCatalog.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Device/FootprintItems.h"
+#include "GUI/Model/Beam/FootprintItems.h"
FootprintItem* FootprintItemCatalog::create(Type type)
{
diff --git a/GUI/Model/CatDevice/FootprintItemCatalog.h b/GUI/Model/Beam/FootprintItemCatalog.h
similarity index 83%
rename from GUI/Model/CatDevice/FootprintItemCatalog.h
rename to GUI/Model/Beam/FootprintItemCatalog.h
index 816626849f4..59cefe7dbb7 100644
--- a/GUI/Model/CatDevice/FootprintItemCatalog.h
+++ b/GUI/Model/Beam/FootprintItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/FootprintItemCatalog.h
+//! @file GUI/Model/Beam/FootprintItemCatalog.h
//! @brief Defines class FootprintItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_FOOTPRINTITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_FOOTPRINTITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_FOOTPRINTITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_BEAM_FOOTPRINTITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -41,4 +41,4 @@ public:
static Type type(const FootprintItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_FOOTPRINTITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_FOOTPRINTITEMCATALOG_H
diff --git a/GUI/Model/Device/FootprintItems.cpp b/GUI/Model/Beam/FootprintItems.cpp
similarity index 96%
rename from GUI/Model/Device/FootprintItems.cpp
rename to GUI/Model/Beam/FootprintItems.cpp
index dfc30914e44..1d3734082d9 100644
--- a/GUI/Model/Device/FootprintItems.cpp
+++ b/GUI/Model/Beam/FootprintItems.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/FootprintItems.cpp
+//! @file GUI/Model/Beam/FootprintItems.cpp
//! @brief Implements FootprintItem classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/FootprintItems.h"
+#include "GUI/Model/Beam/FootprintItems.h"
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Device/FootprintItems.h b/GUI/Model/Beam/FootprintItems.h
similarity index 91%
rename from GUI/Model/Device/FootprintItems.h
rename to GUI/Model/Beam/FootprintItems.h
index bbe0ade584d..9a1e5d78eb1 100644
--- a/GUI/Model/Device/FootprintItems.h
+++ b/GUI/Model/Beam/FootprintItems.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/FootprintItems.h
+//! @file GUI/Model/Beam/FootprintItems.h
//! @brief Declares FootprintItem classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_FOOTPRINTITEMS_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_FOOTPRINTITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_FOOTPRINTITEMS_H
+#define BORNAGAIN_GUI_MODEL_BEAM_FOOTPRINTITEMS_H
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include <memory>
@@ -69,4 +69,4 @@ protected:
DoubleProperty m_squareFootprintValue;
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_FOOTPRINTITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_FOOTPRINTITEMS_H
diff --git a/GUI/Model/Device/GrazingScanItem.cpp b/GUI/Model/Beam/GrazingScanItem.cpp
similarity index 98%
rename from GUI/Model/Device/GrazingScanItem.cpp
rename to GUI/Model/Beam/GrazingScanItem.cpp
index da2831c4405..46cfe35e1c7 100644
--- a/GUI/Model/Device/GrazingScanItem.cpp
+++ b/GUI/Model/Beam/GrazingScanItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/GrazingScanItem.cpp
+//! @file GUI/Model/Beam/GrazingScanItem.cpp
//! @brief Implements class GrazingScanItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/GrazingScanItem.h"
+#include "GUI/Model/Beam/GrazingScanItem.h"
#include "Base/Axis/IAxis.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
diff --git a/GUI/Model/Device/GrazingScanItem.h b/GUI/Model/Beam/GrazingScanItem.h
similarity index 89%
rename from GUI/Model/Device/GrazingScanItem.h
rename to GUI/Model/Beam/GrazingScanItem.h
index db24c63cb01..8ee48444266 100644
--- a/GUI/Model/Device/GrazingScanItem.h
+++ b/GUI/Model/Beam/GrazingScanItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/GrazingScanItem.h
+//! @file GUI/Model/Beam/GrazingScanItem.h
//! @brief Declares the class GrazingScanItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_GRAZINGSCANITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_GRAZINGSCANITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_BEAM_GRAZINGSCANITEM_H
+#define BORNAGAIN_GUI_MODEL_BEAM_GRAZINGSCANITEM_H
-#include "GUI/Model/Device/BeamDistributionItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
class BasicAxisItem;
class IAxis;
@@ -69,4 +69,4 @@ private:
const InstrumentItem* m_owningInstrument;
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_GRAZINGSCANITEM_H
+#endif // BORNAGAIN_GUI_MODEL_BEAM_GRAZINGSCANITEM_H
diff --git a/GUI/Model/Device/DetectorItem.cpp b/GUI/Model/Detector/DetectorItem.cpp
similarity index 96%
rename from GUI/Model/Device/DetectorItem.cpp
rename to GUI/Model/Detector/DetectorItem.cpp
index bbeb47c8d27..6adfc77ca67 100644
--- a/GUI/Model/Device/DetectorItem.cpp
+++ b/GUI/Model/Detector/DetectorItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/DetectorItem.cpp
+//! @file GUI/Model/Detector/DetectorItem.cpp
//! @brief Implements classes DetectorItems
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/DetectorItem.h"
+#include "GUI/Model/Detector/DetectorItem.h"
#include "Device/Detector/IDetector.h"
#include "Device/Mask/IShape2D.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
namespace {
namespace Tag {
diff --git a/GUI/Model/Device/DetectorItem.h b/GUI/Model/Detector/DetectorItem.h
similarity index 90%
rename from GUI/Model/Device/DetectorItem.h
rename to GUI/Model/Detector/DetectorItem.h
index 8a43a6536ed..b9baf5b73bd 100644
--- a/GUI/Model/Device/DetectorItem.h
+++ b/GUI/Model/Detector/DetectorItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/DetectorItem.h
+//! @file GUI/Model/Detector/DetectorItem.h
//! @brief Defines class DetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_DETECTORITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_DETECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H
-#include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
+#include "GUI/Model/Detector/ResolutionFunctionItemCatalog.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
@@ -81,4 +81,4 @@ T* DetectorItem::setResolutionFunctionType()
return dynamic_cast<T*>(m_resolutionFunction.currentItem());
}
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_DETECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H
diff --git a/GUI/Model/CatDevice/DetectorItemCatalog.cpp b/GUI/Model/Detector/DetectorItemCatalog.cpp
similarity index 86%
rename from GUI/Model/CatDevice/DetectorItemCatalog.cpp
rename to GUI/Model/Detector/DetectorItemCatalog.cpp
index f9f30145054..260f726ceb0 100644
--- a/GUI/Model/CatDevice/DetectorItemCatalog.cpp
+++ b/GUI/Model/Detector/DetectorItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/DetectorItemCatalog.cpp
+//! @file GUI/Model/Detector/DetectorItemCatalog.cpp
//! @brief Implements class DetectorItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/DetectorItemCatalog.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/DetectorItemCatalog.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
DetectorItem* DetectorItemCatalog::create(Type type)
{
diff --git a/GUI/Model/CatDevice/DetectorItemCatalog.h b/GUI/Model/Detector/DetectorItemCatalog.h
similarity index 83%
rename from GUI/Model/CatDevice/DetectorItemCatalog.h
rename to GUI/Model/Detector/DetectorItemCatalog.h
index bfaf13c1c31..f006bb19f73 100644
--- a/GUI/Model/CatDevice/DetectorItemCatalog.h
+++ b/GUI/Model/Detector/DetectorItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/DetectorItemCatalog.h
+//! @file GUI/Model/Detector/DetectorItemCatalog.h
//! @brief Defines class DetectorItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_DETECTORITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_DETECTORITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -41,4 +41,4 @@ public:
static Type type(const DetectorItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_DETECTORITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEMCATALOG_H
diff --git a/GUI/Model/Device/OffspecDetectorItem.cpp b/GUI/Model/Detector/OffspecDetectorItem.cpp
similarity index 96%
rename from GUI/Model/Device/OffspecDetectorItem.cpp
rename to GUI/Model/Detector/OffspecDetectorItem.cpp
index 244766d9d92..f5c12733018 100644
--- a/GUI/Model/Device/OffspecDetectorItem.cpp
+++ b/GUI/Model/Detector/OffspecDetectorItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/OffspecDetectorItem.cpp
+//! @file GUI/Model/Detector/OffspecDetectorItem.cpp
//! @brief Implements class OffspecDetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/OffspecDetectorItem.h"
+#include "GUI/Model/Detector/OffspecDetectorItem.h"
#include "Base/Const/Units.h"
#include "Device/Detector/OffspecDetector.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Device/OffspecDetectorItem.h b/GUI/Model/Detector/OffspecDetectorItem.h
similarity index 84%
rename from GUI/Model/Device/OffspecDetectorItem.h
rename to GUI/Model/Detector/OffspecDetectorItem.h
index 0dc728457ac..9f7538a159a 100644
--- a/GUI/Model/Device/OffspecDetectorItem.h
+++ b/GUI/Model/Detector/OffspecDetectorItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/OffspecDetectorItem.h
+//! @file GUI/Model/Detector/OffspecDetectorItem.h
//! @brief Defines class OffspecDetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_OFFSPECDETECTORITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_OFFSPECDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_OFFSPECDETECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_OFFSPECDETECTORITEM_H
#include "GUI/Model/Descriptor/AxisProperty.h"
@@ -46,4 +46,4 @@ private:
AxisProperty m_alphaAxis;
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_OFFSPECDETECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_OFFSPECDETECTORITEM_H
diff --git a/GUI/Model/Device/RectangularDetectorItem.cpp b/GUI/Model/Detector/RectangularDetectorItem.cpp
similarity index 98%
rename from GUI/Model/Device/RectangularDetectorItem.cpp
rename to GUI/Model/Detector/RectangularDetectorItem.cpp
index b0e892bc714..4bd41457c64 100644
--- a/GUI/Model/Device/RectangularDetectorItem.cpp
+++ b/GUI/Model/Detector/RectangularDetectorItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/RectangularDetectorItem.cpp
+//! @file GUI/Model/Detector/RectangularDetectorItem.cpp
//! @brief Implements class RectangularDetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
namespace {
namespace Tag {
diff --git a/GUI/Model/Device/RectangularDetectorItem.h b/GUI/Model/Detector/RectangularDetectorItem.h
similarity index 91%
rename from GUI/Model/Device/RectangularDetectorItem.h
rename to GUI/Model/Detector/RectangularDetectorItem.h
index 3809cc7f2d4..98e076275a4 100644
--- a/GUI/Model/Device/RectangularDetectorItem.h
+++ b/GUI/Model/Detector/RectangularDetectorItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/RectangularDetectorItem.h
+//! @file GUI/Model/Detector/RectangularDetectorItem.h
//! @brief Defines class RectangularDetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_RECTANGULARDETECTORITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_RECTANGULARDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_RECTANGULARDETECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_RECTANGULARDETECTORITEM_H
#include "Device/Detector/RectangularDetector.h"
#include "GUI/Model/Data/ComboProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
-#include "GUI/Model/Device/DetectorItem.h"
+#include "GUI/Model/Detector/DetectorItem.h"
class RectangularDetectorItem : public DetectorItem {
public:
@@ -94,4 +94,4 @@ private:
bool m_expandYaxis = true;
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_RECTANGULARDETECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_RECTANGULARDETECTORITEM_H
diff --git a/GUI/Model/CatDevice/ResolutionFunctionItemCatalog.cpp b/GUI/Model/Detector/ResolutionFunctionItemCatalog.cpp
similarity index 90%
rename from GUI/Model/CatDevice/ResolutionFunctionItemCatalog.cpp
rename to GUI/Model/Detector/ResolutionFunctionItemCatalog.cpp
index 0a3201b3286..7effb83fa42 100644
--- a/GUI/Model/CatDevice/ResolutionFunctionItemCatalog.cpp
+++ b/GUI/Model/Detector/ResolutionFunctionItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/ResolutionFunctionItemCatalog.cpp
+//! @file GUI/Model/Detector/ResolutionFunctionItemCatalog.cpp
//! @brief Implements class ResolutionFunctionItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
+#include "GUI/Model/Detector/ResolutionFunctionItemCatalog.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
ResolutionFunctionItem*
ResolutionFunctionItemCatalog::create(Type type, const std::variant<QString, Unit>& unit)
diff --git a/GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h b/GUI/Model/Detector/ResolutionFunctionItemCatalog.h
similarity index 83%
rename from GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h
rename to GUI/Model/Detector/ResolutionFunctionItemCatalog.h
index da6712d1a45..91e1c18c1b2 100644
--- a/GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h
+++ b/GUI/Model/Detector/ResolutionFunctionItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h
+//! @file GUI/Model/Detector/ResolutionFunctionItemCatalog.h
//! @brief Defines class ResolutionFunctionItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_RESOLUTIONFUNCTIONITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_RESOLUTIONFUNCTIONITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_RESOLUTIONFUNCTIONITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_RESOLUTIONFUNCTIONITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include "GUI/Support/Type/Unit.h"
@@ -44,4 +44,4 @@ public:
static Type type(const ResolutionFunctionItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_RESOLUTIONFUNCTIONITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_RESOLUTIONFUNCTIONITEMCATALOG_H
diff --git a/GUI/Model/Device/ResolutionFunctionItems.cpp b/GUI/Model/Detector/ResolutionFunctionItems.cpp
similarity index 95%
rename from GUI/Model/Device/ResolutionFunctionItems.cpp
rename to GUI/Model/Detector/ResolutionFunctionItems.cpp
index f4b44ea284b..62968d19015 100644
--- a/GUI/Model/Device/ResolutionFunctionItems.cpp
+++ b/GUI/Model/Detector/ResolutionFunctionItems.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/ResolutionFunctionItems.cpp
+//! @file GUI/Model/Detector/ResolutionFunctionItems.cpp
//! @brief Implements family of ResolutionFunctionItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Device/ResolutionFunctionItems.h b/GUI/Model/Detector/ResolutionFunctionItems.h
similarity index 89%
rename from GUI/Model/Device/ResolutionFunctionItems.h
rename to GUI/Model/Detector/ResolutionFunctionItems.h
index 4a41429638d..66de6c92523 100644
--- a/GUI/Model/Device/ResolutionFunctionItems.h
+++ b/GUI/Model/Detector/ResolutionFunctionItems.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/ResolutionFunctionItems.h
+//! @file GUI/Model/Detector/ResolutionFunctionItems.h
//! @brief Defines family of ResolutionFunctionItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_RESOLUTIONFUNCTIONITEMS_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_RESOLUTIONFUNCTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_RESOLUTIONFUNCTIONITEMS_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_RESOLUTIONFUNCTIONITEMS_H
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include <memory>
@@ -65,4 +65,4 @@ protected:
DoubleProperty m_sigmaY;
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_RESOLUTIONFUNCTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_RESOLUTIONFUNCTIONITEMS_H
diff --git a/GUI/Model/Device/SphericalDetectorItem.cpp b/GUI/Model/Detector/SphericalDetectorItem.cpp
similarity index 97%
rename from GUI/Model/Device/SphericalDetectorItem.cpp
rename to GUI/Model/Detector/SphericalDetectorItem.cpp
index 8df95d7cab4..10137fb9a19 100644
--- a/GUI/Model/Device/SphericalDetectorItem.cpp
+++ b/GUI/Model/Detector/SphericalDetectorItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/SphericalDetectorItem.cpp
+//! @file GUI/Model/Detector/SphericalDetectorItem.cpp
//! @brief Implements class SphericalDetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
#include "Base/Const/Units.h"
#include "Device/Detector/SphericalDetector.h"
#include "ResolutionFunctionItems.h"
diff --git a/GUI/Model/Device/SphericalDetectorItem.h b/GUI/Model/Detector/SphericalDetectorItem.h
similarity index 82%
rename from GUI/Model/Device/SphericalDetectorItem.h
rename to GUI/Model/Detector/SphericalDetectorItem.h
index 2f88b6c959a..f3e808e9a30 100644
--- a/GUI/Model/Device/SphericalDetectorItem.h
+++ b/GUI/Model/Detector/SphericalDetectorItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/SphericalDetectorItem.h
+//! @file GUI/Model/Detector/SphericalDetectorItem.h
//! @brief Defines class SphericalDetectorItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_SPHERICALDETECTORITEM_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_SPHERICALDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_SPHERICALDETECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_DETECTOR_SPHERICALDETECTORITEM_H
#include "GUI/Model/Descriptor/AxisProperty.h"
-#include "GUI/Model/Device/DetectorItem.h"
+#include "GUI/Model/Detector/DetectorItem.h"
class SphericalDetectorItem : public DetectorItem {
public:
@@ -45,4 +45,4 @@ protected:
AxisProperty m_alphaAxis;
};
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_SPHERICALDETECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DETECTOR_SPHERICALDETECTORITEM_H
diff --git a/GUI/Model/CatDevice/BackgroundItemCatalog.cpp b/GUI/Model/Device/BackgroundItemCatalog.cpp
similarity index 93%
rename from GUI/Model/CatDevice/BackgroundItemCatalog.cpp
rename to GUI/Model/Device/BackgroundItemCatalog.cpp
index 7b299b4f51d..6721bd1f566 100644
--- a/GUI/Model/CatDevice/BackgroundItemCatalog.cpp
+++ b/GUI/Model/Device/BackgroundItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/BackgroundItemCatalog.cpp
+//! @file GUI/Model/Device/BackgroundItemCatalog.cpp
//! @brief Implements class BackgroundItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/BackgroundItemCatalog.h"
+#include "GUI/Model/Device/BackgroundItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Device/BackgroundItems.h"
diff --git a/GUI/Model/CatDevice/BackgroundItemCatalog.h b/GUI/Model/Device/BackgroundItemCatalog.h
similarity index 83%
rename from GUI/Model/CatDevice/BackgroundItemCatalog.h
rename to GUI/Model/Device/BackgroundItemCatalog.h
index 195776cca0e..a07c66ed638 100644
--- a/GUI/Model/CatDevice/BackgroundItemCatalog.h
+++ b/GUI/Model/Device/BackgroundItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/BackgroundItemCatalog.h
+//! @file GUI/Model/Device/BackgroundItemCatalog.h
//! @brief Defines class BackgroundItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_BACKGROUNDITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_BACKGROUNDITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_BACKGROUNDITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_BACKGROUNDITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -41,4 +41,4 @@ public:
static Type type(const BackgroundItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_BACKGROUNDITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_BACKGROUNDITEMCATALOG_H
diff --git a/GUI/Model/CatDevice/InstrumentItemCatalog.cpp b/GUI/Model/Device/InstrumentItemCatalog.cpp
similarity index 94%
rename from GUI/Model/CatDevice/InstrumentItemCatalog.cpp
rename to GUI/Model/Device/InstrumentItemCatalog.cpp
index 17ea5017b23..d4c34077367 100644
--- a/GUI/Model/CatDevice/InstrumentItemCatalog.cpp
+++ b/GUI/Model/Device/InstrumentItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/InstrumentItemCatalog.cpp
+//! @file GUI/Model/Device/InstrumentItemCatalog.cpp
//! @brief Implements class InstrumentItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Model/Device/InstrumentItems.h"
InstrumentItem* InstrumentItemCatalog::create(Type type)
diff --git a/GUI/Model/CatDevice/InstrumentItemCatalog.h b/GUI/Model/Device/InstrumentItemCatalog.h
similarity index 83%
rename from GUI/Model/CatDevice/InstrumentItemCatalog.h
rename to GUI/Model/Device/InstrumentItemCatalog.h
index d6de56ba20c..454c6f4fb85 100644
--- a/GUI/Model/CatDevice/InstrumentItemCatalog.h
+++ b/GUI/Model/Device/InstrumentItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/InstrumentItemCatalog.h
+//! @file GUI/Model/Device/InstrumentItemCatalog.h
//! @brief Defines class InstrumentItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_INSTRUMENTITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_INSTRUMENTITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -41,4 +41,4 @@ public:
static Type type(const InstrumentItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_INSTRUMENTITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMCATALOG_H
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index f8afe04a109..5f9813c7da7 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -22,18 +22,18 @@
#include "Device/Data/Datafield.h"
#include "Device/Detector/OffspecDetector.h"
#include "GUI/Model/Axis/PointwiseAxisItem.h"
-#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
-#include "GUI/Model/Device/BeamAngleItems.h"
-#include "GUI/Model/Device/BeamWavelengthItem.h"
-#include "GUI/Model/Device/FootprintItems.h"
-#include "GUI/Model/Device/GrazingScanItem.h"
+#include "GUI/Model/Beam/BeamAngleItems.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/FootprintItems.h"
+#include "GUI/Model/Beam/GrazingScanItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/OffspecDetectorItem.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/OffspecDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/Model/Device/SourceItems.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/Util/CoordName.h"
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index db50c48d65c..de407d572ee 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -15,12 +15,12 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMS_H
#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMS_H
-#include "GUI/Model/CatDevice/BackgroundItemCatalog.h"
-#include "GUI/Model/CatDevice/DetectorItemCatalog.h"
+#include "GUI/Model/Device/BackgroundItemCatalog.h"
+#include "GUI/Model/Detector/DetectorItemCatalog.h"
#include "GUI/Model/Descriptor/AxisProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
-#include "GUI/Model/Device/DetectorItem.h"
+#include "GUI/Model/Detector/DetectorItem.h"
#include <functional>
#include <memory>
diff --git a/GUI/Model/Device/InstrumentModel.h b/GUI/Model/Device/InstrumentModel.h
index 44924c294d8..c54c8cf63bc 100644
--- a/GUI/Model/Device/InstrumentModel.h
+++ b/GUI/Model/Device/InstrumentModel.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTMODEL_H
#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTMODEL_H
-#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include <QStringList>
#include <QVector>
diff --git a/GUI/Model/Device/SourceItems.cpp b/GUI/Model/Device/SourceItems.cpp
index 38fb2a261cc..c82b61a3206 100644
--- a/GUI/Model/Device/SourceItems.cpp
+++ b/GUI/Model/Device/SourceItems.cpp
@@ -20,10 +20,10 @@
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
#include "GUI/Model/Axis/PointwiseAxisItem.h"
-#include "GUI/Model/Device/BeamAngleItems.h"
-#include "GUI/Model/Device/BeamWavelengthItem.h"
-#include "GUI/Model/Device/FootprintItems.h"
-#include "GUI/Model/Device/GrazingScanItem.h"
+#include "GUI/Model/Beam/BeamAngleItems.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/FootprintItems.h"
+#include "GUI/Model/Beam/GrazingScanItem.h"
#include "Sim/Scan/IBeamScan.h"
namespace {
diff --git a/GUI/Model/Device/SourceItems.h b/GUI/Model/Device/SourceItems.h
index fa8550fdf13..9a24aa6e5cb 100644
--- a/GUI/Model/Device/SourceItems.h
+++ b/GUI/Model/Device/SourceItems.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_SOURCEITEMS_H
#define BORNAGAIN_GUI_MODEL_DEVICE_SOURCEITEMS_H
-#include "GUI/Model/CatDevice/FootprintItemCatalog.h"
+#include "GUI/Model/Beam/FootprintItemCatalog.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include <functional>
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index ead33e8f8aa..c038743b019 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -28,16 +28,16 @@
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
-#include "GUI/Model/Device/BeamAngleItems.h"
-#include "GUI/Model/Device/BeamWavelengthItem.h"
-#include "GUI/Model/Device/GrazingScanItem.h"
+#include "GUI/Model/Beam/BeamAngleItems.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/GrazingScanItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentModel.h"
-#include "GUI/Model/Device/OffspecDetectorItem.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/OffspecDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
#include "GUI/Model/Device/SourceItems.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Support/Util/Error.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index a6b4db0fc2f..eefe3829fff 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
#define BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
-#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Support/Data/JobStatus.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp
index 808ce28dfa8..83e5444bc99 100644
--- a/GUI/Model/Job/MinimizerItem.cpp
+++ b/GUI/Model/Job/MinimizerItem.cpp
@@ -19,7 +19,7 @@
#include "Fit/Adapter/GeneticMinimizer.h"
#include "Fit/Adapter/Minuit2Minimizer.h"
#include "Fit/Adapter/SimAnMinimizer.h"
-#include "GUI/Model/CatJob/MinimizerItemCatalog.h"
+#include "GUI/Model/Job/MinimizerItemCatalog.h"
#include "GUI/Support/XML/UtilXML.h"
#include "Sim/Fitting/ObjectiveMetric.h"
#include "Sim/Fitting/ObjectiveMetricUtil.h"
diff --git a/GUI/Model/CatJob/MinimizerItemCatalog.cpp b/GUI/Model/Job/MinimizerItemCatalog.cpp
similarity index 93%
rename from GUI/Model/CatJob/MinimizerItemCatalog.cpp
rename to GUI/Model/Job/MinimizerItemCatalog.cpp
index bb9d25b6db4..b015fa88517 100644
--- a/GUI/Model/CatJob/MinimizerItemCatalog.cpp
+++ b/GUI/Model/Job/MinimizerItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatJob/MinimizerItemCatalog.cpp
+//! @file GUI/Model/Job/MinimizerItemCatalog.cpp
//! @brief Implements MinimizerItemCatalog class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatJob/MinimizerItemCatalog.h"
+#include "GUI/Model/Job/MinimizerItemCatalog.h"
#include "Fit/Kernel/MinimizerFactory.h"
#include "GUI/Support/Util/String.h"
diff --git a/GUI/Model/CatJob/MinimizerItemCatalog.h b/GUI/Model/Job/MinimizerItemCatalog.h
similarity index 81%
rename from GUI/Model/CatJob/MinimizerItemCatalog.h
rename to GUI/Model/Job/MinimizerItemCatalog.h
index e17a5a90702..145e86f42ca 100644
--- a/GUI/Model/CatJob/MinimizerItemCatalog.h
+++ b/GUI/Model/Job/MinimizerItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatJob/MinimizerItemCatalog.h
+//! @file GUI/Model/Job/MinimizerItemCatalog.h
//! @brief Defines MinimizerItemCatalog class
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATJOB_MINIMIZERITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATJOB_MINIMIZERITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_MINIMIZERITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_JOB_MINIMIZERITEMCATALOG_H
#include "GUI/Model/Data/ComboProperty.h"
@@ -28,4 +28,4 @@ public:
static QStringList algorithmDescriptions(const QString& minimizerType);
};
-#endif // BORNAGAIN_GUI_MODEL_CATJOB_MINIMIZERITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_MINIMIZERITEMCATALOG_H
diff --git a/GUI/Model/Model/ParameterTreeUtil.cpp b/GUI/Model/Model/ParameterTreeUtil.cpp
index 8a29690c629..4e558772a52 100644
--- a/GUI/Model/Model/ParameterTreeUtil.cpp
+++ b/GUI/Model/Model/ParameterTreeUtil.cpp
@@ -15,14 +15,14 @@
#include "GUI/Model/Model/ParameterTreeUtil.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
-#include "GUI/Model/Device/BeamAngleItems.h"
-#include "GUI/Model/Device/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamAngleItems.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/OffspecDetectorItem.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/OffspecDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
#include "GUI/Model/Device/SourceItems.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Sample/CompoundItem.h"
diff --git a/GUI/Model/Sample/CompoundItem.h b/GUI/Model/Sample/CompoundItem.h
index 356de902225..ce1600023c3 100644
--- a/GUI/Model/Sample/CompoundItem.h
+++ b/GUI/Model/Sample/CompoundItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "Sample/Particle/Compound.h"
#include <memory>
diff --git a/GUI/Model/CatSample/FormFactorItemCatalog.cpp b/GUI/Model/Sample/FormFactorItemCatalog.cpp
similarity index 98%
rename from GUI/Model/CatSample/FormFactorItemCatalog.cpp
rename to GUI/Model/Sample/FormFactorItemCatalog.cpp
index 11618799c3a..7957f79161a 100644
--- a/GUI/Model/CatSample/FormFactorItemCatalog.cpp
+++ b/GUI/Model/Sample/FormFactorItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/FormFactorItemCatalog.cpp
+//! @file GUI/Model/Sample/FormFactorItemCatalog.cpp
//! @brief Implements class FormFactorItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/FormFactorItems.h"
diff --git a/GUI/Model/CatSample/FormFactorItemCatalog.h b/GUI/Model/Sample/FormFactorItemCatalog.h
similarity index 89%
rename from GUI/Model/CatSample/FormFactorItemCatalog.h
rename to GUI/Model/Sample/FormFactorItemCatalog.h
index 83158f91b41..a0a3898793f 100644
--- a/GUI/Model/CatSample/FormFactorItemCatalog.h
+++ b/GUI/Model/Sample/FormFactorItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/FormFactorItemCatalog.h
+//! @file GUI/Model/Sample/FormFactorItemCatalog.h
//! @brief Defines class FormFactorItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_FORMFACTORITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_FORMFACTORITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -78,4 +78,4 @@ public:
static QString menuEntry(const FormFactorItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_FORMFACTORITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMCATALOG_H
diff --git a/GUI/Model/CatSample/InterferenceItemCatalog.cpp b/GUI/Model/Sample/InterferenceItemCatalog.cpp
similarity index 96%
rename from GUI/Model/CatSample/InterferenceItemCatalog.cpp
rename to GUI/Model/Sample/InterferenceItemCatalog.cpp
index e756e1d6efd..1a11332e010 100644
--- a/GUI/Model/CatSample/InterferenceItemCatalog.cpp
+++ b/GUI/Model/Sample/InterferenceItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/InterferenceItemCatalog.cpp
+//! @file GUI/Model/Sample/InterferenceItemCatalog.cpp
//! @brief Implements class InterferenceItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/InterferenceItemCatalog.h"
+#include "GUI/Model/Sample/InterferenceItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/InterferenceItems.h"
diff --git a/GUI/Model/CatSample/InterferenceItemCatalog.h b/GUI/Model/Sample/InterferenceItemCatalog.h
similarity index 84%
rename from GUI/Model/CatSample/InterferenceItemCatalog.h
rename to GUI/Model/Sample/InterferenceItemCatalog.h
index f6c6aa50d97..92dde24be53 100644
--- a/GUI/Model/CatSample/InterferenceItemCatalog.h
+++ b/GUI/Model/Sample/InterferenceItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/InterferenceItemCatalog.h
+//! @file GUI/Model/Sample/InterferenceItemCatalog.h
//! @brief Defines class InterferenceItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_INTERFERENCEITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_INTERFERENCEITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -49,4 +49,4 @@ public:
static Type type(const InterferenceItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_INTERFERENCEITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMCATALOG_H
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index 7f39837b7d6..1f083737416 100644
--- a/GUI/Model/Sample/InterferenceItems.h
+++ b/GUI/Model/Sample/InterferenceItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
-#include "GUI/Model/CatSample/Lattice2DItemCatalog.h"
-#include "GUI/Model/CatSample/ProfileItemCatalogs.h"
+#include "GUI/Model/Sample/Lattice2DItemCatalog.h"
+#include "GUI/Model/Sample/ProfileItemCatalogs.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index 134af98270e..08bc6ccc628 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
-#include "GUI/Model/CatSample/RotationItemCatalog.h"
+#include "GUI/Model/Sample/RotationItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Sample/Item3D.h"
diff --git a/GUI/Model/CatSample/ItemWithParticlesCatalog.cpp b/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
similarity index 95%
rename from GUI/Model/CatSample/ItemWithParticlesCatalog.cpp
rename to GUI/Model/Sample/ItemWithParticlesCatalog.cpp
index d690905b721..19f1be0d2d9 100644
--- a/GUI/Model/CatSample/ItemWithParticlesCatalog.cpp
+++ b/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/ItemWithParticlesCatalog.cpp
+//! @file GUI/Model/Sample/ItemWithParticlesCatalog.cpp
//! @brief Implements class ItemWithParticlesCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
diff --git a/GUI/Model/CatSample/ItemWithParticlesCatalog.h b/GUI/Model/Sample/ItemWithParticlesCatalog.h
similarity index 84%
rename from GUI/Model/CatSample/ItemWithParticlesCatalog.h
rename to GUI/Model/Sample/ItemWithParticlesCatalog.h
index 6254b70bb98..2b92678e386 100644
--- a/GUI/Model/CatSample/ItemWithParticlesCatalog.h
+++ b/GUI/Model/Sample/ItemWithParticlesCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/ItemWithParticlesCatalog.h
+//! @file GUI/Model/Sample/ItemWithParticlesCatalog.h
//! @brief Defines class ItemWithParticlesCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_ITEMWITHPARTICLESCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_ITEMWITHPARTICLESCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLESCATALOG_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLESCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -44,4 +44,4 @@ public:
static Type type(const ItemWithParticles* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_ITEMWITHPARTICLESCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLESCATALOG_H
diff --git a/GUI/Model/CatSample/Lattice2DItemCatalog.cpp b/GUI/Model/Sample/Lattice2DItemCatalog.cpp
similarity index 94%
rename from GUI/Model/CatSample/Lattice2DItemCatalog.cpp
rename to GUI/Model/Sample/Lattice2DItemCatalog.cpp
index da0a6984539..fb257335797 100644
--- a/GUI/Model/CatSample/Lattice2DItemCatalog.cpp
+++ b/GUI/Model/Sample/Lattice2DItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/Lattice2DItemCatalog.cpp
+//! @file GUI/Model/Sample/Lattice2DItemCatalog.cpp
//! @brief Implements class Lattice2DItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/Lattice2DItemCatalog.h"
+#include "GUI/Model/Sample/Lattice2DItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
diff --git a/GUI/Model/CatSample/Lattice2DItemCatalog.h b/GUI/Model/Sample/Lattice2DItemCatalog.h
similarity index 83%
rename from GUI/Model/CatSample/Lattice2DItemCatalog.h
rename to GUI/Model/Sample/Lattice2DItemCatalog.h
index 85f22e60f3c..19470696d85 100644
--- a/GUI/Model/CatSample/Lattice2DItemCatalog.h
+++ b/GUI/Model/Sample/Lattice2DItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/Lattice2DItemCatalog.h
+//! @file GUI/Model/Sample/Lattice2DItemCatalog.h
//! @brief Defines class Lattice2DItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_LATTICE2DITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_LATTICE2DITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LATTICE2DITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_LATTICE2DITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -41,4 +41,4 @@ public:
static Type type(const CatalogedType* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_LATTICE2DITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_LATTICE2DITEMCATALOG_H
diff --git a/GUI/Model/Sample/LayerItem.h b/GUI/Model/Sample/LayerItem.h
index d2d91a84665..9f77cb2e8ae 100644
--- a/GUI/Model/Sample/LayerItem.h
+++ b/GUI/Model/Sample/LayerItem.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
#include "Base/Types/OwningVector.h"
-#include "GUI/Model/CatSample/RoughnessItemCatalog.h"
+#include "GUI/Model/Sample/RoughnessItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Sample/Item3D.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
diff --git a/GUI/Model/Sample/MesocrystalItem.h b/GUI/Model/Sample/MesocrystalItem.h
index 523b73b7fd1..51b7c421cb7 100644
--- a/GUI/Model/Sample/MesocrystalItem.h
+++ b/GUI/Model/Sample/MesocrystalItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
diff --git a/GUI/Model/Sample/ParticleItem.h b/GUI/Model/Sample/ParticleItem.h
index 6804c4e27cc..2dd59cb6423 100644
--- a/GUI/Model/Sample/ParticleItem.h
+++ b/GUI/Model/Sample/ParticleItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 9d46fc0c6c9..22bfbba6664 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
-#include "GUI/Model/CatSample/InterferenceItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/InterferenceItemCatalog.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Sample/InterferenceItems.h"
diff --git a/GUI/Model/CatSample/ProfileItemCatalogs.cpp b/GUI/Model/Sample/ProfileItemCatalogs.cpp
similarity index 97%
rename from GUI/Model/CatSample/ProfileItemCatalogs.cpp
rename to GUI/Model/Sample/ProfileItemCatalogs.cpp
index 571efada162..628e23542f2 100644
--- a/GUI/Model/CatSample/ProfileItemCatalogs.cpp
+++ b/GUI/Model/Sample/ProfileItemCatalogs.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/ProfileItemCatalogs.cpp
+//! @file GUI/Model/Sample/ProfileItemCatalogs.cpp
//! @brief Implements ProfileItemCatalog classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/ProfileItemCatalogs.h"
+#include "GUI/Model/Sample/ProfileItemCatalogs.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/ProfileItems.h"
diff --git a/GUI/Model/CatSample/ProfileItemCatalogs.h b/GUI/Model/Sample/ProfileItemCatalogs.h
similarity index 89%
rename from GUI/Model/CatSample/ProfileItemCatalogs.h
rename to GUI/Model/Sample/ProfileItemCatalogs.h
index fd9eb20aab9..287edb81869 100644
--- a/GUI/Model/CatSample/ProfileItemCatalogs.h
+++ b/GUI/Model/Sample/ProfileItemCatalogs.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/ProfileItemCatalogs.h
+//! @file GUI/Model/Sample/ProfileItemCatalogs.h
//! @brief Defines ProfileItemCatalog classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_PROFILEITEMCATALOGS_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_PROFILEITEMCATALOGS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PROFILEITEMCATALOGS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_PROFILEITEMCATALOGS_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -76,4 +76,4 @@ public:
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_PROFILEITEMCATALOGS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_PROFILEITEMCATALOGS_H
diff --git a/GUI/Model/CatSample/RotationItemCatalog.cpp b/GUI/Model/Sample/RotationItemCatalog.cpp
similarity index 95%
rename from GUI/Model/CatSample/RotationItemCatalog.cpp
rename to GUI/Model/Sample/RotationItemCatalog.cpp
index ee6adbc2dd1..811b0a4a79e 100644
--- a/GUI/Model/CatSample/RotationItemCatalog.cpp
+++ b/GUI/Model/Sample/RotationItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/RotationItemCatalog.cpp
+//! @file GUI/Model/Sample/RotationItemCatalog.cpp
//! @brief Implements class RotationItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/RotationItemCatalog.h"
+#include "GUI/Model/Sample/RotationItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/RotationItems.h"
diff --git a/GUI/Model/CatSample/RotationItemCatalog.h b/GUI/Model/Sample/RotationItemCatalog.h
similarity index 84%
rename from GUI/Model/CatSample/RotationItemCatalog.h
rename to GUI/Model/Sample/RotationItemCatalog.h
index c135b1a3525..bb36b7ba3b6 100644
--- a/GUI/Model/CatSample/RotationItemCatalog.h
+++ b/GUI/Model/Sample/RotationItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/RotationItemCatalog.h
+//! @file GUI/Model/Sample/RotationItemCatalog.h
//! @brief Defines class RotationItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_ROTATIONITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_ROTATIONITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ROTATIONITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_ROTATIONITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -47,4 +47,4 @@ public:
static Type type(const RotationItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_ROTATIONITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_ROTATIONITEMCATALOG_H
diff --git a/GUI/Model/CatSample/RoughnessItemCatalog.cpp b/GUI/Model/Sample/RoughnessItemCatalog.cpp
similarity index 92%
rename from GUI/Model/CatSample/RoughnessItemCatalog.cpp
rename to GUI/Model/Sample/RoughnessItemCatalog.cpp
index 53d44e23e82..d9253db0e22 100644
--- a/GUI/Model/CatSample/RoughnessItemCatalog.cpp
+++ b/GUI/Model/Sample/RoughnessItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/RoughnessItemCatalog.cpp
+//! @file GUI/Model/Sample/RoughnessItemCatalog.cpp
//! @brief Implements class RoughnessItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatSample/RoughnessItemCatalog.h"
+#include "GUI/Model/Sample/RoughnessItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/RoughnessItems.h"
diff --git a/GUI/Model/CatSample/RoughnessItemCatalog.h b/GUI/Model/Sample/RoughnessItemCatalog.h
similarity index 83%
rename from GUI/Model/CatSample/RoughnessItemCatalog.h
rename to GUI/Model/Sample/RoughnessItemCatalog.h
index 169bbc53b8a..09f96c29c3b 100644
--- a/GUI/Model/CatSample/RoughnessItemCatalog.h
+++ b/GUI/Model/Sample/RoughnessItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatSample/RoughnessItemCatalog.h
+//! @file GUI/Model/Sample/RoughnessItemCatalog.h
//! @brief Defines class RoughnessItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATSAMPLE_ROUGHNESSITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATSAMPLE_ROUGHNESSITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ROUGHNESSITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_ROUGHNESSITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -41,4 +41,4 @@ public:
static Type type(const RoughnessItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATSAMPLE_ROUGHNESSITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_ROUGHNESSITEMCATALOG_H
diff --git a/GUI/View/Device/DetectorAlignmentForm.cpp b/GUI/View/Device/DetectorAlignmentForm.cpp
index c388247bc4d..3e679ada1da 100644
--- a/GUI/View/Device/DetectorAlignmentForm.cpp
+++ b/GUI/View/Device/DetectorAlignmentForm.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Device/DetectorAlignmentForm.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include <QLabel>
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index 34e13476bb1..05da1a2dad8 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Device/FootprintForm.h"
-#include "GUI/Model/Device/FootprintItems.h"
+#include "GUI/Model/Beam/FootprintItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/SourceItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
diff --git a/GUI/View/Device/RectangularDetectorForm.cpp b/GUI/View/Device/RectangularDetectorForm.cpp
index 12b8c3160f2..c5269b29713 100644
--- a/GUI/View/Device/RectangularDetectorForm.cpp
+++ b/GUI/View/Device/RectangularDetectorForm.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Device/RectangularDetectorForm.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/View/Device/DetectorAlignmentForm.h"
#include "GUI/View/Device/ResolutionForm.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
diff --git a/GUI/View/Device/ResolutionForm.cpp b/GUI/View/Device/ResolutionForm.cpp
index 8ff67cc98ae..39fbbd0de54 100644
--- a/GUI/View/Device/ResolutionForm.cpp
+++ b/GUI/View/Device/ResolutionForm.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Device/ResolutionForm.h"
-#include "GUI/Model/Device/DetectorItem.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/DetectorItem.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/Device/SphericalDetectorForm.cpp b/GUI/View/Device/SphericalDetectorForm.cpp
index b279317e357..f0ce9e80455 100644
--- a/GUI/View/Device/SphericalDetectorForm.cpp
+++ b/GUI/View/Device/SphericalDetectorForm.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Device/SphericalDetectorForm.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
#include "GUI/View/Device/AxisPropertyForm.h"
#include "GUI/View/Device/ResolutionForm.h"
#include <QGridLayout>
diff --git a/GUI/View/Instrument/AlphaScanEditor.cpp b/GUI/View/Instrument/AlphaScanEditor.cpp
index ccfc03b37b7..f828d65d696 100644
--- a/GUI/View/Instrument/AlphaScanEditor.cpp
+++ b/GUI/View/Instrument/AlphaScanEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/AlphaScanEditor.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/Device/GrazingScanItem.h"
+#include "GUI/Model/Beam/GrazingScanItem.h"
#include "GUI/View/Device/SphericalAxisForm.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Instrument/DistributionPlot.h"
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index fa1cabba51b..82798aa0bf2 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Instrument/DetectorEditor.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
#include "GUI/View/Device/RectangularDetectorForm.h"
#include "GUI/View/Device/SphericalDetectorForm.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 09c2945eb6f..a9d1dcddce6 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/Device/BeamDistributionItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
#include "GUI/Support/XML/Backup.h"
#include "GUI/View/Instrument/DistributionPlot.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
diff --git a/GUI/View/Instrument/GISASBeamEditor.cpp b/GUI/View/Instrument/GISASBeamEditor.cpp
index b22e79b2ca7..f471b8b7406 100644
--- a/GUI/View/Instrument/GISASBeamEditor.cpp
+++ b/GUI/View/Instrument/GISASBeamEditor.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Instrument/GISASBeamEditor.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Device/BeamAngleItems.h"
-#include "GUI/Model/Device/BeamWavelengthItem.h"
-#include "GUI/Model/Device/GrazingScanItem.h"
+#include "GUI/Model/Beam/BeamAngleItems.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/GrazingScanItem.h"
#include "GUI/Model/Device/SourceItems.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Numeric/FixupDoubleValidator.h"
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.cpp b/GUI/View/Instrument/OffspecDetectorEditor.cpp
index 6c1f042ac0a..9b63558505c 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.cpp
+++ b/GUI/View/Instrument/OffspecDetectorEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/OffspecDetectorEditor.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/OffspecDetectorItem.h"
+#include "GUI/Model/Detector/OffspecDetectorItem.h"
#include "GUI/View/Device/AxisPropertyForm.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QFormLayout>
diff --git a/GUI/View/Instrument/ScanEditor.cpp b/GUI/View/Instrument/ScanEditor.cpp
index 27d4dfcdbac..e881969aa27 100644
--- a/GUI/View/Instrument/ScanEditor.cpp
+++ b/GUI/View/Instrument/ScanEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/ScanEditor.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Device/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamWavelengthItem.h"
#include "GUI/Model/Device/InstrumentNotifier.h"
#include "GUI/Model/Device/SourceItems.h"
#include "GUI/View/Device/FootprintForm.h"
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.cpp b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
index 8159a6bc7c0..b2d5254bb11 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.cpp
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/SampleDesigner/CoreAndShellForm.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
diff --git a/GUI/View/SampleDesigner/LayerEditorUtil.h b/GUI/View/SampleDesigner/LayerEditorUtil.h
index 9582fae7985..013129e7368 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtil.h
+++ b/GUI/View/SampleDesigner/LayerEditorUtil.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index eab1f4d4de9..6ee2f5b143b 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleForm.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Support/Util/ActionFactory.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index bae61a25fa3..ab9bf023334 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h
index 95c3a1767b9..91edd51f33b 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.h
+++ b/GUI/View/SampleDesigner/SampleEditorController.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include <QUndoStack>
class AbstractSelectionContainerForm;
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 3dbda10d78c..1bedb224f55 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -5,9 +5,9 @@
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentModel.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/ResolutionFunctionItems.h"
+#include "GUI/Model/Detector/SphericalDetectorItem.h"
#include "GUI/Support/Type/Unit.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index f075af901ef..9fa5cd87cd1 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -3,7 +3,7 @@
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
+#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
--
GitLab
From a779b0b80b36cd99a34aaa4110db666be9f2e072 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 8 Apr 2023 09:56:28 +0200
Subject: [PATCH 4/4] clang-format
---
GUI/Model/Detector/DetectorItem.h | 2 +-
GUI/Model/Device/InstrumentItems.cpp | 12 ++++++------
GUI/Model/Device/InstrumentItems.h | 4 ++--
GUI/Model/Device/InstrumentModel.h | 2 +-
GUI/Model/FromCore/ItemizeSimulation.cpp | 10 +++++-----
GUI/Model/Job/JobItem.cpp | 2 +-
GUI/Model/Job/JobItem.h | 2 +-
GUI/Model/Model/JobModel.cpp | 2 +-
GUI/Model/Model/ParameterTreeUtil.cpp | 8 ++++----
GUI/Model/Project/LinkInstrumentManager.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 2 +-
GUI/Model/Sample/CompoundItem.h | 2 +-
GUI/Model/Sample/InterferenceItems.h | 4 ++--
GUI/Model/Sample/ItemWithParticles.h | 2 +-
GUI/Model/Sample/LayerItem.h | 2 +-
GUI/Model/Sample/MesocrystalItem.h | 4 ++--
GUI/Model/Sample/ParticleItem.h | 2 +-
GUI/Model/Sample/ParticleLayoutItem.h | 4 ++--
GUI/View/Import/RealDataPropertiesWidget.cpp | 2 +-
GUI/View/Instrument/AlphaScanEditor.cpp | 2 +-
GUI/View/Instrument/DetectorEditor.cpp | 2 +-
GUI/View/Instrument/DistributionEditor.cpp | 2 +-
GUI/View/Instrument/OffspecDetectorEditor.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1D.cpp | 2 +-
.../Loaders/AutomaticDataLoader1DResultModel.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 2 +-
GUI/View/SampleDesigner/CoreAndShellForm.cpp | 2 +-
GUI/View/SampleDesigner/LayerEditorUtil.h | 2 +-
GUI/View/SampleDesigner/SampleEditorController.cpp | 2 +-
GUI/View/Toplevel/SimulationView.cpp | 2 +-
Tests/Unit/GUI/TestAutosaveController.cpp | 2 +-
Tests/Unit/GUI/TestDetectorItems.cpp | 6 +++---
Tests/Unit/GUI/TestJobModel.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 4 ++--
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestRealModel.cpp | 2 +-
36 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/GUI/Model/Detector/DetectorItem.h b/GUI/Model/Detector/DetectorItem.h
index b9baf5b73bd..3fd2f67df47 100644
--- a/GUI/Model/Detector/DetectorItem.h
+++ b/GUI/Model/Detector/DetectorItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H
#define BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H
-#include "GUI/Model/Detector/ResolutionFunctionItemCatalog.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Detector/ResolutionFunctionItemCatalog.h"
class IDetector;
class IResolutionFunction2D;
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 5f9813c7da7..f7cbb9257fa 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -22,18 +22,18 @@
#include "Device/Data/Datafield.h"
#include "Device/Detector/OffspecDetector.h"
#include "GUI/Model/Axis/PointwiseAxisItem.h"
-#include "GUI/Model/Device/InstrumentItemCatalog.h"
-#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Device/RealItem.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Beam/BeamAngleItems.h"
#include "GUI/Model/Beam/BeamWavelengthItem.h"
#include "GUI/Model/Beam/FootprintItems.h"
#include "GUI/Model/Beam/GrazingScanItem.h"
-#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Data/DataItem.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Detector/OffspecDetectorItem.h"
#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Device/BackgroundItems.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/SourceItems.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/Util/CoordName.h"
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index de407d572ee..03ddea0537b 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -15,12 +15,12 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMS_H
#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMS_H
-#include "GUI/Model/Device/BackgroundItemCatalog.h"
-#include "GUI/Model/Detector/DetectorItemCatalog.h"
#include "GUI/Model/Descriptor/AxisProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Detector/DetectorItem.h"
+#include "GUI/Model/Detector/DetectorItemCatalog.h"
+#include "GUI/Model/Device/BackgroundItemCatalog.h"
#include <functional>
#include <memory>
diff --git a/GUI/Model/Device/InstrumentModel.h b/GUI/Model/Device/InstrumentModel.h
index c54c8cf63bc..ad8a54c58e1 100644
--- a/GUI/Model/Device/InstrumentModel.h
+++ b/GUI/Model/Device/InstrumentModel.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTMODEL_H
#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTMODEL_H
-#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include <QStringList>
#include <QVector>
#include <QXmlStreamWriter>
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index c038743b019..d6cc00fdfed 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -26,18 +26,18 @@
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Beam/BeamAngleItems.h"
#include "GUI/Model/Beam/BeamWavelengthItem.h"
#include "GUI/Model/Beam/GrazingScanItem.h"
-#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentModel.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Detector/OffspecDetectorItem.h"
#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/Model/Detector/ResolutionFunctionItems.h"
-#include "GUI/Model/Device/SourceItems.h"
#include "GUI/Model/Detector/SphericalDetectorItem.h"
+#include "GUI/Model/Device/BackgroundItems.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/InstrumentModel.h"
+#include "GUI/Model/Device/SourceItems.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Support/Util/Error.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 68cb5d75ff2..3661d734ff6 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -18,10 +18,10 @@
#include "Device/Detector/SimulationAreaIterator.h" // roiIndex
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/MinimizerItem.h"
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index eefe3829fff..f957c850f13 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
#define BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
-#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Device/InstrumentItemCatalog.h"
#include "GUI/Support/Data/JobStatus.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include <QDateTime>
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index 874b31f717d..9e21072fa9e 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/ParameterTreeUtil.h"
#include "GUI/Model/Sample/SampleItem.h"
diff --git a/GUI/Model/Model/ParameterTreeUtil.cpp b/GUI/Model/Model/ParameterTreeUtil.cpp
index 4e558772a52..604fb80939d 100644
--- a/GUI/Model/Model/ParameterTreeUtil.cpp
+++ b/GUI/Model/Model/ParameterTreeUtil.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/Model/Model/ParameterTreeUtil.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Beam/BeamAngleItems.h"
#include "GUI/Model/Beam/BeamWavelengthItem.h"
-#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Detector/OffspecDetectorItem.h"
#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/Model/Detector/ResolutionFunctionItems.h"
-#include "GUI/Model/Device/SourceItems.h"
#include "GUI/Model/Detector/SphericalDetectorItem.h"
+#include "GUI/Model/Device/BackgroundItems.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/SourceItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Sample/CompoundItem.h"
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index 802634054fd..20836e89c86 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include <QMessageBox>
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 2aa32e35781..c0b7664efbf 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/SampleItem.h"
diff --git a/GUI/Model/Sample/CompoundItem.h b/GUI/Model/Sample/CompoundItem.h
index ce1600023c3..1194d34189c 100644
--- a/GUI/Model/Sample/CompoundItem.h
+++ b/GUI/Model/Sample/CompoundItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
-#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "Sample/Particle/Compound.h"
#include <memory>
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index 1f083737416..e41fd06b14f 100644
--- a/GUI/Model/Sample/InterferenceItems.h
+++ b/GUI/Model/Sample/InterferenceItems.h
@@ -15,11 +15,11 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
-#include "GUI/Model/Sample/Lattice2DItemCatalog.h"
-#include "GUI/Model/Sample/ProfileItemCatalogs.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Sample/Lattice2DItemCatalog.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
+#include "GUI/Model/Sample/ProfileItemCatalogs.h"
#include "GUI/Model/Sample/ProfileItems.h"
#include <memory>
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index 08bc6ccc628..2105ba10c49 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
-#include "GUI/Model/Sample/RotationItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Sample/Item3D.h"
+#include "GUI/Model/Sample/RotationItemCatalog.h"
#include "GUI/Model/Sample/RotationItems.h"
#include <memory>
diff --git a/GUI/Model/Sample/LayerItem.h b/GUI/Model/Sample/LayerItem.h
index 9f77cb2e8ae..d96fc24f167 100644
--- a/GUI/Model/Sample/LayerItem.h
+++ b/GUI/Model/Sample/LayerItem.h
@@ -16,10 +16,10 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
#include "Base/Types/OwningVector.h"
-#include "GUI/Model/Sample/RoughnessItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Sample/Item3D.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
+#include "GUI/Model/Sample/RoughnessItemCatalog.h"
#include "GUI/Model/Sample/RoughnessItems.h"
#include <QColor>
diff --git a/GUI/Model/Sample/MesocrystalItem.h b/GUI/Model/Sample/MesocrystalItem.h
index 51b7c421cb7..23fddbd3d2c 100644
--- a/GUI/Model/Sample/MesocrystalItem.h
+++ b/GUI/Model/Sample/MesocrystalItem.h
@@ -15,12 +15,12 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
-#include "GUI/Model/Sample/FormFactorItemCatalog.h"
-#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "Sample/Lattice/Lattice3D.h"
#include <memory>
diff --git a/GUI/Model/Sample/ParticleItem.h b/GUI/Model/Sample/ParticleItem.h
index 2dd59cb6423..a47a28c09d8 100644
--- a/GUI/Model/Sample/ParticleItem.h
+++ b/GUI/Model/Sample/ParticleItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
-#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 22bfbba6664..b1ffcf4e077 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -15,12 +15,12 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
-#include "GUI/Model/Sample/InterferenceItemCatalog.h"
-#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Sample/InterferenceItemCatalog.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Item3D.h"
+#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include <QUuid>
#include <memory>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 5effb00c429..01373033ff8 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Tool/Globals.h"
#include <QComboBox>
diff --git a/GUI/View/Instrument/AlphaScanEditor.cpp b/GUI/View/Instrument/AlphaScanEditor.cpp
index f828d65d696..7610a818eca 100644
--- a/GUI/View/Instrument/AlphaScanEditor.cpp
+++ b/GUI/View/Instrument/AlphaScanEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/AlphaScanEditor.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Beam/GrazingScanItem.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/View/Device/SphericalAxisForm.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Instrument/DistributionPlot.h"
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 82798aa0bf2..1633dfa31a0 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Instrument/DetectorEditor.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/Model/Detector/SphericalDetectorItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/View/Device/RectangularDetectorForm.h"
#include "GUI/View/Device/SphericalDetectorForm.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index a9d1dcddce6..a2ecace63c4 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/DistributionEditor.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Beam/BeamDistributionItem.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Support/XML/Backup.h"
#include "GUI/View/Instrument/DistributionPlot.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.cpp b/GUI/View/Instrument/OffspecDetectorEditor.cpp
index 9b63558505c..82d98d28516 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.cpp
+++ b/GUI/View/Instrument/OffspecDetectorEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/OffspecDetectorEditor.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Detector/OffspecDetectorItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/View/Device/AxisPropertyForm.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QFormLayout>
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index 10078bf1dc5..ccab80e0fdd 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Loaders/AutomaticDataLoader1D.h"
#include "Base/Util/Assert.h"
#include "Device/IO/ReadReflectometry.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/XML/DeserializationException.h"
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
index 39833a13795..2f4f656fd64 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
#include "Base/Axis/Frame.h"
#include "Device/Data/Datafield.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/RealItem.h"
AutomaticDataLoader1DResultModel::AutomaticDataLoader1DResultModel(RealItem* item)
: m_item(item)
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 8d99662d2d1..feebd126124 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -17,8 +17,8 @@
#include "Base/Util/Assert.h"
#include "Device/Coord/CoordSystem1D.h"
#include "Device/Data/Datafield.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/Util/CoordName.h"
#include "GUI/Support/XML/DeserializationException.h"
#include "GUI/View/Loaders/QREDataLoaderProperties.h"
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.cpp b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
index b2d5254bb11..899c7df38a6 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.cpp
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/SampleDesigner/CoreAndShellForm.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Support/Util/ActionFactory.h"
diff --git a/GUI/View/SampleDesigner/LayerEditorUtil.h b/GUI/View/SampleDesigner/LayerEditorUtil.h
index 013129e7368..6c37511ac49 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtil.h
+++ b/GUI/View/SampleDesigner/LayerEditorUtil.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
+#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
-#include "GUI/Model/Descriptor/DoubleProperty.h"
#include <QLabel>
#include <QPushButton>
#include <functional>
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index ab9bf023334..f6d081a1508 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -14,10 +14,10 @@
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MaterialModel.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 07e45201780..b4521d346f6 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Toplevel/SimulationView.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/RealModel.h"
diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp
index 2863ee75ecf..4b07e8d0f22 100644
--- a/Tests/Unit/GUI/TestAutosaveController.cpp
+++ b/Tests/Unit/GUI/TestAutosaveController.cpp
@@ -1,8 +1,8 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Path.h"
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 1bedb224f55..394492a344b 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -2,12 +2,12 @@
#include "Device/Detector/IDetector.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Model/Device/BackgroundItems.h"
-#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentModel.h"
#include "GUI/Model/Detector/RectangularDetectorItem.h"
#include "GUI/Model/Detector/ResolutionFunctionItems.h"
#include "GUI/Model/Detector/SphericalDetectorItem.h"
+#include "GUI/Model/Device/BackgroundItems.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/InstrumentModel.h"
#include "GUI/Support/Type/Unit.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index 44e054a7c42..4ef1d4868c9 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -1,8 +1,8 @@
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Support/Util/Error.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 9fa5cd87cd1..5d5d94defe8 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,9 +1,9 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Data/DataItemUtil.h"
-#include "GUI/Model/Device/RealItem.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Detector/RectangularDetectorItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 32b8cc34ef6..c2510f4c1fc 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,8 +1,8 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
diff --git a/Tests/Unit/GUI/TestRealModel.cpp b/Tests/Unit/GUI/TestRealModel.cpp
index 3e52a965fb9..335bcbcf35d 100644
--- a/Tests/Unit/GUI/TestRealModel.cpp
+++ b/Tests/Unit/GUI/TestRealModel.cpp
@@ -3,10 +3,10 @@
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentModel.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/View/Loaders/AutomaticDataLoader1D.h"
--
GitLab