From 573d7eb99aa142efe7fe274305ba98df25bbea72 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sat, 6 Nov 2021 13:25:41 +0100
Subject: [PATCH] ctd
---
App/main.cpp | 2 +-
GUI/Model/Component/ComponentProxyModel.cpp | 2 +-
GUI/Model/Component/ComponentProxyStrategy.cpp | 2 +-
GUI/Model/Component/ComponentUtils.cpp | 2 +-
GUI/Model/Data/DataItem.h | 2 +-
GUI/Model/Data/ImportDataInfo.cpp | 2 +-
GUI/Model/Data/RealDataItem.cpp | 6 +++---
GUI/Model/Group/ItemCatalog.cpp | 2 +-
GUI/Model/IO/OutputDataIOHistory.cpp | 2 +-
GUI/Model/IO/ProjectUtils.cpp | 3 +--
GUI/Model/Instrument/InstrumentItems.cpp | 2 +-
GUI/Model/Job/JobItem.cpp | 2 +-
GUI/Model/Job/JobModelFunctions.cpp | 2 +-
GUI/Model/Job/ParameterTreeUtils.cpp | 4 ++--
GUI/Model/Project/OutputDataIOService.cpp | 4 ++--
GUI/Model/Project/ProjectDocument.cpp | 4 ++--
GUI/Model/Sample/LayerItem.cpp | 2 +-
GUI/Model/Sample/SampleListModel.cpp | 2 +-
GUI/Model/Sample/SampleModel.cpp | 4 ++--
GUI/Model/Session/SessionXML.cpp | 2 +-
GUI/View/FitWidgets/FitParameterWidget.cpp | 4 ++--
GUI/View/Import/RealDataPresenter.cpp | 2 +-
GUI/View/Import/RealDataSelectorWidget.cpp | 6 +++---
GUI/View/Instrument/DepthProbeInstrumentEditor.cpp | 2 +-
GUI/View/Instrument/Detail/CreateDetails.cpp | 8 ++++----
GUI/View/Instrument/Detail/CreateDetails.h | 2 +-
GUI/View/Instrument/GISASInstrumentEditor.cpp | 4 ++--
GUI/View/Instrument/InstrumentLibraryEditor.cpp | 2 +-
.../Instrument/OffSpecularInstrumentEditor.cpp | 2 +-
GUI/View/Instrument/SpecularInstrumentEditor.cpp | 4 ++--
GUI/View/Intensity/IntensityDataCanvas.cpp | 2 +-
GUI/View/JobWidgets/JobResultsPresenter.cpp | 2 +-
GUI/View/Main/AboutDialog.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 2 +-
GUI/View/Main/AutosaveController.cpp | 2 +-
GUI/View/Main/MainWindow.cpp | 2 +-
GUI/View/Main/NewProjectDialog.cpp | 2 +-
GUI/View/Main/ProjectManager.cpp | 4 ++--
GUI/View/Main/PyImportAssistant.cpp | 2 +-
GUI/View/Main/SaveService.cpp | 2 +-
GUI/View/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
.../IntensityDataProjectionsWidget.cpp | 6 +++---
.../IntensityDataProjectionsWidget.h | 8 ++++----
.../ProjectionsEditor.cpp | 14 +++++++-------
.../ProjectionsEditor.h | 8 ++++----
.../ProjectionsEditorActions.cpp | 6 +++---
.../ProjectionsEditorActions.h | 8 ++++----
.../ProjectionsEditorCanvas.cpp | 4 ++--
.../ProjectionsEditorCanvas.h | 8 ++++----
.../ProjectionsPlot.cpp | 4 ++--
.../ProjectionsPlot.h | 8 ++++----
.../ProjectionsPropertyPanel.cpp | 4 ++--
.../ProjectionsPropertyPanel.h | 8 ++++----
.../ProjectionsToolBar.cpp | 6 +++---
.../ProjectionsToolBar.h | 8 ++++----
.../ProjectionsWidget.cpp | 6 +++---
.../ProjectionsWidget.h | 8 ++++----
.../SaveProjectionsAssistant.cpp | 4 ++--
.../SaveProjectionsAssistant.h | 8 ++++----
GUI/View/PropertyEditor/ComponentFlatView.cpp | 2 +-
GUI/View/PropertyEditor/ComponentTreeView.cpp | 2 +-
GUI/View/PropertyEditor/CustomEditors.cpp | 2 +-
GUI/View/PropertyEditor/SessionModelDelegate.cpp | 2 +-
GUI/View/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/View/SampleDesigner/MaterialInplaceForm.cpp | 2 +-
GUI/View/SampleDesigner/SampleTreeWidget.cpp | 2 +-
GUI/View/SampleDesigner/SelectionContainerForm.h | 2 +-
.../SpecularDataImportWidget.cpp | 4 ++--
GUI/View/Tool/EditUtil.cpp | 4 ++--
GUI/View/Tool/EditUtil.h | 2 +-
GUI/View/Toplevel/SimulationView.cpp | 2 +-
Tests/Unit/GUI/TestComponentProxyModel.cpp | 4 ++--
Tests/Unit/GUI/TestComponentUtils.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestModelUtils.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestProjectUtils.cpp | 2 +-
Tests/Unit/GUI/TestProxyModelStrategy.cpp | 4 ++--
Tests/Unit/GUI/TestSaveService.cpp | 2 +-
Tests/Unit/GUI/TestSavingSpecularData.cpp | 4 ++--
Tests/Unit/GUI/TestSessionModel.cpp | 2 +-
82 files changed, 147 insertions(+), 148 deletions(-)
rename GUI/View/{ProjectionsWidgets => Projection}/IntensityDataProjectionsWidget.cpp (90%)
rename GUI/View/{ProjectionsWidgets => Projection}/IntensityDataProjectionsWidget.h (80%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsEditor.cpp (91%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsEditor.h (86%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsEditorActions.cpp (93%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsEditorActions.h (84%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsEditorCanvas.cpp (97%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsEditorCanvas.h (89%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsPlot.cpp (98%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsPlot.h (89%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsPropertyPanel.cpp (91%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsPropertyPanel.h (76%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsToolBar.cpp (96%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsToolBar.h (86%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsWidget.cpp (93%)
rename GUI/View/{ProjectionsWidgets => Projection}/ProjectionsWidget.h (84%)
rename GUI/View/{ProjectionsWidgets => Projection}/SaveProjectionsAssistant.cpp (98%)
rename GUI/View/{ProjectionsWidgets => Projection}/SaveProjectionsAssistant.h (85%)
diff --git a/App/main.cpp b/App/main.cpp
index c8deb8652fc..42a80b9cbdf 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,8 +16,8 @@
#include "App/MessageHandler.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/Path.h"
#include "GUI/Util/OSInfo.h"
+#include "GUI/Util/Path.h"
#include "GUI/View/Loaders/DataLoaderUtil.h"
#include "GUI/View/Main/MainWindow.h"
#include "config_build.h"
diff --git a/GUI/Model/Component/ComponentProxyModel.cpp b/GUI/Model/Component/ComponentProxyModel.cpp
index 8c9c1a61baa..7a210cfd060 100644
--- a/GUI/Model/Component/ComponentProxyModel.cpp
+++ b/GUI/Model/Component/ComponentProxyModel.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Component/ComponentProxyModel.h"
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Component/ComponentProxyStrategy.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Session/SessionModel.h"
#include <QSet>
#include <functional>
diff --git a/GUI/Model/Component/ComponentProxyStrategy.cpp b/GUI/Model/Component/ComponentProxyStrategy.cpp
index 6ed4224bf46..debf6420eba 100644
--- a/GUI/Model/Component/ComponentProxyStrategy.cpp
+++ b/GUI/Model/Component/ComponentProxyStrategy.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Component/ComponentProxyStrategy.h"
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Component/ComponentProxyModel.h"
#include "GUI/Model/Component/ComponentUtils.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Model/Session/SessionModel.h"
diff --git a/GUI/Model/Component/ComponentUtils.cpp b/GUI/Model/Component/ComponentUtils.cpp
index 1c2c6d81b46..816407d8523 100644
--- a/GUI/Model/Component/ComponentUtils.cpp
+++ b/GUI/Model/Component/ComponentUtils.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Component/ComponentUtils.h"
#include "GUI/Model/Data/AxesItems.h"
#include "GUI/Model/Group/GroupItem.h"
-#include "GUI/Model/Material/MaterialDataItems.h"
#include "GUI/Model/Group/PropertyItem.h"
+#include "GUI/Model/Material/MaterialDataItems.h"
#include "GUI/Model/Types/VectorItem.h"
namespace {
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index bb73d4b2f69..648006ee0e5 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
#include "Device/Data/OutputData.h"
-#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/IO/SaveLoadInterface.h"
+#include "GUI/Model/Session/SessionItem.h"
#include <QDateTime>
#include <mutex>
diff --git a/GUI/Model/Data/ImportDataInfo.cpp b/GUI/Model/Data/ImportDataInfo.cpp
index 36f273167c3..8948a766514 100644
--- a/GUI/Model/Data/ImportDataInfo.cpp
+++ b/GUI/Model/Data/ImportDataInfo.cpp
@@ -15,9 +15,9 @@
#include "GUI/Model/Data/ImportDataInfo.h"
#include "Device/Coord/AxisNames.h"
#include "Device/Data/OutputData.h"
+#include "GUI/Model/IO/OutputDataUtils.h"
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/OutputDataUtils.h"
namespace {
std::vector<Axes::Coords> specularUnits()
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealDataItem.cpp
index 0d3618bee43..ba29772781c 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealDataItem.cpp
@@ -14,15 +14,16 @@
#include "GUI/Model/Data/RealDataItem.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/Model/IO/AbstractDataLoader1D.h"
#include "GUI/Model/Data/ApplicationModels.h"
-#include "GUI/Model/IO/DataLoaders1D.h"
#include "GUI/Model/Data/ImportDataInfo.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/IO/AbstractDataLoader1D.h"
+#include "GUI/Model/IO/DataLoaders1D.h"
+#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobItem.h"
@@ -31,7 +32,6 @@
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/ItemFileNameUtils.h"
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Model/Group/ItemCatalog.cpp b/GUI/Model/Group/ItemCatalog.cpp
index 12856aaa58f..dd0a55bf2f7 100644
--- a/GUI/Model/Group/ItemCatalog.cpp
+++ b/GUI/Model/Group/ItemCatalog.cpp
@@ -28,6 +28,7 @@
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Instrument/BackgroundItems.h"
#include "GUI/Model/Instrument/BeamAngleItems.h"
#include "GUI/Model/Instrument/BeamWavelengthItem.h"
@@ -41,7 +42,6 @@
#include "GUI/Model/Material/MaterialDataItems.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialItemContainer.h"
-#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Sample/FTDecayFunctionItems.h"
#include "GUI/Model/Sample/FTDistributionItems.h"
#include "GUI/Model/Sample/FormFactorItems.h"
diff --git a/GUI/Model/IO/OutputDataIOHistory.cpp b/GUI/Model/IO/OutputDataIOHistory.cpp
index 7bf5f33c7de..ca8b2a6286d 100644
--- a/GUI/Model/IO/OutputDataIOHistory.cpp
+++ b/GUI/Model/IO/OutputDataIOHistory.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/IO/OutputDataIOHistory.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Util/Error.h"
#include "GUI/Model/IO/SaveLoadInterface.h"
+#include "GUI/Util/Error.h"
//! Static method to create info for just saved item.
diff --git a/GUI/Model/IO/ProjectUtils.cpp b/GUI/Model/IO/ProjectUtils.cpp
index e0c9e3ea1d6..87dcffd307b 100644
--- a/GUI/Model/IO/ProjectUtils.cpp
+++ b/GUI/Model/IO/ProjectUtils.cpp
@@ -37,8 +37,7 @@ QString GUI::Project::Utils::autosaveDir(const QString& projectFileName)
QString GUI::Project::Utils::autosaveName(const QString& projectFileName)
{
- return autosaveDir(projectFileName) + "/" + projectName(projectFileName)
- + projectFileExtension;
+ return autosaveDir(projectFileName) + "/" + projectName(projectFileName) + projectFileExtension;
}
bool GUI::Project::Utils::hasAutosavedData(const QString& projectFileName)
diff --git a/GUI/Model/Instrument/InstrumentItems.cpp b/GUI/Model/Instrument/InstrumentItems.cpp
index ddd15bbbe4c..8532988bb89 100644
--- a/GUI/Model/Instrument/InstrumentItems.cpp
+++ b/GUI/Model/Instrument/InstrumentItems.cpp
@@ -24,6 +24,7 @@
#include "GUI/Model/Data/PointwiseAxisItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Model/Instrument/BackgroundItems.h"
#include "GUI/Model/Instrument/BeamWavelengthItem.h"
#include "GUI/Model/Instrument/DetectorItems.h"
@@ -32,7 +33,6 @@
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Util/Path.h"
namespace {
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 4a284f8da19..b8a17780152 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -20,13 +20,13 @@
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
+#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Material/MaterialItemContainer.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Session/SimulationOptionsItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/ItemFileNameUtils.h"
JobItem::JobItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Model/Job/JobModelFunctions.cpp b/GUI/Model/Job/JobModelFunctions.cpp
index c5228c96e25..197f18707be 100644
--- a/GUI/Model/Job/JobModelFunctions.cpp
+++ b/GUI/Model/Job/JobModelFunctions.cpp
@@ -25,6 +25,7 @@
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobItemUtils.h"
@@ -34,7 +35,6 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Util/Path.h"
#include <map>
diff --git a/GUI/Model/Job/ParameterTreeUtils.cpp b/GUI/Model/Job/ParameterTreeUtils.cpp
index 046edac8314..343cad3d5b5 100644
--- a/GUI/Model/Job/ParameterTreeUtils.cpp
+++ b/GUI/Model/Job/ParameterTreeUtils.cpp
@@ -15,12 +15,12 @@
#include "GUI/Model/Job/ParameterTreeUtils.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Model/Material/MaterialItemContainer.h"
-#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Util/Error.h"
#include <QStack>
diff --git a/GUI/Model/Project/OutputDataIOService.cpp b/GUI/Model/Project/OutputDataIOService.cpp
index ccef7e4683a..bf31ba5a5ab 100644
--- a/GUI/Model/Project/OutputDataIOService.cpp
+++ b/GUI/Model/Project/OutputDataIOService.cpp
@@ -14,11 +14,11 @@
#include "GUI/Model/Project/OutputDataIOService.h"
#include "GUI/Model/Data/ApplicationModels.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/IO/ProjectUtils.h"
+#include "GUI/Model/IO/SaveLoadInterface.h"
+#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Util/MessageService.h"
-#include "GUI/Model/IO/SaveLoadInterface.h"
#include <QFile>
#include <QSet>
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 768803d8791..f7098615ca9 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -14,10 +14,10 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Data/DocumentModel.h"
-#include "GUI/Model/Job/JobModel.h"
+#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Instrument/LinkInstrumentManager.h"
+#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/Sample/LayerItem.cpp b/GUI/Model/Sample/LayerItem.cpp
index 0d39fe3ac8f..f22a213a394 100644
--- a/GUI/Model/Sample/LayerItem.cpp
+++ b/GUI/Model/Sample/LayerItem.cpp
@@ -64,7 +64,7 @@ QVector<ItemWithMaterial*> layoutItemsWithMaterial(ParticleLayoutItem* item)
return ret;
}
-}
+} // namespace
LayerItem::LayerItem() : SessionGraphicsItem(M_TYPE), ItemWithMaterial(M_TYPE)
{
diff --git a/GUI/Model/Sample/SampleListModel.cpp b/GUI/Model/Sample/SampleListModel.cpp
index 25f7e140c72..f3a4480b9cd 100644
--- a/GUI/Model/Sample/SampleListModel.cpp
+++ b/GUI/Model/Sample/SampleListModel.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Sample/SampleListModel.h"
-#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Sample/GUIExamplesFactory.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
+#include "GUI/Model/Session/ModelUtils.h"
#include <QFontMetrics>
#include <QIcon>
diff --git a/GUI/Model/Sample/SampleModel.cpp b/GUI/Model/Sample/SampleModel.cpp
index 69414aa03dd..8c9350cb040 100644
--- a/GUI/Model/Sample/SampleModel.cpp
+++ b/GUI/Model/Sample/SampleModel.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Model/Session/ModelUtils.h"
-#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Group/PropertyItem.h"
+#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/Session/ModelUtils.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Model/Session/SessionXML.cpp b/GUI/Model/Session/SessionXML.cpp
index 1a0475723f0..7b4188027e8 100644
--- a/GUI/Model/Session/SessionXML.cpp
+++ b/GUI/Model/Session/SessionXML.cpp
@@ -20,8 +20,8 @@
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
-#include <QtCore/QXmlStreamWriter>
#include <QColor>
+#include <QtCore/QXmlStreamWriter>
namespace {
diff --git a/GUI/View/FitWidgets/FitParameterWidget.cpp b/GUI/View/FitWidgets/FitParameterWidget.cpp
index 451ccaeab5a..1efeb34aa1b 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/View/FitWidgets/FitParameterWidget.cpp
@@ -18,12 +18,12 @@
#include "GUI/Model/Fit/FitParameterProxyModel.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
+#include "GUI/Model/Group/FilterPropertyProxy.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/Model/Group/FilterPropertyProxy.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
+#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widget/Info/OverlayLabelController.h"
#include <QAction>
diff --git a/GUI/View/Import/RealDataPresenter.cpp b/GUI/View/Import/RealDataPresenter.cpp
index 510d8ee2056..61c31dfd481 100644
--- a/GUI/View/Import/RealDataPresenter.cpp
+++ b/GUI/View/Import/RealDataPresenter.cpp
@@ -17,7 +17,7 @@
#include "GUI/Util/Error.h"
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/View/Intensity/IntensityDataWidget.h"
-#include "GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
+#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
#include "GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h"
#include "GUI/View/SpecularDataWidgets/SpecularDataWidget.h"
#include <QAction>
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 761a6f1061d..0c7c03746eb 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -15,17 +15,17 @@
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Model/IO/AbstractDataLoader1D.h"
-#include "GUI/Model/IO/DataLoaders1D.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/IO/AbstractDataLoader1D.h"
+#include "GUI/Model/IO/DataLoaders1D.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/Tool/MessageBox.h"
#include "GUI/View/Import/ImportDataUtils.h"
#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
+#include "GUI/View/Tool/MessageBox.h"
#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include "GUI/Widget/Common/StyledToolBar.h"
#include <QFileDialog>
diff --git a/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp b/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
index b745730b1a2..87b86886f36 100644
--- a/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
+++ b/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/Instrument/DepthProbeInstrumentEditor.h"
#include "GUI/Model/Instrument/BeamWavelengthItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Instrument/InclinationAnglesEditor.h"
#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
#include "GUI/View/Instrument/SphericalAxisEditor.h"
-#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/View/Instrument/Detail/CreateDetails.cpp b/GUI/View/Instrument/Detail/CreateDetails.cpp
index 86be7738688..48db47fb9e5 100644
--- a/GUI/View/Instrument/Detail/CreateDetails.cpp
+++ b/GUI/View/Instrument/Detail/CreateDetails.cpp
@@ -30,16 +30,16 @@ GUI::Util::DetailsWidget* createEmptyDetailsWidget(const QString& name, bool exp
} // namespace
-QWidget* GUI::Util::Details::createDetailsWidget(
- QWidget* content, const QString& name, bool expanded)
+QWidget* GUI::Util::Details::createDetailsWidget(QWidget* content, const QString& name,
+ bool expanded)
{
auto result = createEmptyDetailsWidget(name, expanded);
result->setWidget(content);
return result;
}
-QWidget* GUI::Util::Details::createDetailsWidget(
- QLayout* layout, const QString& name, bool expanded)
+QWidget* GUI::Util::Details::createDetailsWidget(QLayout* layout, const QString& name,
+ bool expanded)
{
auto placeholder = new QWidget();
placeholder->setLayout(layout);
diff --git a/GUI/View/Instrument/Detail/CreateDetails.h b/GUI/View/Instrument/Detail/CreateDetails.h
index 23d432177dc..35e247577c5 100644
--- a/GUI/View/Instrument/Detail/CreateDetails.h
+++ b/GUI/View/Instrument/Detail/CreateDetails.h
@@ -29,6 +29,6 @@ QWidget* createDetailsWidget(QWidget* content, const QString& name, bool expande
//! Creates details widget holding user layout inside.
QWidget* createDetailsWidget(QLayout* content, const QString& name, bool expanded = true);
-} // namespace GUI::Util::Style
+} // namespace GUI::Util::Details
#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_DETAIL_CREATEDETAILS_H
diff --git a/GUI/View/Instrument/GISASInstrumentEditor.cpp b/GUI/View/Instrument/GISASInstrumentEditor.cpp
index b864192ace5..4bdc12cd7f3 100644
--- a/GUI/View/Instrument/GISASInstrumentEditor.cpp
+++ b/GUI/View/Instrument/GISASInstrumentEditor.cpp
@@ -14,11 +14,11 @@
#include "GUI/View/Instrument/GISASInstrumentEditor.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Instrument/DetectorEditor.h"
#include "GUI/View/Instrument/EnvironmentEditor.h"
#include "GUI/View/Instrument/GISASBeamEditor.h"
#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
-#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include <QVBoxLayout>
@@ -40,7 +40,7 @@ GISASInstrumentEditor::GISASInstrumentEditor(QWidget* parent, Qt::WindowFlags f)
m_environmentEditor = new EnvironmentEditor(this);
layout->addWidget(GUI::Util::Details::createDetailsWidget(m_environmentEditor, "Environment",
- /*expanded*/ false));
+ /*expanded*/ false));
layout->addStretch();
}
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index f2fe440d637..6c0649badcf 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -17,8 +17,8 @@
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ItemDelegateForHTML.h"
-#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include "GUI/View/Instrument/Detail/CreateDetails.h"
+#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include "GUI/Widget/Common/StyleUtils.h"
#include "ui_InstrumentLibraryEditor.h"
#include <QAction>
diff --git a/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp b/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp
index db20c9a88fd..415ad2821c6 100644
--- a/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp
+++ b/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp
@@ -14,10 +14,10 @@
#include "GUI/View/Instrument/OffSpecularInstrumentEditor.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Instrument/DetectorEditor.h"
#include "GUI/View/Instrument/OffSpecularBeamEditor.h"
#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
-#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include <QVBoxLayout>
diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.cpp b/GUI/View/Instrument/SpecularInstrumentEditor.cpp
index ca6fc0371a4..b977398ea09 100644
--- a/GUI/View/Instrument/SpecularInstrumentEditor.cpp
+++ b/GUI/View/Instrument/SpecularInstrumentEditor.cpp
@@ -14,10 +14,10 @@
#include "GUI/View/Instrument/SpecularInstrumentEditor.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Instrument/EnvironmentEditor.h"
#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
#include "GUI/View/Instrument/SpecularBeamEditor.h"
-#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include <QVBoxLayout>
@@ -36,7 +36,7 @@ SpecularInstrumentEditor::SpecularInstrumentEditor(QWidget* parent, Qt::WindowFl
m_environmentEditor = new EnvironmentEditor(this);
layout->addWidget(GUI::Util::Details::createDetailsWidget(m_environmentEditor, "Environment",
- /*expanded*/ false));
+ /*expanded*/ false));
layout->addStretch();
}
diff --git a/GUI/View/Intensity/IntensityDataCanvas.cpp b/GUI/View/Intensity/IntensityDataCanvas.cpp
index cb0c516daa6..7ce92378ff9 100644
--- a/GUI/View/Intensity/IntensityDataCanvas.cpp
+++ b/GUI/View/Intensity/IntensityDataCanvas.cpp
@@ -16,12 +16,12 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Util/ComboProperty.h"
-#include "GUI/View/Tool/MessageBox.h"
#include "GUI/View/Intensity/ColorMap.h"
#include "GUI/View/Intensity/ColorMapCanvas.h"
#include "GUI/View/Intensity/SavePlotAssistant.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
+#include "GUI/View/Tool/MessageBox.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
diff --git a/GUI/View/JobWidgets/JobResultsPresenter.cpp b/GUI/View/JobWidgets/JobResultsPresenter.cpp
index 6a89ad702a6..3dad3186942 100644
--- a/GUI/View/JobWidgets/JobResultsPresenter.cpp
+++ b/GUI/View/JobWidgets/JobResultsPresenter.cpp
@@ -19,7 +19,7 @@
#include "GUI/View/JobWidgets/FitComparisonWidget.h"
#include "GUI/View/JobWidgets/FitComparisonWidget1D.h"
#include "GUI/View/JobWidgets/JobViewActivities.h"
-#include "GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
+#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
#include "GUI/View/SpecularDataWidgets/SpecularDataWidget.h"
JobResultsPresenter::JobResultsPresenter(QWidget* parent) : ItemComboWidget(parent)
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 846a2446306..53bac14c02a 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Main/AboutDialog.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/Util/Path.h"
+#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/Widget/Common/DesignerHelper.h"
#include <QDate>
#include <QLabel>
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 50c2ed41868..de4867ff50a 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,8 +17,8 @@
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/Path.h"
#include "GUI/Util/OSInfo.h"
+#include "GUI/Util/Path.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/JobWidgets/JobView.h"
#include "GUI/View/Main/AboutDialog.h"
diff --git a/GUI/View/Main/AutosaveController.cpp b/GUI/View/Main/AutosaveController.cpp
index 50f1699d8f6..ba5877b4eeb 100644
--- a/GUI/View/Main/AutosaveController.cpp
+++ b/GUI/View/Main/AutosaveController.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Main/AutosaveController.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/IO/ProjectUtils.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Widget/Common/UpdateTimer.h"
#include <QDir>
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index 2da2e2dcd9f..a68815dd0fa 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,8 +16,8 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/Path.h"
#include "GUI/Util/OSInfo.h"
+#include "GUI/Util/Path.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/Instrument/InstrumentView.h"
#include "GUI/View/JobWidgets/JobView.h"
diff --git a/GUI/View/Main/NewProjectDialog.cpp b/GUI/View/Main/NewProjectDialog.cpp
index a85e5da7e3e..053dc7d176d 100644
--- a/GUI/View/Main/NewProjectDialog.cpp
+++ b/GUI/View/Main/NewProjectDialog.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Main/NewProjectDialog.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/IO/ProjectUtils.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QLabel>
diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp
index 910b890b135..8bb7e1d7c6d 100644
--- a/GUI/View/Main/ProjectManager.cpp
+++ b/GUI/View/Main/ProjectManager.cpp
@@ -16,16 +16,16 @@
#include "Base/Utils/Assert.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Data/ApplicationModels.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/IO/ProjectUtils.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/Tool/MessageBox.h"
#include "GUI/Util/MessageService.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/NewProjectDialog.h"
#include "GUI/View/Main/SaveService.h"
+#include "GUI/View/Tool/MessageBox.h"
#include "GUI/Widget/Info/ProjectLoadProblemDialog.h"
#include <QApplication>
#include <QDateTime>
diff --git a/GUI/View/Main/PyImportAssistant.cpp b/GUI/View/Main/PyImportAssistant.cpp
index 642300a680b..141addcf88c 100644
--- a/GUI/View/Main/PyImportAssistant.cpp
+++ b/GUI/View/Main/PyImportAssistant.cpp
@@ -22,10 +22,10 @@
#include "GUI/Model/Domain/GUIObjectBuilder.h"
#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/View/Tool/MessageBox.h"
#include "GUI/Util/Path.h"
#include "GUI/Util/String.h"
#include "GUI/View/Main/ProjectManager.h"
+#include "GUI/View/Tool/MessageBox.h"
#include "GUI/Widget/Info/ComboSelectorDialog.h"
#include "GUI/Widget/Info/DetailedMessageBox.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/View/Main/SaveService.cpp b/GUI/View/Main/SaveService.cpp
index f3edfd7bf6d..7ceb66d2c72 100644
--- a/GUI/View/Main/SaveService.cpp
+++ b/GUI/View/Main/SaveService.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Main/SaveService.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/IO/ProjectUtils.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Main/AutosaveController.h"
#include "GUI/View/Main/SaveThread.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 9cb7bc06f67..c5b11529004 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -22,10 +22,10 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Types/VectorItem.h"
-#include "GUI/View/Tool/EditUtil.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
+#include "GUI/View/Tool/EditUtil.h"
#include "GUI/Widget/Common/StyleUtils.h"
#include "ui_MaterialEditorDialog.h"
diff --git a/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
similarity index 90%
rename from GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp
rename to GUI/View/Projection/IntensityDataProjectionsWidget.cpp
index 7ff5e44497d..a121c3dbdbb 100644
--- a/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.cpp
+//! @file GUI/View/Projection/IntensityDataProjectionsWidget.cpp
//! @brief Defines class IntensityDataProjectionsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
+#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
#include "GUI/Model/Data/DataItemUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditor.h"
+#include "GUI/View/Projection/ProjectionsEditor.h"
#include <QVBoxLayout>
IntensityDataProjectionsWidget::IntensityDataProjectionsWidget(QWidget* parent)
diff --git a/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h b/GUI/View/Projection/IntensityDataProjectionsWidget.h
similarity index 80%
rename from GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h
rename to GUI/View/Projection/IntensityDataProjectionsWidget.h
index 87fada4c49a..7efe9a4c35a 100644
--- a/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h
+//! @file GUI/View/Projection/IntensityDataProjectionsWidget.h
//! @brief Defines class IntensityDataProjectionsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -43,4 +43,4 @@ private:
ProjectionsEditor* m_projectionsEditor;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditor.cpp b/GUI/View/Projection/ProjectionsEditor.cpp
similarity index 91%
rename from GUI/View/ProjectionsWidgets/ProjectionsEditor.cpp
rename to GUI/View/Projection/ProjectionsEditor.cpp
index 19de1b80a0a..291dfb1d6bb 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditor.cpp
+++ b/GUI/View/Projection/ProjectionsEditor.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsEditor.cpp
+//! @file GUI/View/Projection/ProjectionsEditor.cpp
//! @brief Implements class ProjectionsEditor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditor.h"
+#include "GUI/View/Projection/ProjectionsEditor.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsToolBar.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsWidget.h"
+#include "GUI/View/Projection/ProjectionsEditorActions.h"
+#include "GUI/View/Projection/ProjectionsEditorCanvas.h"
+#include "GUI/View/Projection/ProjectionsPropertyPanel.h"
+#include "GUI/View/Projection/ProjectionsToolBar.h"
+#include "GUI/View/Projection/ProjectionsWidget.h"
#include <QItemSelectionModel>
#include <QSplitter>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditor.h b/GUI/View/Projection/ProjectionsEditor.h
similarity index 86%
rename from GUI/View/ProjectionsWidgets/ProjectionsEditor.h
rename to GUI/View/Projection/ProjectionsEditor.h
index 21afed5af21..0d3448e5259 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditor.h
+++ b/GUI/View/Projection/ProjectionsEditor.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsEditor.h
+//! @file GUI/View/Projection/ProjectionsEditor.h
//! @brief Defines class ProjectionsEditor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITOR_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITOR_H
#include <QMainWindow>
@@ -54,4 +54,4 @@ private:
QItemSelectionModel* m_selectionModel;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITOR_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.cpp b/GUI/View/Projection/ProjectionsEditorActions.cpp
similarity index 93%
rename from GUI/View/ProjectionsWidgets/ProjectionsEditorActions.cpp
rename to GUI/View/Projection/ProjectionsEditorActions.cpp
index 4ad68759fbf..3ab3bdc9979 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.cpp
+++ b/GUI/View/Projection/ProjectionsEditorActions.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsEditorActions.cpp
+//! @file GUI/View/Projection/ProjectionsEditorActions.cpp
//! @brief Implements class ProjectionsEditorActions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h"
+#include "GUI/View/Projection/ProjectionsEditorActions.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h"
+#include "GUI/View/Projection/SaveProjectionsAssistant.h"
#include <QAction>
#include <QItemSelectionModel>
#include <QModelIndexList>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h b/GUI/View/Projection/ProjectionsEditorActions.h
similarity index 84%
rename from GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h
rename to GUI/View/Projection/ProjectionsEditorActions.h
index 2b09bffdd0c..85ab2f442a2 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h
+++ b/GUI/View/Projection/ProjectionsEditorActions.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h
+//! @file GUI/View/Projection/ProjectionsEditorActions.h
//! @brief Defines class ProjectionsEditorActions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORACTIONS_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORACTIONS_H
#include <QList>
#include <QModelIndex>
@@ -58,4 +58,4 @@ private:
QWidget* m_parent;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORACTIONS_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
similarity index 97%
rename from GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
rename to GUI/View/Projection/ProjectionsEditorCanvas.cpp
index fe71701ca45..09015c50bab 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.cpp
+//! @file GUI/View/Projection/ProjectionsEditorCanvas.cpp
//! @brief Implements class ProjectionsEditorCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h"
+#include "GUI/View/Projection/ProjectionsEditorCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Session/SessionModel.h"
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h b/GUI/View/Projection/ProjectionsEditorCanvas.h
similarity index 89%
rename from GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
rename to GUI/View/Projection/ProjectionsEditorCanvas.h
index ce8c1d03cca..8b869971b21 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
+//! @file GUI/View/Projection/ProjectionsEditorCanvas.h
//! @brief Defines class ProjectionsEditorCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORCANVAS_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORCANVAS_H
#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QModelIndex>
@@ -79,4 +79,4 @@ private:
bool m_block_update;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSEDITORCANVAS_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
similarity index 98%
rename from GUI/View/ProjectionsWidgets/ProjectionsPlot.cpp
rename to GUI/View/Projection/ProjectionsPlot.cpp
index d9b18b93325..1eff59fb15e 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsPlot.cpp
+//! @file GUI/View/Projection/ProjectionsPlot.cpp
//! @brief Defines class ProjectionCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsPlot.h"
+#include "GUI/View/Projection/ProjectionsPlot.h"
#include "Device/Histo/Histogram1D.h"
#include "Device/Histo/Histogram2D.h"
#include "GUI/Model/Data/AxesItems.h"
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsPlot.h b/GUI/View/Projection/ProjectionsPlot.h
similarity index 89%
rename from GUI/View/ProjectionsWidgets/ProjectionsPlot.h
rename to GUI/View/Projection/ProjectionsPlot.h
index 671c9a4300c..4df4a4d214a 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsPlot.h
+++ b/GUI/View/Projection/ProjectionsPlot.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsPlot.h
+//! @file GUI/View/Projection/ProjectionsPlot.h
//! @brief Defines class ProjectionsPlot
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPLOT_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPLOT_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <QMap>
@@ -75,4 +75,4 @@ private:
bool m_block_plot_update;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPLOT_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.cpp b/GUI/View/Projection/ProjectionsPropertyPanel.cpp
similarity index 91%
rename from GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.cpp
rename to GUI/View/Projection/ProjectionsPropertyPanel.cpp
index 81c6cce8d39..62d6867ac7c 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.cpp
+++ b/GUI/View/Projection/ProjectionsPropertyPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.cpp
+//! @file GUI/View/Projection/ProjectionsPropertyPanel.cpp
//! @brief Implements class ProjectionsPropertyPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h"
+#include "GUI/View/Projection/ProjectionsPropertyPanel.h"
#include "GUI/View/PropertyEditor/ComponentEditor.h"
#include <QVBoxLayout>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h b/GUI/View/Projection/ProjectionsPropertyPanel.h
similarity index 76%
rename from GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h
rename to GUI/View/Projection/ProjectionsPropertyPanel.h
index 68944d3b10c..f957d66a4cb 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/View/Projection/ProjectionsPropertyPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h
+//! @file GUI/View/Projection/ProjectionsPropertyPanel.h
//! @brief Defines class ProjectionsPropertyPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPROPERTYPANEL_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPROPERTYPANEL_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -36,4 +36,4 @@ private:
ComponentEditor* m_componentEditor;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPROPERTYPANEL_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/View/Projection/ProjectionsToolBar.cpp
similarity index 96%
rename from GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
rename to GUI/View/Projection/ProjectionsToolBar.cpp
index a1cbbbc1cc9..e494144af1f 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/View/Projection/ProjectionsToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
+//! @file GUI/View/Projection/ProjectionsToolBar.cpp
//! @brief Implements class ProjectionsToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsToolBar.h"
+#include "GUI/View/Projection/ProjectionsToolBar.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h"
+#include "GUI/View/Projection/ProjectionsEditorActions.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h b/GUI/View/Projection/ProjectionsToolBar.h
similarity index 86%
rename from GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
rename to GUI/View/Projection/ProjectionsToolBar.h
index ff3df919a56..2db67ddef1b 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
+++ b/GUI/View/Projection/ProjectionsToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
+//! @file GUI/View/Projection/ProjectionsToolBar.h
//! @brief Defines class ProjectionsToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSTOOLBAR_H
#include "GUI/View/Mask/MaskEditorFlags.h"
#include <QToolBar>
@@ -53,4 +53,4 @@ private:
MaskEditorFlags::Activity m_previousActivity;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSTOOLBAR_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsWidget.cpp b/GUI/View/Projection/ProjectionsWidget.cpp
similarity index 93%
rename from GUI/View/ProjectionsWidgets/ProjectionsWidget.cpp
rename to GUI/View/Projection/ProjectionsWidget.cpp
index 6457ee9af5a..61eb7caad4b 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsWidget.cpp
+++ b/GUI/View/Projection/ProjectionsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsWidget.cpp
+//! @file GUI/View/Projection/ProjectionsWidget.cpp
//! @brief Implements class ProjectionsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/ProjectionsWidget.h"
+#include "GUI/View/Projection/ProjectionsWidget.h"
#include "GUI/Model/Data/MaskItems.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsPlot.h"
+#include "GUI/View/Projection/ProjectionsPlot.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsWidget.h b/GUI/View/Projection/ProjectionsWidget.h
similarity index 84%
rename from GUI/View/ProjectionsWidgets/ProjectionsWidget.h
rename to GUI/View/Projection/ProjectionsWidget.h
index c7f428c4a92..f47b53fd074 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/View/Projection/ProjectionsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/ProjectionsWidget.h
+//! @file GUI/View/Projection/ProjectionsWidget.h
//! @brief Defines class ProjectionsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
#include "GUI/View/Mask/MaskEditorFlags.h"
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -50,4 +50,4 @@ private:
QTabWidget* m_tabWidget;
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSWIDGET_H
diff --git a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp
similarity index 98%
rename from GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp
rename to GUI/View/Projection/SaveProjectionsAssistant.cpp
index 2535a457a0a..17e0eb7067e 100644
--- a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+//! @file GUI/View/Projection/SaveProjectionsAssistant.cpp
//! @brief Implements class SaveProjectionsAssistant
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h"
+#include "GUI/View/Projection/SaveProjectionsAssistant.h"
#include "Base/Py/PyFmt.h"
#include "Device/Histo/Histogram1D.h"
#include "Device/Histo/Histogram2D.h"
diff --git a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h b/GUI/View/Projection/SaveProjectionsAssistant.h
similarity index 85%
rename from GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h
rename to GUI/View/Projection/SaveProjectionsAssistant.h
index 4726b5c2946..36c418b9c76 100644
--- a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h
+++ b/GUI/View/Projection/SaveProjectionsAssistant.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h
+//! @file GUI/View/Projection/SaveProjectionsAssistant.h
//! @brief Defines class SaveProjectionsAssistant
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
-#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTION_SAVEPROJECTIONSASSISTANT_H
+#define BORNAGAIN_GUI_VIEW_PROJECTION_SAVEPROJECTIONSASSISTANT_H
#include <QString>
#include <QVector>
@@ -56,4 +56,4 @@ private:
QString projectionFileHeader(ProjectionsData& projectionsData);
};
-#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTION_SAVEPROJECTIONSASSISTANT_H
diff --git a/GUI/View/PropertyEditor/ComponentFlatView.cpp b/GUI/View/PropertyEditor/ComponentFlatView.cpp
index 5bf654cb3f5..58e8b6ec639 100644
--- a/GUI/View/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/View/PropertyEditor/ComponentFlatView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PropertyEditor/ComponentFlatView.h"
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Component/ComponentUtils.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/LayoutUtils.h"
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
diff --git a/GUI/View/PropertyEditor/ComponentTreeView.cpp b/GUI/View/PropertyEditor/ComponentTreeView.cpp
index 9e5f1940d64..fa02d851227 100644
--- a/GUI/View/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/View/PropertyEditor/ComponentTreeView.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/PropertyEditor/ComponentTreeView.h"
#include "GUI/Model/Component/ComponentProxyModel.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/ComponentTreeActions.h"
+#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widget/Common/StyleUtils.h"
#include <QBoxLayout>
diff --git a/GUI/View/PropertyEditor/CustomEditors.cpp b/GUI/View/PropertyEditor/CustomEditors.cpp
index 8a786f99960..8f72b4812c0 100644
--- a/GUI/View/PropertyEditor/CustomEditors.cpp
+++ b/GUI/View/PropertyEditor/CustomEditors.cpp
@@ -19,8 +19,8 @@
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ComboProperty.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
+#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/Widget/Common/ScientificSpinBox.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/View/PropertyEditor/SessionModelDelegate.cpp b/GUI/View/PropertyEditor/SessionModelDelegate.cpp
index 53154872c88..6b0de4e6483 100644
--- a/GUI/View/PropertyEditor/SessionModelDelegate.cpp
+++ b/GUI/View/PropertyEditor/SessionModelDelegate.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Model/Session/SessionItem.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/CustomEditors.h"
+#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
#include <QApplication>
diff --git a/GUI/View/SampleDesigner/DesignerScene.cpp b/GUI/View/SampleDesigner/DesignerScene.cpp
index d921cdac8dc..ea8896b0b35 100644
--- a/GUI/View/SampleDesigner/DesignerScene.cpp
+++ b/GUI/View/SampleDesigner/DesignerScene.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/DesignerScene.h"
-#include "GUI/Model/Group/ItemFactory.h"
#include "GUI/Model/Group/FilterPropertyProxy.h"
+#include "GUI/Model/Group/ItemFactory.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/GUIExamplesFactory.h"
#include "GUI/Model/Sample/InterferenceItems.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 51713e6856e..1092b3b7980 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
+#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Material/MaterialModelStore.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/Job/ModelPath.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorDescriptor.h"
diff --git a/GUI/View/SampleDesigner/SampleTreeWidget.cpp b/GUI/View/SampleDesigner/SampleTreeWidget.cpp
index ed55ed734f0..83ee0b20561 100644
--- a/GUI/View/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/View/SampleDesigner/SampleTreeWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/SampleTreeWidget.h"
-#include "GUI/Model/Group/ItemCatalog.h"
#include "GUI/Model/Group/FilterPropertyProxy.h"
+#include "GUI/Model/Group/ItemCatalog.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/View/SampleDesigner/ItemTreeView.h"
#include <QAction>
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index 75ee5daad1f..a694c1c9a54 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include <QComboBox>
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp
index c7a139427de..b8bdf79816e 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h"
-#include "GUI/Model/IO/AbstractDataLoaderResultModel.h"
#include "GUI/Model/Data/DataItemUtils.h"
-#include "GUI/Model/IO/DataLoaders1D.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/IO/AbstractDataLoaderResultModel.h"
+#include "GUI/Model/IO/DataLoaders1D.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/View/Loaders/DataLoaderUtil.h"
#include "GUI/View/Main/MainWindow.h"
diff --git a/GUI/View/Tool/EditUtil.cpp b/GUI/View/Tool/EditUtil.cpp
index ef66df8879f..8064ff456e1 100644
--- a/GUI/View/Tool/EditUtil.cpp
+++ b/GUI/View/Tool/EditUtil.cpp
@@ -45,8 +45,8 @@ void GUI::View::EditUtil::configScientificDoubleEdit(QLineEdit* edit, const Real
edit->setValidator(validator);
}
-void GUI::View::EditUtil::configSpinbox(
- QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits)
+void GUI::View::EditUtil::configSpinbox(QDoubleSpinBox* spinBox, int decimals,
+ const RealLimits& limits)
{
spinBox->setMaximum(std::numeric_limits<double>::max());
spinBox->setMinimum(std::numeric_limits<double>::lowest());
diff --git a/GUI/View/Tool/EditUtil.h b/GUI/View/Tool/EditUtil.h
index 477e2630942..5005143de5f 100644
--- a/GUI/View/Tool/EditUtil.h
+++ b/GUI/View/Tool/EditUtil.h
@@ -27,6 +27,6 @@ void configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits);
void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits);
-} // namespace GUI::View::Util
+} // namespace GUI::View::EditUtil
#endif // BORNAGAIN_GUI_VIEW_TOOL_EDITUTIL_H
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 46eb522d191..453c4574dff 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -21,11 +21,11 @@
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Sample/SampleValidator.h"
+#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Session/SimulationOptionsItem.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/View/Main/MainWindow.h"
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index fc68cbd23b1..b49c4bf7c11 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -1,12 +1,12 @@
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Component/ComponentProxyModel.h"
#include "GUI/Model/Component/ComponentProxyStrategy.h"
-#include "GUI/Model/Session/ModelUtils.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Util/ComboProperty.h"
diff --git a/Tests/Unit/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
index d056faa86c2..05e79e62910 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Component/ComponentUtils.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Session/SessionModel.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 16237b89a52..b7c50f9b4e4 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -3,9 +3,9 @@
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
+#include "GUI/Model/Instrument/LinkInstrumentManager.h"
#include "GUI/Model/Instrument/RectangularDetectorItem.h"
#include "GUI/Model/Job/JobItemUtils.h"
-#include "GUI/Model/Instrument/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestModelUtils.cpp b/Tests/Unit/GUI/TestModelUtils.cpp
index 43dff1311b3..92c3a92003b 100644
--- a/Tests/Unit/GUI/TestModelUtils.cpp
+++ b/Tests/Unit/GUI/TestModelUtils.cpp
@@ -1,6 +1,6 @@
-#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/VectorItem.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 89a239a071c..60abdcffbd1 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -5,12 +5,12 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Job/JobModelFunctions.h"
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index cbdeceff485..a42bc0db462 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -2,11 +2,11 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Util/Path.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index 454c44b1bc9..67c3669848e 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,6 +1,6 @@
+#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
#include <QDir>
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index a0cf537c8a0..327e4c8071a 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -1,10 +1,10 @@
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Component/ComponentProxyModel.h"
#include "GUI/Model/Component/ComponentProxyStrategy.h"
-#include "GUI/Model/Session/ModelUtils.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/Model/Session/ModelUtils.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/VectorItem.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 5d490b7cc6d..580e168598c 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -2,11 +2,11 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Main/AutosaveController.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 7545d86ac5e..1888af06b63 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -5,6 +5,8 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/PointwiseAxisItem.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/IO/ItemFileNameUtils.h"
+#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Instrument/SpecularBeamInclinationItem.h"
@@ -12,9 +14,7 @@
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Job/JobModelFunctions.h"
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
-#include "GUI/Model/IO/ItemFileNameUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 6d249de8885..db6b080a375 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,10 +1,10 @@
#include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Group/PropertyItem.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
--
GitLab