From 9d25270f2ca0fc340d022994843df9bc0c9bf6a6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 29 Dec 2021 20:00:03 +0100
Subject: [PATCH] clang-format
---
GUI/Model/Catalog/ItemCatalog.cpp | 14 +--
GUI/Model/Data/IntensityDataItem.cpp | 2 +-
GUI/Model/Data/IntensityDataItem.h | 2 +-
GUI/Model/Data/RealDataItem.cpp | 10 +-
GUI/Model/Data/RealDataModel.cpp | 2 +-
GUI/Model/Fit/FitParameterHelper.cpp | 2 +-
GUI/Model/Fit/FitParameterModel.cpp | 2 +-
GUI/Model/Fit/JobItem.cpp | 6 +-
GUI/Model/Fit/MinimizerItem.h | 2 +-
GUI/Model/Instrument/BeamDistributionItem.h | 2 +-
GUI/Model/Instrument/InstrumentItems.cpp | 2 +-
GUI/Model/Mask/MaskUnitsConverter.cpp | 2 +-
GUI/Model/Plot/Data1DViewItem.cpp | 4 +-
GUI/Model/Plot/Data1DViewItem.h | 2 +-
GUI/Model/Plot/DataProperties.cpp | 4 +-
GUI/Model/Plot/DataViewUtils.cpp | 4 +-
GUI/Model/Project/ApplicationModels.cpp | 2 +-
GUI/Model/Project/JobModel.cpp | 6 +-
GUI/Model/Project/JobModelFunctions.cpp | 8 +-
GUI/Model/Project/LinkInstrumentManager.cpp | 4 +-
GUI/Model/Project/OutputDataIOService.cpp | 2 +-
GUI/Model/Project/ParameterTreeUtils.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 6 +-
GUI/Model/Project/ProjectDocument.h | 2 +-
GUI/Model/Sample/FormFactorItemCatalog.cpp | 105 ++++++++----------
GUI/Model/Sample/FormFactorItems.h | 2 +-
GUI/Model/Sample/InterferenceItemCatalog.cpp | 21 ++--
GUI/Model/Sample/InterferenceItems.cpp | 2 +-
GUI/Model/Sample/InterferenceItems.h | 2 +-
GUI/Model/Sample/ItemWithParticles.cpp | 2 +-
GUI/Model/Sample/ItemWithParticles.h | 2 +-
GUI/Model/Sample/ItemWithParticlesCatalog.cpp | 7 +-
GUI/Model/Sample/LayerItem.h | 2 +-
GUI/Model/Sample/LayerRoughnessItems.cpp | 2 +-
GUI/Model/Sample/MesoCrystalItem.cpp | 2 +-
GUI/Model/Sample/MesoCrystalItem.h | 2 +-
GUI/Model/Sample/MultiLayerItem.cpp | 2 +-
GUI/Model/Sample/ParticleCompositionItem.cpp | 2 +-
GUI/Model/Sample/ParticleItem.cpp | 2 +-
GUI/Model/Sample/ParticleItem.h | 2 +-
GUI/Model/Sample/ParticleLayoutItem.cpp | 2 +-
GUI/Model/Sample/ParticleLayoutItem.h | 2 +-
GUI/Model/Sample/RotationItemCatalog.cpp | 2 +-
GUI/Model/Sample/SampleModel.cpp | 2 +-
GUI/Model/Session/DataItem.h | 2 +-
GUI/Model/Session/SessionItem.cpp | 8 +-
GUI/Model/Session/SessionModel.cpp | 5 +-
GUI/Model/XML/Serializer.cpp | 2 +-
GUI/Model/XML/Serializer.h | 2 +-
GUI/Model/XML/SessionXML.h | 2 +-
GUI/View/Fit/FilterPropertyProxy.cpp | 2 +-
GUI/View/Fit/FitObjectiveBuilder.cpp | 6 +-
GUI/View/Fit/FitParameterWidget.cpp | 2 +-
GUI/View/Fit/MinimizerSettingsWidget.cpp | 2 +-
GUI/View/Fit/ParameterTuningWidget.cpp | 2 +-
GUI/View/FromDomain/GUIObjectBuilder.cpp | 4 +-
GUI/View/FromDomain/GUISampleBuilder.cpp | 2 +-
GUI/View/Import/ImportDataView.cpp | 2 +-
GUI/View/Import/RealDataMaskWidget.cpp | 2 +-
GUI/View/Import/RealDataPropertiesWidget.cpp | 2 +-
GUI/View/Import/SpecularDataImportWidget.cpp | 2 +-
GUI/View/Instrument/DistributionEditor.cpp | 2 +-
GUI/View/Instrument/DistributionForms.cpp | 2 +-
GUI/View/Job/JobResultsPresenter.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1D.cpp | 2 +-
.../AutomaticDataLoader1DResultModel.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 2 +-
GUI/View/Mask/MaskContainerView.cpp | 2 +-
GUI/View/Mask/MaskGraphicsScene.cpp | 4 +-
GUI/View/Mask/MaskViewFactory.cpp | 2 +-
GUI/View/Plot2D/IntensityDataCanvas.cpp | 2 +-
.../FitComparisonController.cpp | 2 +-
.../FitComparisonViewController.cpp | 6 +-
.../PlotComparison/FitComparisonWidget.cpp | 2 +-
.../PlotComparison/FitComparisonWidget1D.cpp | 4 +-
GUI/View/Project/PyImportAssistant.cpp | 4 +-
GUI/View/Projection/ProjectionsPlot.cpp | 2 +-
.../Projection/SaveProjectionsAssistant.cpp | 2 +-
.../SpecularDataPropertyWidget.cpp | 2 +-
.../SampleDesigner/SampleEditorCommands.cpp | 2 +-
GUI/View/SampleDesigner/SampleListModel.cpp | 4 +-
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/Tool/DataItemUtils.cpp | 2 +-
GUI/View/Toplevel/SessionModelView.cpp | 4 +-
GUI/View/Toplevel/SimulationView.cpp | 6 +-
Tests/Functional/GUI/Check.cpp | 2 +-
Tests/Unit/GUI/TestAxesItems.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 4 +-
Tests/Unit/GUI/TestGroupItem.cpp | 2 +-
Tests/Unit/GUI/TestLayerRoughnessItems.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 8 +-
Tests/Unit/GUI/TestMapperForItem.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 8 +-
Tests/Unit/GUI/TestParaCrystalItems.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 4 +-
Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 4 +-
Tests/Unit/GUI/TestSavingSpecularData.cpp | 6 +-
Tests/Unit/GUI/TestSessionItemUtils.cpp | 2 +-
Tests/Unit/GUI/TestSessionModel.cpp | 6 +-
Tests/Unit/GUI/TestSessionXML.cpp | 6 +-
Tests/Unit/GUI/Utils.h | 2 +-
102 files changed, 209 insertions(+), 231 deletions(-)
diff --git a/GUI/Model/Catalog/ItemCatalog.cpp b/GUI/Model/Catalog/ItemCatalog.cpp
index bdec09bf0e4..a3d24075210 100644
--- a/GUI/Model/Catalog/ItemCatalog.cpp
+++ b/GUI/Model/Catalog/ItemCatalog.cpp
@@ -15,16 +15,14 @@
#include "GUI/Model/Catalog/ItemCatalog.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Ax/PointwiseAxisItem.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
-#include "GUI/Model/Plot/DataProperties.h"
-#include "GUI/Model/Plot/DataPropertyContainer.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/FitParameterContainerItem.h"
#include "GUI/Model/Fit/FitParameterItem.h"
#include "GUI/Model/Fit/FitParameterLinkItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Instrument/BackgroundItems.h"
@@ -36,10 +34,11 @@
#include "GUI/Model/Instrument/ResolutionFunctionItems.h"
#include "GUI/Model/Instrument/SpecularBeamInclinationItem.h"
#include "GUI/Model/Instrument/SphericalDetectorItem.h"
-#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Mask/MaskItems.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Session/RealLimitsItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
+#include "GUI/Model/Plot/DataProperties.h"
+#include "GUI/Model/Plot/DataPropertyContainer.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
@@ -48,6 +47,7 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Session/PropertyItem.h"
+#include "GUI/Model/Session/RealLimitsItems.h"
ItemCatalog::ItemCatalog()
{
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index eff8eed29b2..09245768054 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -14,10 +14,10 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Ax/AxesItems.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Mask/MaskUnitsConverter.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Data/IntensityDataItem.h b/GUI/Model/Data/IntensityDataItem.h
index ef384889b2c..58589b159c7 100644
--- a/GUI/Model/Data/IntensityDataItem.h
+++ b/GUI/Model/Data/IntensityDataItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
#define BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
-#include "GUI/Model/Session/DataItem.h"
#include "GUI/Model/Group/SelectionDescriptor.h"
+#include "GUI/Model/Session/DataItem.h"
class BasicAxisItem;
class AmplitudeAxisItem;
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealDataItem.cpp
index da0ed65f01f..6644b5bfe80 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealDataItem.cpp
@@ -15,14 +15,14 @@
#include "GUI/Model/Data/RealDataItem.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
@@ -43,7 +43,7 @@ const JobItem* findJobItem(const SessionItem* item)
return dynamic_cast<const JobItem*>(item);
}
-}
+} // namespace
RealDataItem::RealDataItem() : SessionItem(M_TYPE)
{
@@ -421,7 +421,7 @@ void RealDataItem::rotateData()
maskContainer->clear();
if (ProjectionContainerItem* projectionsContainer =
- intensityDataItem()->projectionContainerItem())
+ intensityDataItem()->projectionContainerItem())
projectionsContainer->model()->removeRows(0, projectionsContainer->numberOfChildren(),
projectionsContainer->index());
diff --git a/GUI/Model/Data/RealDataModel.cpp b/GUI/Model/Data/RealDataModel.cpp
index 09b3f6387b1..e560e6e3a59 100644
--- a/GUI/Model/Data/RealDataModel.cpp
+++ b/GUI/Model/Data/RealDataModel.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Model/Session/DataItem.h"
+#include "GUI/Model/XML/SessionXML.h"
RealDataModel::RealDataModel(QObject* parent)
: SessionModel(GUI::Session::XML::RealDataModelTag, parent)
diff --git a/GUI/Model/Fit/FitParameterHelper.cpp b/GUI/Model/Fit/FitParameterHelper.cpp
index 1c0c199229f..921a147d4b3 100644
--- a/GUI/Model/Fit/FitParameterHelper.cpp
+++ b/GUI/Model/Fit/FitParameterHelper.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Fit/FitParameterContainerItem.h"
#include "GUI/Model/Fit/FitParameterItem.h"
#include "GUI/Model/Fit/FitParameterLinkItem.h"
-#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Project/JobModel.h"
diff --git a/GUI/Model/Fit/FitParameterModel.cpp b/GUI/Model/Fit/FitParameterModel.cpp
index 6c9bfb3052b..06d3fe386db 100644
--- a/GUI/Model/Fit/FitParameterModel.cpp
+++ b/GUI/Model/Fit/FitParameterModel.cpp
@@ -18,8 +18,8 @@
#include "GUI/Model/Fit/FitParameterItem.h"
#include "GUI/Model/Fit/FitParameterLinkItem.h"
#include "GUI/Model/Project/JobModel.h"
-#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Model/Session/ModelPath.h"
+#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Util/Error.h"
#include <QColor>
#include <QMimeData>
diff --git a/GUI/Model/Fit/JobItem.cpp b/GUI/Model/Fit/JobItem.cpp
index c8c427f987a..55f5f057fc5 100644
--- a/GUI/Model/Fit/JobItem.cpp
+++ b/GUI/Model/Fit/JobItem.cpp
@@ -14,15 +14,15 @@
#include "GUI/Model/Fit/JobItem.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/XML/SessionXML.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
+#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Model/Fit/MinimizerItem.h b/GUI/Model/Fit/MinimizerItem.h
index af0301fc55f..45935d037f5 100644
--- a/GUI/Model/Fit/MinimizerItem.h
+++ b/GUI/Model/Fit/MinimizerItem.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEM_H
#define BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEM_H
+#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/UIntDescriptor.h"
-#include "GUI/Model/Group/SelectionDescriptor.h"
#include <variant>
class IMinimizer;
diff --git a/GUI/Model/Instrument/BeamDistributionItem.h b/GUI/Model/Instrument/BeamDistributionItem.h
index f77496638b8..7ef1d7e833a 100644
--- a/GUI/Model/Instrument/BeamDistributionItem.h
+++ b/GUI/Model/Instrument/BeamDistributionItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
#define BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
-#include "GUI/Model/Instrument/ResolutionItems.h"
#include "GUI/Model/Instrument/ItemWithDistribution.h"
+#include "GUI/Model/Instrument/ResolutionItems.h"
#include "Param/Distrib/ParameterDistribution.h"
//! The BeamDistributionItem handles wavelength, inclination and azimuthal parameter
diff --git a/GUI/Model/Instrument/InstrumentItems.cpp b/GUI/Model/Instrument/InstrumentItems.cpp
index 54c2c7c3b9a..31d638b056b 100644
--- a/GUI/Model/Instrument/InstrumentItems.cpp
+++ b/GUI/Model/Instrument/InstrumentItems.cpp
@@ -22,13 +22,13 @@
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
#include "GUI/Model/Ax/PointwiseAxisItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Instrument/BackgroundItems.h"
#include "GUI/Model/Instrument/BeamWavelengthItem.h"
#include "GUI/Model/Instrument/DetectorItems.h"
#include "GUI/Model/Instrument/RectangularDetectorItem.h"
#include "GUI/Model/Instrument/SphericalDetectorItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/CoordName.h"
diff --git a/GUI/Model/Mask/MaskUnitsConverter.cpp b/GUI/Model/Mask/MaskUnitsConverter.cpp
index 9bf03141f24..79f170b9649 100644
--- a/GUI/Model/Mask/MaskUnitsConverter.cpp
+++ b/GUI/Model/Mask/MaskUnitsConverter.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Mask/MaskUnitsConverter.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/Model/Plot/Data1DViewItem.cpp b/GUI/Model/Plot/Data1DViewItem.cpp
index 65e4b8c5f15..c86e7a798a4 100644
--- a/GUI/Model/Plot/Data1DViewItem.cpp
+++ b/GUI/Model/Plot/Data1DViewItem.cpp
@@ -14,10 +14,10 @@
#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Model/Ax/AxesItems.h"
-#include "GUI/Model/Plot/DataViewUtils.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Plot/DataProperties.h"
#include "GUI/Model/Plot/DataPropertyContainer.h"
-#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Plot/DataViewUtils.h"
#include "GUI/Model/Session/DataItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Plot/Data1DViewItem.h b/GUI/Model/Plot/Data1DViewItem.h
index 641ba7c8d46..a2d6a66677f 100644
--- a/GUI/Model/Plot/Data1DViewItem.h
+++ b/GUI/Model/Plot/Data1DViewItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_PLOT_DATA1DVIEWITEM_H
#define BORNAGAIN_GUI_MODEL_PLOT_DATA1DVIEWITEM_H
-#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/Group/SelectionDescriptor.h"
+#include "GUI/Model/Session/SessionItem.h"
class AmplitudeAxisItem;
class BasicAxisItem;
diff --git a/GUI/Model/Plot/DataProperties.cpp b/GUI/Model/Plot/DataProperties.cpp
index 62e4c892dec..c697f3f2454 100644
--- a/GUI/Model/Plot/DataProperties.cpp
+++ b/GUI/Model/Plot/DataProperties.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Plot/DataProperties.h"
-#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Session/DataItem.h"
+#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/Plot/DataViewUtils.cpp b/GUI/Model/Plot/DataViewUtils.cpp
index f1428915abd..e8079b82400 100644
--- a/GUI/Model/Plot/DataViewUtils.cpp
+++ b/GUI/Model/Plot/DataViewUtils.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Plot/DataViewUtils.h"
#include "Device/Coord/ICoordSystem.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
-#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Model/Session/DataItem.h"
#include "GUI/Util/CoordName.h"
diff --git a/GUI/Model/Project/ApplicationModels.cpp b/GUI/Model/Project/ApplicationModels.cpp
index 90026c709b6..80efe5648b7 100644
--- a/GUI/Model/Project/ApplicationModels.cpp
+++ b/GUI/Model/Project/ApplicationModels.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Project/ApplicationModels.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Project/JobModel.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Model/Project/JobModel.cpp b/GUI/Model/Project/JobModel.cpp
index 8cd2336abf5..987a20de3df 100644
--- a/GUI/Model/Project/JobModel.cpp
+++ b/GUI/Model/Project/JobModel.cpp
@@ -15,15 +15,15 @@
#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Ax/PointwiseAxisItem.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Project/JobModelFunctions.h"
#include "GUI/Model/Project/JobQueueData.h"
#include "GUI/Model/Project/ParameterTreeUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/XML/SessionXML.h"
JobModel::JobModel(QObject* parent)
: SessionModel(GUI::Session::XML::JobModelTag, parent), m_queue_data(nullptr)
diff --git a/GUI/Model/Project/JobModelFunctions.cpp b/GUI/Model/Project/JobModelFunctions.cpp
index 2fa322d3bd9..d4cd9af2cbe 100644
--- a/GUI/Model/Project/JobModelFunctions.cpp
+++ b/GUI/Model/Project/JobModelFunctions.cpp
@@ -16,17 +16,17 @@
#include "Base/Util/Assert.h"
#include "Device/Instrument/Instrument.h"
#include "GUI/Model/Ax/PointwiseAxisItem.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
-#include "GUI/Model/Plot/DataPropertyContainer.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
-#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
#include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
+#include "GUI/Model/Plot/DataPropertyContainer.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index 14bd4153c79..c358bbfcf5b 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Instrument/InstrumentItems.h"
-#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/Instrument/InstrumentItems.h"
+#include "GUI/Model/Instrument/InstrumentModel.h"
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Model/Project/OutputDataIOService.cpp b/GUI/Model/Project/OutputDataIOService.cpp
index 883857fec0a..1c119fb5b79 100644
--- a/GUI/Model/Project/OutputDataIOService.cpp
+++ b/GUI/Model/Project/OutputDataIOService.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Session/ModelPath.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Support/IO/SaveLoadInterface.h"
diff --git a/GUI/Model/Project/ParameterTreeUtils.cpp b/GUI/Model/Project/ParameterTreeUtils.cpp
index 850f0632825..4193c73c212 100644
--- a/GUI/Model/Project/ParameterTreeUtils.cpp
+++ b/GUI/Model/Project/ParameterTreeUtils.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Project/ParameterTreeUtils.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
-#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Sample/FTDecayFunctionItemCatalogs.h"
#include "GUI/Model/Sample/FTDistributionItemCatalogs.h"
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index f3373aeda5a..6e8dae97ef3 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,15 +13,15 @@
// ************************************************************************************************
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialModel.h"
+#include "GUI/Model/Project/JobModel.h"
+#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
+#include "GUI/Model/XML/Serializer.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Support/IO/ProjectUtils.h"
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index d5aefba2eec..c18d9b663dc 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
#define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
-#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Material/MaterialModel.h"
+#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include <QObject>
diff --git a/GUI/Model/Sample/FormFactorItemCatalog.cpp b/GUI/Model/Sample/FormFactorItemCatalog.cpp
index 2975a30fcac..dbe6b812b56 100644
--- a/GUI/Model/Sample/FormFactorItemCatalog.cpp
+++ b/GUI/Model/Sample/FormFactorItemCatalog.cpp
@@ -129,130 +129,113 @@ FormFactorItemCatalog::UiInfo FormFactorItemCatalog::uiInfo(Type type)
{
switch (type) {
case Type::AnisoPyramid:
- return {"Anisotropic pyramid",
- ":/SampleDesignerToolbox/images/ff_AnisoPyramid_64x64.png",
- "Truncated pyramid with a rectangular base"};
+ return {"Anisotropic pyramid", ":/SampleDesignerToolbox/images/ff_AnisoPyramid_64x64.png",
+ "Truncated pyramid with a rectangular base"};
case Type::BarGauss:
return {"BarGauss", ":/SampleDesignerToolbox/images/ff_Box_64x64.png",
- "Rectangular cuboid"};
+ "Rectangular cuboid"};
case Type::BarLorentz:
return {"BarLorentz", ":/SampleDesignerToolbox/images/ff_Box_64x64.png",
- "Rectangular cuboid"};
+ "Rectangular cuboid"};
case Type::Box:
- return {"Box", ":/SampleDesignerToolbox/images/ff_Box_64x64.png",
- "Rectangular cuboid"};
+ return {"Box", ":/SampleDesignerToolbox/images/ff_Box_64x64.png", "Rectangular cuboid"};
case Type::Cone:
return {"Cone", ":/SampleDesignerToolbox/images/ff_Cone_64x64.png",
- "Truncated cone with circular base"};
+ "Truncated cone with circular base"};
case Type::Cone6:
return {"Cone6", ":/SampleDesignerToolbox/images/ff_Cone6_64x64.png",
- "A truncated pyramid, based on a regular hexagon"};
+ "A truncated pyramid, based on a regular hexagon"};
case Type::Cuboctahedron:
- return {"Cuboctahedron",
- ":/SampleDesignerToolbox/images/ff_Cuboctahedron_64x64.png",
- "Compound of two truncated pyramids with a common square base "
- "and opposite orientations"};
+ return {"Cuboctahedron", ":/SampleDesignerToolbox/images/ff_Cuboctahedron_64x64.png",
+ "Compound of two truncated pyramids with a common square base "
+ "and opposite orientations"};
case Type::Dodecahedron:
- return {"Dodecahedron",
- ":/SampleDesignerToolbox/images/ff_Dodecahedron_64x64.png",
- "Dodecahedron"};
+ return {"Dodecahedron", ":/SampleDesignerToolbox/images/ff_Dodecahedron_64x64.png",
+ "Dodecahedron"};
case Type::Cylinder:
return {"Cylinder", ":/SampleDesignerToolbox/images/ff_Cylinder_64x64.png",
- "Cylinder with a circular base"};
+ "Cylinder with a circular base"};
case Type::EllipsoidalCylinder:
return {"Ellipsoidal cylinder",
- ":/SampleDesignerToolbox/images/ff_EllipsoidalCylinder_64x64.png",
- "Cylinder with an ellipse cross section"};
+ ":/SampleDesignerToolbox/images/ff_EllipsoidalCylinder_64x64.png",
+ "Cylinder with an ellipse cross section"};
case Type::FullSphere:
return {"Full sphere", ":/SampleDesignerToolbox/images/ff_FullSphere_64x64.png",
- "Full sphere"};
+ "Full sphere"};
case Type::FullSpheroid:
- return {
- "Full spheroid", ":/SampleDesignerToolbox/images/ff_FullSpheroid_64x64.png",
- "Full spheroid, generated by rotating an ellipse around the vertical axis"};
+ return {"Full spheroid", ":/SampleDesignerToolbox/images/ff_FullSpheroid_64x64.png",
+ "Full spheroid, generated by rotating an ellipse around the vertical axis"};
case Type::HemiEllipsoid:
- return {"Hemi ellipsoid",
- ":/SampleDesignerToolbox/images/ff_HemiEllipsoid_64x64.png",
- "A horizontally oriented ellipsoid, truncated at the central plane"};
+ return {"Hemi ellipsoid", ":/SampleDesignerToolbox/images/ff_HemiEllipsoid_64x64.png",
+ "A horizontally oriented ellipsoid, truncated at the central plane"};
case Type::Icosahedron:
- return {"Icosahedron",
- ":/SampleDesignerToolbox/images/ff_Icosahedron_64x64.png",
- "Icosahedron"};
+ return {"Icosahedron", ":/SampleDesignerToolbox/images/ff_Icosahedron_64x64.png",
+ "Icosahedron"};
case Type::Prism3:
return {"Prism3", ":/SampleDesignerToolbox/images/ff_Prism3_64x64.png",
- "Prism with an equilateral triangle base"};
+ "Prism with an equilateral triangle base"};
case Type::Prism6:
return {"Prism6", ":/SampleDesignerToolbox/images/ff_Prism6_64x64.png",
- "Prism with a regular hexagonal base"};
+ "Prism with a regular hexagonal base"};
case Type::Pyramid:
return {"Pyramid", ":/SampleDesignerToolbox/images/ff_Pyramid_64x64.png",
- "Truncated pyramid with a square base"};
+ "Truncated pyramid with a square base"};
case Type::CosineRippleBox:
- return {"CosineRippleBox",
- ":/SampleDesignerToolbox/images/ff_Ripple1_64x64.png",
- "Particle with a cosine profile and a rectangular base"};
+ return {"CosineRippleBox", ":/SampleDesignerToolbox/images/ff_Ripple1_64x64.png",
+ "Particle with a cosine profile and a rectangular base"};
case Type::CosineRippleGauss:
- return {"CosineRippleGauss",
- ":/SampleDesignerToolbox/images/ff_Ripple1_64x64.png",
- "Particle with a cosine profile and a rectangular base"};
+ return {"CosineRippleGauss", ":/SampleDesignerToolbox/images/ff_Ripple1_64x64.png",
+ "Particle with a cosine profile and a rectangular base"};
case Type::CosineRippleLorentz:
- return {"CosineRippleLorentz",
- ":/SampleDesignerToolbox/images/ff_Ripple1_64x64.png",
- "Particle with a cosine profile and a rectangular base"};
+ return {"CosineRippleLorentz", ":/SampleDesignerToolbox/images/ff_Ripple1_64x64.png",
+ "Particle with a cosine profile and a rectangular base"};
case Type::SawtoothRippleBox:
- return {"SawtoothRippleBox",
- ":/SampleDesignerToolbox/images/ff_Ripple2_64x64.png",
- "Particle with an asymmetric triangle profile and a rectangular base"};
+ return {"SawtoothRippleBox", ":/SampleDesignerToolbox/images/ff_Ripple2_64x64.png",
+ "Particle with an asymmetric triangle profile and a rectangular base"};
case Type::SawtoothRippleGauss:
- return {"SawtoothRippleGauss",
- ":/SampleDesignerToolbox/images/ff_Ripple2_64x64.png",
- "Particle with an asymmetric triangle profile and a rectangular base"};
+ return {"SawtoothRippleGauss", ":/SampleDesignerToolbox/images/ff_Ripple2_64x64.png",
+ "Particle with an asymmetric triangle profile and a rectangular base"};
case Type::SawtoothRippleLorentz:
- return {"SawtoothRippleLorentz",
- ":/SampleDesignerToolbox/images/ff_Ripple2_64x64.png",
- "Particle with an asymmetric triangle profile and a rectangular base"};
+ return {"SawtoothRippleLorentz", ":/SampleDesignerToolbox/images/ff_Ripple2_64x64.png",
+ "Particle with an asymmetric triangle profile and a rectangular base"};
case Type::Tetrahedron:
- return {
- "Tetrahedron", ":/SampleDesignerToolbox/images/ff_Tetrahedron_64x64.png",
- "Truncated polyhedron with equilateral triangle base and cropped side faces"};
+ return {"Tetrahedron", ":/SampleDesignerToolbox/images/ff_Tetrahedron_64x64.png",
+ "Truncated polyhedron with equilateral triangle base and cropped side faces"};
case Type::TruncatedCube:
- return {"Truncated cube",
- ":/SampleDesignerToolbox/images/ff_TruncatedCube_64x64.png",
- "A cube whose eight vertices have been removed"};
+ return {"Truncated cube", ":/SampleDesignerToolbox/images/ff_TruncatedCube_64x64.png",
+ "A cube whose eight vertices have been removed"};
case Type::TruncatedSphere:
- return {"Truncated sphere",
- ":/SampleDesignerToolbox/images/ff_TruncatedSphere_64x64.png",
- "Spherical dome"};
+ return {"Truncated sphere", ":/SampleDesignerToolbox/images/ff_TruncatedSphere_64x64.png",
+ "Spherical dome"};
case Type::TruncatedSpheroid:
return {"Truncated spheroid",
- ":/SampleDesignerToolbox/images/ff_TruncatedSpheroid_64x64.png",
- "Spheroidal dome"};
+ ":/SampleDesignerToolbox/images/ff_TruncatedSpheroid_64x64.png", "Spheroidal dome"};
default:
ASSERT(false);
diff --git a/GUI/Model/Sample/FormFactorItems.h b/GUI/Model/Sample/FormFactorItems.h
index b91ee6d6eb6..3fdcb430e6f 100644
--- a/GUI/Model/Sample/FormFactorItems.h
+++ b/GUI/Model/Sample/FormFactorItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMS_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMS_H
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Types/DoubleProperty.h"
+#include "GUI/Model/XML/Serializer.h"
#include <QVector>
#include <memory>
diff --git a/GUI/Model/Sample/InterferenceItemCatalog.cpp b/GUI/Model/Sample/InterferenceItemCatalog.cpp
index c0f83223b82..353beefd88d 100644
--- a/GUI/Model/Sample/InterferenceItemCatalog.cpp
+++ b/GUI/Model/Sample/InterferenceItemCatalog.cpp
@@ -50,26 +50,23 @@ InterferenceItemCatalog::UiInfo InterferenceItemCatalog::uiInfo(Type type)
case Type::None:
return {"None", "", ""};
case Type::RadialParaCrystalRadial:
- return {"Radial paracrystal",
- ":/SampleDesignerToolbox/images/ParaCrystal1D.png",
- "Interference function of radial paracrystal"};
+ return {"Radial paracrystal", ":/SampleDesignerToolbox/images/ParaCrystal1D.png",
+ "Interference function of radial paracrystal"};
case Type::ParaCrystal2D:
return {"2D paracrystal", ":/SampleDesignerToolbox/images/ParaCrystal2D.png",
- "Interference function of two-dimensional paracrystal"};
+ "Interference function of two-dimensional paracrystal"};
case Type::Lattice1D:
return {"1D lattice", ":/SampleDesignerToolbox/images/Lattice1D.png",
- "Interference function of 1D lattice"};
+ "Interference function of 1D lattice"};
case Type::Lattice2D:
return {"2D lattice", ":/SampleDesignerToolbox/images/Lattice2D.png",
- "Interference function of 2D lattice"};
+ "Interference function of 2D lattice"};
case Type::FiniteLattice2D:
- return {"Finite 2D lattice",
- ":/SampleDesignerToolbox/images/Lattice2DFinite.png",
- "Interference function of finite 2D lattice"};
+ return {"Finite 2D lattice", ":/SampleDesignerToolbox/images/Lattice2DFinite.png",
+ "Interference function of finite 2D lattice"};
case Type::HardDisk:
- return {"Hard disk Percus-Yevick",
- ":/SampleDesignerToolbox/images/Lattice2D.png",
- "Interference function for hard disk Percus-Yevick"};
+ return {"Hard disk Percus-Yevick", ":/SampleDesignerToolbox/images/Lattice2D.png",
+ "Interference function for hard disk Percus-Yevick"};
default:
ASSERT(false);
}
diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index 0e10acfa11a..29bd060eec7 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -14,7 +14,6 @@
#include "GUI/Model/Sample/InterferenceItems.h"
#include "Base/Const/Units.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/FTDecayFunctionItemCatalogs.h"
#include "GUI/Model/Sample/FTDecayFunctionItems.h"
#include "GUI/Model/Sample/FTDistributionItemCatalogs.h"
@@ -22,6 +21,7 @@
#include "GUI/Model/Sample/Lattice2DItemCatalog.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Types/UIntDescriptor.h"
+#include "GUI/Model/XML/Serializer.h"
#include "Sample/Aggregate/Interferences.h"
InterferenceItem::InterferenceItem()
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index 4f3c06515da..8fe2b492bd4 100644
--- a/GUI/Model/Sample/InterferenceItems.h
+++ b/GUI/Model/Sample/InterferenceItems.h
@@ -15,12 +15,12 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/FTDecayFunctionItems.h"
#include "GUI/Model/Sample/FTDistributionItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
#include "GUI/Model/Types/UIntProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include <memory>
class IInterference;
diff --git a/GUI/Model/Sample/ItemWithParticles.cpp b/GUI/Model/Sample/ItemWithParticles.cpp
index 5726d5d9c54..06d752d277a 100644
--- a/GUI/Model/Sample/ItemWithParticles.cpp
+++ b/GUI/Model/Sample/ItemWithParticles.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "Base/Vector/RotMatrix.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
+#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/IParticle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index b896f5b942f..3dd5fa54275 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/Group/SelectionProperty.h"
#include "GUI/Model/Sample/RotationItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
#include "GUI/Model/Types/VectorProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include <memory>
class IParticle;
diff --git a/GUI/Model/Sample/ItemWithParticlesCatalog.cpp b/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
index f9285063584..146c835c529 100644
--- a/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
+++ b/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
@@ -51,13 +51,12 @@ ItemWithParticlesCatalog::UiInfo ItemWithParticlesCatalog::uiInfo(Type type)
return {"Particle", "", ""}; // particle is not on UI, only its form factor
case Type::Composition:
return {"Particle Composition", "ParticleComposition_64x64.png",
- "Composition of particles with fixed positions"};
+ "Composition of particles with fixed positions"};
case Type::CoreShell:
return {"Core shell particle", "ParticleCoreShell_64x64.png",
- "A particle with a core/shell geometry"};
+ "A particle with a core/shell geometry"};
case Type::MesoCrystal:
- return {"Meso Crystal", "Mesocrystal_64x64.png",
- "A 3D crystal structure of nanoparticles"};
+ return {"Meso Crystal", "Mesocrystal_64x64.png", "A 3D crystal structure of nanoparticles"};
default:
ASSERT(false);
}
diff --git a/GUI/Model/Sample/LayerItem.h b/GUI/Model/Sample/LayerItem.h
index 3cdfa823a5a..f00cfb2f0b2 100644
--- a/GUI/Model/Sample/LayerItem.h
+++ b/GUI/Model/Sample/LayerItem.h
@@ -15,11 +15,11 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
+#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/LayerRoughnessItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
#include "GUI/Model/Types/UIntProperty.h"
-#include "GUI/Model/Group/SelectionDescriptor.h"
#include <QColor>
#include <QUuid>
#include <QVector>
diff --git a/GUI/Model/Sample/LayerRoughnessItems.cpp b/GUI/Model/Sample/LayerRoughnessItems.cpp
index a23e4ab6141..f3872eb796e 100644
--- a/GUI/Model/Sample/LayerRoughnessItems.cpp
+++ b/GUI/Model/Sample/LayerRoughnessItems.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Sample/LayerRoughnessItems.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/XML/SessionXML.h"
-#include "GUI/Model/Types/DoubleDescriptor.h"
using namespace GUI::Session::XML;
diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index 753440b0786..99c292b3318 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Model/Sample/MesoCrystalItem.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
@@ -21,6 +20,7 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
+#include "GUI/Model/XML/Serializer.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/IBornFF.h"
diff --git a/GUI/Model/Sample/MesoCrystalItem.h b/GUI/Model/Sample/MesoCrystalItem.h
index f52080cfbdb..2273f7beead 100644
--- a/GUI/Model/Sample/MesoCrystalItem.h
+++ b/GUI/Model/Sample/MesoCrystalItem.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "GUI/Model/Types/VectorProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include "Sample/Lattice/Lattice3D.h"
#include <memory>
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index 2ca13b9e191..7a819d46368 100644
--- a/GUI/Model/Sample/MultiLayerItem.cpp
+++ b/GUI/Model/Sample/MultiLayerItem.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/XML/SessionXML.h"
-#include "GUI/Model/Sample/LayerItem.h"
#include <QXmlStreamWriter>
MultiLayerItem::MultiLayerItem()
diff --git a/GUI/Model/Sample/ParticleCompositionItem.cpp b/GUI/Model/Sample/ParticleCompositionItem.cpp
index 8ac335f0c66..1a4d8983103 100644
--- a/GUI/Model/Sample/ParticleCompositionItem.cpp
+++ b/GUI/Model/Sample/ParticleCompositionItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleCompositionItem.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
+#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index 8a4bc7a6d06..a9b255784be 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -14,11 +14,11 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
+#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ParticleItem.h b/GUI/Model/Sample/ParticleItem.h
index a35c84bb71b..f62092de8e0 100644
--- a/GUI/Model/Sample/ParticleItem.h
+++ b/GUI/Model/Sample/ParticleItem.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include <memory>
class GroupItem;
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index 59449cc0f3f..e43a7390a36 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/InterferenceItemCatalog.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
@@ -21,6 +20,7 @@
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/Model/XML/Serializer.h"
ParticleLayoutItem::ParticleLayoutItem()
{
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 16f39f07f17..b5789c26345 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include <QUuid>
#include <memory>
diff --git a/GUI/Model/Sample/RotationItemCatalog.cpp b/GUI/Model/Sample/RotationItemCatalog.cpp
index f72f950fcc4..72daf41bf4e 100644
--- a/GUI/Model/Sample/RotationItemCatalog.cpp
+++ b/GUI/Model/Sample/RotationItemCatalog.cpp
@@ -51,7 +51,7 @@ RotationItemCatalog::UiInfo RotationItemCatalog::uiInfo(Type type)
return {"Z axis Rotation", "Particle rotation around z-axis", ""};
case Type::Euler:
return {"Euler Rotation",
- "Sequence of three rotations following Euler angles; notation z-x'-z'", ""};
+ "Sequence of three rotations following Euler angles; notation z-x'-z'", ""};
}
ASSERT(false);
}
diff --git a/GUI/Model/Sample/SampleModel.cpp b/GUI/Model/Sample/SampleModel.cpp
index a8e5a92218a..9761cc1b5e0 100644
--- a/GUI/Model/Sample/SampleModel.cpp
+++ b/GUI/Model/Sample/SampleModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/XML/Serializer.h"
#include <QApplication>
SampleModel::SampleModel() {}
diff --git a/GUI/Model/Session/DataItem.h b/GUI/Model/Session/DataItem.h
index 56407e5219d..bf7c2c449a2 100644
--- a/GUI/Model/Session/DataItem.h
+++ b/GUI/Model/Session/DataItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODEL_SESSION_DATAITEM_H
#include "Device/Data/OutputData.h"
-#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/Group/SelectionDescriptor.h"
+#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Support/IO/SaveLoadInterface.h"
#include <QDateTime>
#include <mutex>
diff --git a/GUI/Model/Session/SessionItem.cpp b/GUI/Model/Session/SessionItem.cpp
index 3f800f07828..4a3d66e2b39 100644
--- a/GUI/Model/Session/SessionItem.cpp
+++ b/GUI/Model/Session/SessionItem.cpp
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Catalog/ItemFactory.h"
-#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Session/PropertyItem.h"
+#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemData.h"
#include "GUI/Support/Data/SessionItemTags.h"
@@ -305,8 +305,8 @@ void SessionItem::setItemValue(const QString& tag, const QVariant& variant) cons
SessionItem* SessionItem::addGroupProperty(const QString& groupTag, const GroupInfo& groupInfo)
{
- GroupItem* groupItem = dynamic_cast<GroupItem*>(
- GUI::Model::ItemFactory::CreateItem(GroupItem::M_TYPE));
+ GroupItem* groupItem =
+ dynamic_cast<GroupItem*>(GUI::Model::ItemFactory::CreateItem(GroupItem::M_TYPE));
ASSERT(groupItem);
groupItem->setGroupInfo(groupInfo);
registerTag(groupTag, 1, 1, {GroupItem::M_TYPE});
diff --git a/GUI/Model/Session/SessionModel.cpp b/GUI/Model/Session/SessionModel.cpp
index cc8cf1783af..a4dd90fea10 100644
--- a/GUI/Model/Session/SessionModel.cpp
+++ b/GUI/Model/Session/SessionModel.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Catalog/ItemFactory.h"
#include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Model/Session/SessionItem.h"
+#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemTags.h"
#include "GUI/Util/Error.h"
@@ -87,8 +87,7 @@ Qt::ItemFlags SessionModel::flags(const QModelIndex& index) const
QVariant SessionModel::data(const QModelIndex& index, int role) const
{
ASSERT(m_root_item);
- if (!index.isValid() || index.column() < 0
- || index.column() >= columnCount(QModelIndex()))
+ if (!index.isValid() || index.column() < 0 || index.column() >= columnCount(QModelIndex()))
return {};
if (SessionItem* item = itemForIndex(index)) {
if (role == Qt::DisplayRole || role == Qt::EditRole) {
diff --git a/GUI/Model/XML/Serializer.cpp b/GUI/Model/XML/Serializer.cpp
index d8fe905d958..ab0d511549d 100644
--- a/GUI/Model/XML/Serializer.cpp
+++ b/GUI/Model/XML/Serializer.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/XML/Serializer.h"
-#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Model/Types/DoubleProperty.h"
#include "GUI/Model/Types/UIntProperty.h"
#include "GUI/Model/Types/VectorProperty.h"
+#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Util/DeserializationException.h"
#include <QColor>
diff --git a/GUI/Model/XML/Serializer.h b/GUI/Model/XML/Serializer.h
index d17ba18ab42..ae8ae9fe21f 100644
--- a/GUI/Model/XML/Serializer.h
+++ b/GUI/Model/XML/Serializer.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_XML_SERIALIZER_H
#define BORNAGAIN_GUI_MODEL_XML_SERIALIZER_H
-#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Group/SelectionProperty.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
#include <QXmlStreamWriter> // used in every including file
class DoubleProperty;
diff --git a/GUI/Model/XML/SessionXML.h b/GUI/Model/XML/SessionXML.h
index 00da7f79336..2b744615091 100644
--- a/GUI/Model/XML/SessionXML.h
+++ b/GUI/Model/XML/SessionXML.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_XML_SESSIONXML_H
#define BORNAGAIN_GUI_MODEL_XML_SESSIONXML_H
-#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Group/SelectionProperty.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
#include <QVariant>
#include <QXmlStreamWriter> // used in every including file
#include <heinz/Complex.h>
diff --git a/GUI/View/Fit/FilterPropertyProxy.cpp b/GUI/View/Fit/FilterPropertyProxy.cpp
index 9fec7eb35d5..bf8c3f3d397 100644
--- a/GUI/View/Fit/FilterPropertyProxy.cpp
+++ b/GUI/View/Fit/FilterPropertyProxy.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Fit/FilterPropertyProxy.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/Session/PropertyItem.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/VectorItem.h"
-#include "GUI/Model/Session/PropertyItem.h"
#include "GUI/Support/Data/SessionFlags.h"
int FilterPropertyProxy::columnCount(const QModelIndex& parent) const
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 2fc318149c0..d58504a23f4 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -18,13 +18,13 @@
#include "Core/Simulation/ISimulation.h"
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Fit/FitParameterContainerItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
-#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/To/DomainSimulationBuilder.h"
+#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Session/DataItem.h"
+#include "GUI/Model/To/DomainSimulationBuilder.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Fit/GUIFitObserver.h"
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index a9a420dc87c..dc7c7ded87f 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -19,8 +19,8 @@
#include "GUI/Model/Fit/FitParameterLinkItem.h"
#include "GUI/Model/Fit/FitParameterModel.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
-#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Project/JobModel.h"
#include "GUI/View/Fit/FilterPropertyProxy.h"
#include "GUI/View/Fit/FitParameterDelegate.h"
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index 655e018745d..6db73dca4ee 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Fit/MinimizerSettingsWidget.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
-#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/LayoutUtils.h"
#include <QComboBox>
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index eee57cfcdb0..aaf991a76bb 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Fit/ParameterTuningModel.h"
-#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Project/JobModel.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Common/StyledToolBar.h"
diff --git a/GUI/View/FromDomain/GUIObjectBuilder.cpp b/GUI/View/FromDomain/GUIObjectBuilder.cpp
index 67b563ed364..7c6eb916e2f 100644
--- a/GUI/View/FromDomain/GUIObjectBuilder.cpp
+++ b/GUI/View/FromDomain/GUIObjectBuilder.cpp
@@ -16,11 +16,11 @@
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
#include "Core/Simulation/includeSimulations.h"
-#include "GUI/View/FromDomain/FromDomain.h"
-#include "GUI/View/FromDomain/GUISampleBuilder.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
+#include "GUI/View/FromDomain/FromDomain.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
#include "Resample/Options/SimulationOptions.h"
namespace {
diff --git a/GUI/View/FromDomain/GUISampleBuilder.cpp b/GUI/View/FromDomain/GUISampleBuilder.cpp
index 9efbe2c54f7..ebeb9b9250f 100644
--- a/GUI/View/FromDomain/GUISampleBuilder.cpp
+++ b/GUI/View/FromDomain/GUISampleBuilder.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/View/FromDomain/GUISampleBuilder.h"
-#include "GUI/View/FromDomain/FromDomain.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Sample/LayerItem.h"
@@ -24,6 +23,7 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
+#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/View/Import/ImportDataView.cpp b/GUI/View/Import/ImportDataView.cpp
index 2819d491bc7..628b9af847e 100644
--- a/GUI/View/Import/ImportDataView.cpp
+++ b/GUI/View/Import/ImportDataView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Import/ImportDataView.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "GUI/View/Tool/mainwindow_constants.h"
#include <QAction>
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index 22a0e581268..1ded21b55b1 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/View/Mask/MaskEditor.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 886b682c9ae..82462a81b42 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/View/Global/Globals.h"
#include <QComboBox>
#include <QLabel>
diff --git a/GUI/View/Import/SpecularDataImportWidget.cpp b/GUI/View/Import/SpecularDataImportWidget.cpp
index 3f9d629f776..6c539eb3248 100644
--- a/GUI/View/Import/SpecularDataImportWidget.cpp
+++ b/GUI/View/Import/SpecularDataImportWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Import/SpecularDataImportWidget.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Support/IO/AbstractDataLoaderResultModel.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 6014ab0af80..204ce35161d 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/Instrument/ResolutionItems.h"
#include "GUI/Model/Instrument/ItemWithDistribution.h"
+#include "GUI/Model/Instrument/ResolutionItems.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/View/Instrument/DistributionForms.h"
#include "GUI/View/Instrument/EditDistributionDialog.h"
diff --git a/GUI/View/Instrument/DistributionForms.cpp b/GUI/View/Instrument/DistributionForms.cpp
index 61848ac9a3e..d25d696f9f8 100644
--- a/GUI/View/Instrument/DistributionForms.cpp
+++ b/GUI/View/Instrument/DistributionForms.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/DistributionForms.h"
-#include "GUI/Model/Instrument/ResolutionItems.h"
#include "GUI/Model/Instrument/ItemWithDistribution.h"
+#include "GUI/Model/Instrument/ResolutionItems.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index 49db0991c24..c997d6a44d5 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Job/JobResultsPresenter.h"
-#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Fit/JobItem.h"
+#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/View/Job/JobViewActivities.h"
#include "GUI/View/Plot2D/IntensityDataWidget.h"
#include "GUI/View/PlotComparison/FitComparisonWidget.h"
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index c1752e19b83..42588f00c80 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Loaders/AutomaticDataLoader1D.h"
#include "Device/InputOutput/OutputDataReadReflectometry.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
index 1be4a061b75..465df9c1eb6 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
AutomaticDataLoader1DResultModel::AutomaticDataLoader1DResultModel(RealDataItem* item)
: m_item(item)
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 7390b4f0bf5..5860e108320 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Loaders/QREDataLoader.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Coord/AxisNames.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Util/CoordName.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/View/Loaders/QREDataLoaderProperties.h"
diff --git a/GUI/View/Mask/MaskContainerView.cpp b/GUI/View/Mask/MaskContainerView.cpp
index 9056e0047a9..7ef9e9416e4 100644
--- a/GUI/View/Mask/MaskContainerView.cpp
+++ b/GUI/View/Mask/MaskContainerView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskContainerView.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/View/Mask/ISceneAdaptor.h"
#include <QBrush>
#include <QPainter>
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index cb03e9db7a3..0e58cf0fdef 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskGraphicsScene.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Mask/MaskItems.h"
-#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Session/PropertyItem.h"
+#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
#include "GUI/View/Mask/MaskGraphicsProxy.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index e6e93003c73..b31ed846381 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskViewFactory.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Mask/EllipseView.h"
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.cpp b/GUI/View/Plot2D/IntensityDataCanvas.cpp
index 3bbb4c093e7..b32f288ff9d 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.cpp
+++ b/GUI/View/Plot2D/IntensityDataCanvas.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Plot2D/IntensityDataCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/PlotComparison/FitComparisonController.cpp b/GUI/View/PlotComparison/FitComparisonController.cpp
index b6059d9a4af..f2dfa56bba8 100644
--- a/GUI/View/PlotComparison/FitComparisonController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonController.cpp
@@ -16,9 +16,9 @@
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Ax/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
namespace {
diff --git a/GUI/View/PlotComparison/FitComparisonViewController.cpp b/GUI/View/PlotComparison/FitComparisonViewController.cpp
index 8963a8bca8f..59faa2aaa06 100644
--- a/GUI/View/PlotComparison/FitComparisonViewController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonViewController.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Ax/AxesItems.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
-#include "GUI/Model/Plot/DataPropertyContainer.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
+#include "GUI/Model/Plot/DataPropertyContainer.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 89587b49afb..b9df750fa93 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/PlotComparison/FitComparisonWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitComparisonController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 1b26282b2da..2714eeab4bf 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/Project/PyImportAssistant.cpp b/GUI/View/Project/PyImportAssistant.cpp
index e522f068eab..afdd8e020ab 100644
--- a/GUI/View/Project/PyImportAssistant.cpp
+++ b/GUI/View/Project/PyImportAssistant.cpp
@@ -19,11 +19,11 @@
#include "Base/Util/Assert.h"
#include "Base/Util/SysUtils.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/View/FromDomain/GUIObjectBuilder.h"
-#include "GUI/View/FromDomain/GUISampleBuilder.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Path.h"
#include "GUI/Util/String.h"
+#include "GUI/View/FromDomain/GUIObjectBuilder.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Info/ComboSelectorDialog.h"
#include "GUI/View/Info/DetailedMessageBox.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index b0c808f4ed4..8f87149d3a9 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -17,8 +17,8 @@
#include "Device/Histo/Histogram2D.h"
#include "GUI/Model/Ax/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
#include <qcustomplot.h>
diff --git a/GUI/View/Projection/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp
index 79a30487b77..a6b106eeb90 100644
--- a/GUI/View/Projection/SaveProjectionsAssistant.cpp
+++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp
@@ -18,8 +18,8 @@
#include "Device/Histo/Histogram2D.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
index f6d34d27317..f6c5d9eeeeb 100644
--- a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
#include "GUI/Model/Ax/AxesItems.h"
-#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Plot/Data1DViewItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorCommands.cpp b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
index 04478fcaa81..054cf4c2cea 100644
--- a/GUI/View/SampleDesigner/SampleEditorCommands.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/SampleDesigner/SampleEditorCommands.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/XML/Serializer.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include <utility>
diff --git a/GUI/View/SampleDesigner/SampleListModel.cpp b/GUI/View/SampleDesigner/SampleListModel.cpp
index 952db6a02af..7f4a20c4f00 100644
--- a/GUI/View/SampleDesigner/SampleListModel.cpp
+++ b/GUI/View/SampleDesigner/SampleListModel.cpp
@@ -14,11 +14,11 @@
#include "GUI/View/SampleDesigner/SampleListModel.h"
#include "Base/Util/Assert.h"
-#include "GUI/View/FromDomain/GUIExamplesFactory.h"
-#include "GUI/View/FromDomain/GUISampleBuilder.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Util/String.h"
+#include "GUI/View/FromDomain/GUIExamplesFactory.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Info/DetailedMessageBox.h"
#include "GUI/View/Project/PyImportAssistant.h"
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 7360ebc843f..e043949b557 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/SampleDesigner/SampleListView.h"
#include "Base/Util/SysUtils.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/View/FromDomain/GUIExamplesFactory.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Util/OSInfo.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
+#include "GUI/View/FromDomain/GUIExamplesFactory.h"
#include "GUI/View/SampleDesigner/SampleListModel.h"
#include "GUI/View/Tool/ItemDelegateForHTML.h"
#include <QAction>
diff --git a/GUI/View/Tool/DataItemUtils.cpp b/GUI/View/Tool/DataItemUtils.cpp
index b5b11136449..3f9a9c58ced 100644
--- a/GUI/View/Tool/DataItemUtils.cpp
+++ b/GUI/View/Tool/DataItemUtils.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Tool/DataItemUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
namespace {
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index 498522e1225..36c344f50ab 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SessionModelView.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
-#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Util/ComboProperty.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index c0c2ad60e12..8edf20d5f8d 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SimulationView.h"
+#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
-#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Sample/SampleValidator.h"
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 09b42c6f749..5fc4cd7fa44 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -19,7 +19,6 @@
#include "Device/Data/DataUtils.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Histo/SimulationResult.h"
-#include "GUI/View/FromDomain/GUIObjectBuilder.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Material/MaterialModel.h"
@@ -27,6 +26,7 @@
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
+#include "GUI/View/FromDomain/GUIObjectBuilder.h"
#include <iostream>
namespace {
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 6a795e2ee93..de7cf44d06c 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -2,9 +2,9 @@
#include "Base/Axis/VariableBinAxis.h"
#include "Base/Const/Units.h"
#include "GUI/Model/Ax/AxesItems.h"
-#include "GUI/View/FromDomain/FromDomain.h"
#include "GUI/Model/Session/PropertyItem.h"
#include "GUI/Util/Error.h"
+#include "GUI/View/FromDomain/FromDomain.h"
#include "Tests/GTestWrapper/google_test.h"
class TestAxesItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index bd5f15220a2..2e5ab7c689c 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -1,8 +1,8 @@
+#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Plot/DataProperties.h"
#include "GUI/Model/Plot/DataPropertyContainer.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 7e9a48b9afe..1a5366f56bf 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Model/Instrument/ResolutionItems.h"
#include "GUI/Model/Group/GroupItem.h"
+#include "GUI/Model/Instrument/ResolutionItems.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Support/Type/VariantUtil.h"
diff --git a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
index d3b62095864..141b460c3da 100644
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
@@ -1,7 +1,7 @@
-#include "GUI/View/FromDomain/FromDomain.h"
#include "GUI/Model/Sample/LayerRoughnessItems.h"
#include "GUI/Model/To/ToDomain.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
+#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 4f820e324c2..7c6c2d86b89 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,12 +1,12 @@
#include "GUI/Model/Ax/AxesItems.h"
+#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
-#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Instrument/RectangularDetectorItem.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
+#include "GUI/Model/Instrument/RectangularDetectorItem.h"
+#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestMapperForItem.cpp b/Tests/Unit/GUI/TestMapperForItem.cpp
index faaaf2abd53..3798f5d8c77 100644
--- a/Tests/Unit/GUI/TestMapperForItem.cpp
+++ b/Tests/Unit/GUI/TestMapperForItem.cpp
@@ -1,6 +1,6 @@
+#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Mask/ProjectionItems.h"
#include "GUI/Model/Project/JobModel.h"
-#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index b8f11b3a294..c88121b6ec3 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,13 +1,13 @@
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
-#include "GUI/Model/Project/JobModelFunctions.h"
+#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Project/JobModel.h"
+#include "GUI/Model/Project/JobModelFunctions.h"
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
diff --git a/Tests/Unit/GUI/TestParaCrystalItems.cpp b/Tests/Unit/GUI/TestParaCrystalItems.cpp
index bb5e523d7e7..32285bb53a0 100644
--- a/Tests/Unit/GUI/TestParaCrystalItems.cpp
+++ b/Tests/Unit/GUI/TestParaCrystalItems.cpp
@@ -1,5 +1,4 @@
#include "Base/Const/Units.h"
-#include "GUI/View/FromDomain/FromDomain.h"
#include "GUI/Model/Sample/FTDistributionItems.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
@@ -7,6 +6,7 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Sample/SampleModel.h"
+#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Aggregate/Interference2DParaCrystal.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 3646de99cd9..9e65924502e 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,10 +1,10 @@
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Path.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
index 19b3edea551..1ec75d6e124 100644
--- a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Material/MaterialModel.h"
+#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 663f8cdd4a6..6b6834bb5e0 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,10 +1,10 @@
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Instrument/JobItemUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index a5eae52e209..67330ef65cb 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -1,14 +1,14 @@
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Model/Ax/PointwiseAxisItem.h"
-#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
-#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Project/JobModelFunctions.h"
+#include "GUI/Model/Project/ApplicationModels.h"
#include "GUI/Model/Project/JobModel.h"
+#include "GUI/Model/Project/JobModelFunctions.h"
#include "GUI/Model/Project/OutputDataIOService.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index 533b11dcf45..509b48882de 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,6 +1,6 @@
+#include "GUI/Model/Session/PropertyItem.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/VectorItem.h"
-#include "GUI/Model/Session/PropertyItem.h"
#include "GUI/Support/Type/VariantUtil.h"
#include "GUI/Util/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 864981d6c4d..573a6552a1b 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,14 +1,14 @@
+#include "GUI/Model/Fit/JobItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
-#include "GUI/Model/Fit/JobItem.h"
-#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Material/MaterialModel.h"
+#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Model/Session/PropertyItem.h"
+#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Support/Data/SessionItemTags.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index eb846870c8a..9f1cebdc9b0 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -2,16 +2,16 @@
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Project/JobModel.h"
-#include "GUI/Model/XML/Serializer.h"
-#include "GUI/Model/XML/SessionXML.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/Sample/SampleModel.h"
-#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Session/PropertyItem.h"
+#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Model/XML/Serializer.h"
+#include "GUI/Model/XML/SessionXML.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 55a6ee35add..1914c8ed88d 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -16,8 +16,8 @@
#ifndef BORNAGAIN_TESTS_UNIT_GUI_UTILS_H
#define BORNAGAIN_TESTS_UNIT_GUI_UTILS_H
-#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Model/Session/PropertyItem.h"
+#include "GUI/Model/XML/SessionXML.h"
#include "GUI/Support/Data/XML.h"
#include <QString>
#include <QXmlStreamWriter>
--
GitLab