diff --git a/App/main.cpp b/App/main.cpp
index 6df79f3595d3efcf1b9ddd52a50dfab74bb56234..b9a97e4131c6e8b7ea67aaa0c247d924c6ad5ddf 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "App/MessageHandler.h"
#include "App/AppOptions.h"
+#include "App/MessageHandler.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Loaders/DataLoaderUtil.h"
diff --git a/GUI/Mapper/ComponentProxyModel.cpp b/GUI/Mapper/ComponentProxyModel.cpp
index e4858007c760422fee2acbe58e63dfb003b81ad0..00053413687870199b1a31fb70ae16802e2c0f2f 100644
--- a/GUI/Mapper/ComponentProxyModel.cpp
+++ b/GUI/Mapper/ComponentProxyModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Mapper/ComponentProxyStrategy.h"
#include <QSet>
#include <functional>
diff --git a/GUI/Mapper/ComponentProxyStrategy.cpp b/GUI/Mapper/ComponentProxyStrategy.cpp
index b5f79b7c45c26f8c088e4255cb99d3c54a48aed2..7c23151a4c3874d0f8b9497d2989086a73634de8 100644
--- a/GUI/Mapper/ComponentProxyStrategy.cpp
+++ b/GUI/Mapper/ComponentProxyStrategy.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Mapper/ComponentProxyStrategy.h"
-#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Mapper/ComponentUtils.h"
+#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Varia/ModelPath.h"
void ComponentProxyStrategy::onDataChanged(SessionModel* source, ComponentProxyModel* proxy)
{
diff --git a/GUI/Mapper/ComponentUtils.cpp b/GUI/Mapper/ComponentUtils.cpp
index d312f082854fb93076c4011a0e72bc3d59c46cfd..450b48a329df56fe81f04b840fc53e70c09c492a 100644
--- a/GUI/Mapper/ComponentUtils.cpp
+++ b/GUI/Mapper/ComponentUtils.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Material/MaterialDataItems.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/Models/Varia/PropertyItem.h"
namespace {
QList<const SessionItem*> groupItems(const GroupItem& item);
diff --git a/GUI/Mapper/ProxyModelStrategy.cpp b/GUI/Mapper/ProxyModelStrategy.cpp
index db9aba600973941c12da3701edded87a8690be12..ab0e7231136b5d1309296f20621d23e8f04d4fbb 100644
--- a/GUI/Mapper/ProxyModelStrategy.cpp
+++ b/GUI/Mapper/ProxyModelStrategy.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Mapper/ModelUtils.h"
+#include "GUI/Models/Session/SessionModel.h"
ProxyModelStrategy::ProxyModelStrategy() : m_source(nullptr), m_proxy(nullptr) {}
diff --git a/GUI/Models/Data/ApplicationModels.cpp b/GUI/Models/Data/ApplicationModels.cpp
index d9e969353a961232880842c2dadbba36b51d8dd9..612769689997edfe8cc2c6915f5dd535957bfd2c 100644
--- a/GUI/Models/Data/ApplicationModels.cpp
+++ b/GUI/Models/Data/ApplicationModels.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/utils/DeserializationException.h"
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/Data/Data1DViewItem.cpp b/GUI/Models/Data/Data1DViewItem.cpp
index d71eb4c5b684fc7a972c6f34a4b77bb8039756ac..502a54b31841466df17cbbb46df3eafb437cafc8 100644
--- a/GUI/Models/Data/Data1DViewItem.cpp
+++ b/GUI/Models/Data/Data1DViewItem.cpp
@@ -15,11 +15,11 @@
#include "GUI/Models/Data/Data1DViewItem.h"
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Data/DataItem.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/DataViewUtils.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Data/DataItemUtils.cpp b/GUI/Models/Data/DataItemUtils.cpp
index 054be035de338019af919201a7532e91f5d7f7c9..61f254c35c85aa7f5edc8add7792c54b32a4280e 100644
--- a/GUI/Models/Data/DataItemUtils.cpp
+++ b/GUI/Models/Data/DataItemUtils.cpp
@@ -14,9 +14,9 @@
#include "GUI/Models/Data/DataItemUtils.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
+#include "GUI/Models/Job/JobItem.h"
namespace {
template <class DataItemType> DataItemType* dataItem(SessionItem* parent)
diff --git a/GUI/Models/Data/DataProperties.cpp b/GUI/Models/Data/DataProperties.cpp
index ba9268775d5f435470e3d15c2dd936def847d34d..92cb074be84419f5e34af32eebb04d558374dca2 100644
--- a/GUI/Models/Data/DataProperties.cpp
+++ b/GUI/Models/Data/DataProperties.cpp
@@ -14,9 +14,9 @@
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include <QColor>
diff --git a/GUI/Models/Data/GUIObjectBuilder.cpp b/GUI/Models/Data/GUIObjectBuilder.cpp
index 7d7776c5a0dabefaefae09a5177362ce51b81fb3..bc049f54d160248a0508231587fbc0903b175a51 100644
--- a/GUI/Models/Data/GUIObjectBuilder.cpp
+++ b/GUI/Models/Data/GUIObjectBuilder.cpp
@@ -16,12 +16,12 @@
#include "Base/Const/Units.h"
#include "Base/Utils/Assert.h"
#include "Core/Simulation/includeSimulations.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "Resample/Options/SimulationOptions.h"
namespace {
diff --git a/GUI/Models/Data/IntensityDataItem.cpp b/GUI/Models/Data/IntensityDataItem.cpp
index 7fdced176c3d2f9a5c15f6878bf447a0641d9ecf..202ad3ffbc1879f485227cb400c9d7c6b0fce569 100644
--- a/GUI/Models/Data/IntensityDataItem.cpp
+++ b/GUI/Models/Data/IntensityDataItem.cpp
@@ -14,12 +14,12 @@
#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/Models/Job/JobItemUtils.h"
-#include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/MaskUnitsConverter.h"
+#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Job/JobItemUtils.h"
+#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Trafo/ProjectionItems.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index b0550d5548b10247607810d01b371f3814691f6a..33744f324bcf30410438c835e67b29e3ca3ba6c3 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -14,21 +14,21 @@
#include "GUI/Models/Data/RealDataItem.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Varia/ItemFileNameUtils.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Job/JobItemUtils.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
-#include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
-#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Data/SpecularDataItem.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Job/JobItemUtils.h"
+#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Models/Trafo/ProjectionItems.h"
+#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/Session/SessionData.h"
#include "GUI/utils/DeserializationException.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Models/Data/RealDataItem.h b/GUI/Models/Data/RealDataItem.h
index bf377713a2af752e21d66e5d246ccce20989753f..1f9dc99f0085816e14ca98bfe5a5ba255ac3b413 100644
--- a/GUI/Models/Data/RealDataItem.h
+++ b/GUI/Models/Data/RealDataItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_DATA_REALDATAITEM_H
#define BORNAGAIN_GUI_MODELS_DATA_REALDATAITEM_H
-#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Models/Data/AbstractDataLoader.h"
+#include "GUI/Models/Session/SessionItem.h"
#include <QPointer>
class DataItem;
diff --git a/GUI/Models/Data/SpecularDataItem.cpp b/GUI/Models/Data/SpecularDataItem.cpp
index 407cea5ce56f888cd77462ed898c7f731cba9338..eba43c1c1093e44d87d108eb1a14402264704c63 100644
--- a/GUI/Models/Data/SpecularDataItem.cpp
+++ b/GUI/Models/Data/SpecularDataItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Domain/DomainObjectBuilder.cpp b/GUI/Models/Domain/DomainObjectBuilder.cpp
index 096d3082a9c7ed7bd93e962227e7e685502233b2..8aeb31b806f85b6d59a60ce81b869a11b0c52dff 100644
--- a/GUI/Models/Domain/DomainObjectBuilder.cpp
+++ b/GUI/Models/Domain/DomainObjectBuilder.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Models/Domain/DomainObjectBuilder.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Sample/InterferenceItems.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/utils/Error.h"
std::unique_ptr<MultiLayer>
diff --git a/GUI/Models/Domain/DomainSimulationBuilder.cpp b/GUI/Models/Domain/DomainSimulationBuilder.cpp
index dfc6b361ffd93eed919d19e40e8d2aeebbd58227..e8ddf315762c5abcf3cdd76554a9e9eb0b1fd9c1 100644
--- a/GUI/Models/Domain/DomainSimulationBuilder.cpp
+++ b/GUI/Models/Domain/DomainSimulationBuilder.cpp
@@ -20,13 +20,13 @@
#include "Device/Beam/Beam.h"
#include "Device/Beam/IFootprintFactor.h"
#include "GUI/Models/Data/AxesItems.h"
+#include "GUI/Models/Domain/DomainObjectBuilder.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Instrument/BackgroundItems.h"
#include "GUI/Models/Instrument/FootprintItems.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Varia/SimulationOptionsItem.h"
-#include "GUI/Models/Domain/DomainObjectBuilder.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Domain/TransformFromDomain.cpp b/GUI/Models/Domain/TransformFromDomain.cpp
index 6473533ac5b8ac854ba6a2b780ccb255128d83d0..9d699ba99a2112095786509d8e03c580ab0af3c3 100644
--- a/GUI/Models/Domain/TransformFromDomain.cpp
+++ b/GUI/Models/Domain/TransformFromDomain.cpp
@@ -36,19 +36,19 @@
#include "GUI/Models/Instrument/BackgroundItems.h"
#include "GUI/Models/Instrument/BeamAngleItems.h"
#include "GUI/Models/Instrument/BeamWavelengthItem.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Instrument/RectangularDetectorItem.h"
+#include "GUI/Models/Instrument/SphericalDetectorItem.h"
#include "GUI/Models/Sample/FTDecayFunctionItems.h"
#include "GUI/Models/Sample/FTDistributionItems.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Sample/InterferenceItems.h"
#include "GUI/Models/Sample/Lattice2DItems.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/LayerRoughnessItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
-#include "GUI/Models/Instrument/SphericalDetectorItem.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Types/UIntDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
#include "GUI/utils/Error.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/Models/Domain/TransformToDomain.cpp b/GUI/Models/Domain/TransformToDomain.cpp
index 1c492f3bf2a8535d8f9c0f6c2279c4ce8536029d..887ddbf34d8336de09386f81991716084b02fe2f 100644
--- a/GUI/Models/Domain/TransformToDomain.cpp
+++ b/GUI/Models/Domain/TransformToDomain.cpp
@@ -22,9 +22,9 @@
#include "GUI/Models/Instrument/BeamWavelengthItem.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/LayerRoughnessItems.h"
-#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
@@ -32,11 +32,11 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Trafo/RotationItems.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/UIntDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Resample/Options/SimulationOptions.h"
#include "Sample/Particle/MesoCrystal.h"
diff --git a/GUI/Models/Fit/FitParameterItems.cpp b/GUI/Models/Fit/FitParameterItems.cpp
index 28396adc3d0de20a207dc0b883a85a5b0709ab44..abef840af40c9cf26a5c6f63228e3e1d71157f65 100644
--- a/GUI/Models/Fit/FitParameterItems.cpp
+++ b/GUI/Models/Fit/FitParameterItems.cpp
@@ -15,10 +15,10 @@
#include "GUI/Models/Fit/FitParameterItems.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/Parameters.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include <cmath>
diff --git a/GUI/Models/Fit/FitParameterProxyModel.cpp b/GUI/Models/Fit/FitParameterProxyModel.cpp
index e33c61489c51724aef6daa778e82aaf2dc4c5afc..8655501a9370a7159673a3f106059ed7b3de8906 100644
--- a/GUI/Models/Fit/FitParameterProxyModel.cpp
+++ b/GUI/Models/Fit/FitParameterProxyModel.cpp
@@ -14,10 +14,10 @@
#include "GUI/Models/Fit/FitParameterProxyModel.h"
#include "GUI/Models/Fit/FitParameterItems.h"
-#include "GUI/Models/Varia/ModelPath.h"
-#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Session/SessionItemUtils.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include <QColor>
#include <QMimeData>
diff --git a/GUI/Models/Group/GroupItemController.cpp b/GUI/Models/Group/GroupItemController.cpp
index aadd5528b7ae0ab4d741d44caccb7b637ee1b964..be94c0d17bfd4b776249685fd5600ee9a30b3a42 100644
--- a/GUI/Models/Group/GroupItemController.cpp
+++ b/GUI/Models/Group/GroupItemController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Group/GroupItemController.h"
-#include "GUI/Models/Varia/ItemFactory.h"
-#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Session/SessionItem.h"
+#include "GUI/Models/Varia/ItemFactory.h"
GroupItemController::GroupItemController(SessionItem* groupItem, GroupInfo groupInfo)
: m_groupItem(groupItem), m_groupInfo(groupInfo)
diff --git a/GUI/Models/Group/SelectionDescriptor.h b/GUI/Models/Group/SelectionDescriptor.h
index 29bca42acc26d48824deab3c9930c7cac3716806..4a05518e9fdb2ad87a68150a67dcbbb6bf10301c 100644
--- a/GUI/Models/Group/SelectionDescriptor.h
+++ b/GUI/Models/Group/SelectionDescriptor.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
#define BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
-#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Group/GroupItem.h"
#include <QString>
#include <QStringList>
#include <functional>
diff --git a/GUI/Models/Instrument/BeamItems.cpp b/GUI/Models/Instrument/BeamItems.cpp
index 9451b1c8bdc852b30123c4f3af24a2f51412938d..715a8b9d01374885c178ebc001654b868352ebfe 100644
--- a/GUI/Models/Instrument/BeamItems.cpp
+++ b/GUI/Models/Instrument/BeamItems.cpp
@@ -16,11 +16,11 @@
#include "Base/Axis/IAxis.h"
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
+#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/BeamAngleItems.h"
#include "GUI/Models/Instrument/BeamWavelengthItem.h"
#include "GUI/Models/Instrument/FootprintItems.h"
-#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Data/PointwiseAxisItem.h"
#include "GUI/Models/Types/VectorItem.h"
#include <cmath>
diff --git a/GUI/Models/Instrument/BeamItems.h b/GUI/Models/Instrument/BeamItems.h
index 882d9326f45d3fdac0a73a6cce2aa4ba6de22f43..78fe98fc7fa5b88f538ee2151989934d2781a993 100644
--- a/GUI/Models/Instrument/BeamItems.h
+++ b/GUI/Models/Instrument/BeamItems.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMITEMS_H
#include "Base/Vector/Vectors3D.h"
-#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
+#include "GUI/Models/Session/SessionItem.h"
class BasicAxisItem;
class Beam;
diff --git a/GUI/Models/Instrument/DetectorItems.cpp b/GUI/Models/Instrument/DetectorItems.cpp
index 7460b6b249852ea7a3494137d38cf3c60a4db5e3..12a846a0b420765fc920102a55be65a962c5a0c7 100644
--- a/GUI/Models/Instrument/DetectorItems.cpp
+++ b/GUI/Models/Instrument/DetectorItems.cpp
@@ -16,11 +16,11 @@
#include "Device/Detector/IDetector2D.h"
#include "Device/Mask/IShape2D.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
+#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Instrument/SphericalDetectorItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Instrument/SphericalDetectorItem.h"
-#include "GUI/Models/Group/GroupInfo.h"
namespace {
const QString res_func_group_label = "Type";
diff --git a/GUI/Models/Instrument/InstrumentItems.cpp b/GUI/Models/Instrument/InstrumentItems.cpp
index 41e9e1212fcc42d2aeea3d87beefde793c7388a5..ef62799576851fcc8cfb92ef90bdcd80cd504c6c 100644
--- a/GUI/Models/Instrument/InstrumentItems.cpp
+++ b/GUI/Models/Instrument/InstrumentItems.cpp
@@ -21,18 +21,18 @@
#include "Device/Coord/CoordSystem2D.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
+#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/BackgroundItems.h"
#include "GUI/Models/Instrument/BeamWavelengthItem.h"
#include "GUI/Models/Instrument/DetectorItems.h"
-#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Varia/ItemFileNameUtils.h"
-#include "GUI/Models/Job/JobItemUtils.h"
-#include "GUI/Models/Data/PointwiseAxisItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Instrument/SphericalDetectorItem.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
diff --git a/GUI/Models/Instrument/InstrumentModel.cpp b/GUI/Models/Instrument/InstrumentModel.cpp
index baf66f3da90c76ffbe3d0d071eeeb444368343ae..6a2df409a8efc9d823592246d322625eddfc2f00 100644
--- a/GUI/Models/Instrument/InstrumentModel.cpp
+++ b/GUI/Models/Instrument/InstrumentModel.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Mapper/ModelUtils.h"
+#include "GUI/Models/Data/PointwiseAxisItem.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Data/PointwiseAxisItem.h"
-#include "GUI/Mapper/ModelUtils.h"
InstrumentModel::InstrumentModel(QObject* parent)
: SessionModel(GUI::Session::XML::InstrumentModelTag, parent)
diff --git a/GUI/Models/Instrument/RectangularDetectorItem.cpp b/GUI/Models/Instrument/RectangularDetectorItem.cpp
index 503fb1e39c08b477c24b161faf897af6a0523cf2..6fdec91e4f8c470ff93879c05709679b2f76c56e 100644
--- a/GUI/Models/Instrument/RectangularDetectorItem.cpp
+++ b/GUI/Models/Instrument/RectangularDetectorItem.cpp
@@ -15,8 +15,8 @@
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "Device/Detector/RectangularDetector.h"
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Types/VectorItem.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Instrument/SpecularBeamInclinationItem.cpp b/GUI/Models/Instrument/SpecularBeamInclinationItem.cpp
index 87aeb0a2162153b0d4ad899db305d93021b35fba..85b175db4deaefaf57d4d1639ccb5021db7b5999 100644
--- a/GUI/Models/Instrument/SpecularBeamInclinationItem.cpp
+++ b/GUI/Models/Instrument/SpecularBeamInclinationItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
#include "Base/Const/Units.h"
-#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Group/GroupItem.h"
namespace {
void setupDistributionMean(SessionItem* distribution);
diff --git a/GUI/Models/Job/FitParameterHelper.cpp b/GUI/Models/Job/FitParameterHelper.cpp
index 55647ca2a913dc2e3e3a60ff3c545b241ae98fb3..646a3be865b5acb134dae7f2ebcda3d58b671011 100644
--- a/GUI/Models/Job/FitParameterHelper.cpp
+++ b/GUI/Models/Job/FitParameterHelper.cpp
@@ -15,9 +15,9 @@
#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Fit/FitParameterItems.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Varia/ModelPath.h"
//! Creates fit parameter from given ParameterItem, sets starting value to the value
//! of ParameterItem, copies link.
diff --git a/GUI/Models/Job/JobItem.cpp b/GUI/Models/Job/JobItem.cpp
index 0e8222149fba322f8978ff6c8d8096157a702d0a..6bd409b9b80f0815e8832264b1fb355f79bca78f 100644
--- a/GUI/Models/Job/JobItem.cpp
+++ b/GUI/Models/Job/JobItem.cpp
@@ -15,17 +15,17 @@
#include "GUI/Models/Job/JobItem.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Data/Data1DViewItem.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Fit/FitSuiteItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
-#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
+#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/Models/Varia/SimulationOptionsItem.h"
-#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/utils/Error.h"
JobItem::JobItem() : SessionItem(M_TYPE)
diff --git a/GUI/Models/Job/JobItem.h b/GUI/Models/Job/JobItem.h
index e004295a8ed5be18e443d62dc5f22f8176775f61..28943adef25f7c0b0a92958ffaa793be40292466 100644
--- a/GUI/Models/Job/JobItem.h
+++ b/GUI/Models/Job/JobItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBITEM_H
#define BORNAGAIN_GUI_MODELS_JOB_JOBITEM_H
+#include "GUI/Models/Job/JobStatus.h"
#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Job/JobStatus.h"
class DataItem;
class Data1DViewItem;
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index 32c68207c3003c80da6749240fdd18baba6ab6a7..bb37500ac238ea067684205611e2d9463a447889 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -13,17 +13,17 @@
// ************************************************************************************************
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModelFunctions.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
-#include "GUI/Models/Data/PointwiseAxisItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Job/JobQueueData.h"
#include "GUI/Models/Job/ParameterTreeUtils.h"
+#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/utils/Helpers.h"
JobModel::JobModel(QObject* parent)
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index e1763da7abfa49398f9323b8220be6e7cb4a9b63..251436cafd571f1c8c119ca66e435e9183f97930 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -16,23 +16,23 @@
#include "Base/Utils/Assert.h"
#include "Device/Instrument/Instrument.h"
#include "GUI/Models/Data/Data1DViewItem.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Fit/FitParameterItems.h"
#include "GUI/Models/Fit/FitSuiteItem.h"
+#include "GUI/Models/Fit/MinimizerItem.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Varia/ItemFileNameUtils.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
-#include "GUI/Models/Fit/MinimizerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Data/PointwiseAxisItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/Models/Varia/ItemFileNameUtils.h"
+#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <map>
diff --git a/GUI/Models/Job/JobQueueData.cpp b/GUI/Models/Job/JobQueueData.cpp
index 3b6966470d9dd9174eb8f8611b9d879571f0d7e8..68c0acd34b8e236db4b7f4227d4de9d56ccde408 100644
--- a/GUI/Models/Job/JobQueueData.cpp
+++ b/GUI/Models/Job/JobQueueData.cpp
@@ -14,8 +14,8 @@
#include "GUI/Models/Job/JobQueueData.h"
#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Domain/DomainSimulationBuilder.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Job/JobWorker.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index 5c8d8c9b7b772cbfc6d310e63e6d9b9345e903ec..e6d0e933f49c3f5632f1e24024717d6ba992cb7a 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -17,9 +17,9 @@
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
-#include "GUI/Models/Varia/ModelPath.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/utils/Error.h"
#include <QStack>
diff --git a/GUI/Models/Material/MaterialItem.cpp b/GUI/Models/Material/MaterialItem.cpp
index 6975dbd97daa0ef3047f8922d9fa044cf5164f31..4a2491d2a852d49d8bca3daae2652dd87b9a6ad7 100644
--- a/GUI/Models/Material/MaterialItem.cpp
+++ b/GUI/Models/Material/MaterialItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Models/Material/MaterialItem.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Models/Material/MaterialDataItems.h"
#include "GUI/Models/Group/GroupInfo.h"
+#include "GUI/Models/Material/MaterialDataItems.h"
#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
diff --git a/GUI/Models/Material/MaterialItemUtils.cpp b/GUI/Models/Material/MaterialItemUtils.cpp
index 8fb2359f717613a5be0ddedf17dada9857e119a7..732c4a90f018c896ab2b28c59ac905d542520489 100644
--- a/GUI/Models/Material/MaterialItemUtils.cpp
+++ b/GUI/Models/Material/MaterialItemUtils.cpp
@@ -13,15 +13,15 @@
// ************************************************************************************************
#include "GUI/Models/Material/MaterialItemUtils.h"
-#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
+#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Material/MaterialModelStore.h"
+#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Material/MaterialModel.h"
-#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/utils/Error.h"
#include "Sample/Material/Material.h"
diff --git a/GUI/Models/Parameter/FilterPropertyProxy.cpp b/GUI/Models/Parameter/FilterPropertyProxy.cpp
index 175fe7ee2d51ae79ffeb9c72ded0cceb6c16d54b..03407370b71e1b18ad38539c3fb792e69cec55c7 100644
--- a/GUI/Models/Parameter/FilterPropertyProxy.cpp
+++ b/GUI/Models/Parameter/FilterPropertyProxy.cpp
@@ -14,9 +14,9 @@
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/Models/Varia/PropertyItem.h"
int FilterPropertyProxy::columnCount(const QModelIndex& parent) const
{
diff --git a/GUI/Models/Parameter/ParameterTreeItems.cpp b/GUI/Models/Parameter/ParameterTreeItems.cpp
index b4a4ecfe38af07faa10d9646d34f473c92357b75..fa479fc471637ab02d9a15541d2b36eede0a53bb 100644
--- a/GUI/Models/Parameter/ParameterTreeItems.cpp
+++ b/GUI/Models/Parameter/ParameterTreeItems.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Job/FitParameterHelper.h"
+#include "GUI/Models/Varia/ModelPath.h"
// ----------------------------------------------------------------------------
diff --git a/GUI/Models/Parameter/ParameterTuningModel.cpp b/GUI/Models/Parameter/ParameterTuningModel.cpp
index 2e96a378388e15757c748e0c9fbdd8b17ffe45e2..a2d0cff6f6888db604c8a95d68c965b78eed31e8 100644
--- a/GUI/Models/Parameter/ParameterTuningModel.cpp
+++ b/GUI/Models/Parameter/ParameterTuningModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Parameter/ParameterTuningModel.h"
+#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Job/FitParameterHelper.h"
#include <QMimeData>
ParameterTuningModel::ParameterTuningModel(QObject* parent) : FilterPropertyProxy(2, parent) {}
diff --git a/GUI/Models/Project/LinkInstrumentManager.cpp b/GUI/Models/Project/LinkInstrumentManager.cpp
index 860ae449d95fdcbbb39017411c7b9c500ae8baf2..6342571db58d38e56b13f7c79716b2b0fded127a 100644
--- a/GUI/Models/Project/LinkInstrumentManager.cpp
+++ b/GUI/Models/Project/LinkInstrumentManager.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Project/LinkInstrumentManager.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Models/Project/OutputDataIOService.cpp b/GUI/Models/Project/OutputDataIOService.cpp
index 7e7d4d4715d55a0fac895c45e4bda615bd61e981..08b01592401b3c4d7efd8ecefe297761891d08a6 100644
--- a/GUI/Models/Project/OutputDataIOService.cpp
+++ b/GUI/Models/Project/OutputDataIOService.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Models/Project/OutputDataIOService.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/MessageService.h"
#include "GUI/utils/SaveLoadInterface.h"
#include <QFile>
diff --git a/GUI/Models/Sample/GUIDomainSampleVisitor.cpp b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
index 21d25bdd8d21c4de592b0a779b3dcc0ea7e9616f..2fc94b3c7364c312af5aa4da0aed7686384a62c4 100644
--- a/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
@@ -14,22 +14,22 @@
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "Base/Const/Units.h"
+#include "GUI/Models/Domain/TransformFromDomain.h"
+#include "GUI/Models/Material/MaterialItemUtils.h"
+#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/InterferenceItems.h"
#include "GUI/Models/Sample/LayerItem.h"
-#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Trafo/TransformationItem.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Domain/TransformFromDomain.h"
-#include "GUI/Models/Material/MaterialModel.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/utils/Error.h"
#include "Param/Node/NodeUtils.h"
#include "Sample/Aggregate/ParticleLayout.h"
diff --git a/GUI/Models/Sample/InterferenceItems.h b/GUI/Models/Sample/InterferenceItems.h
index c5f8ef4f92d90eb4a766ec70916177d989848369..108ee4d22cb9a929b476b20c84285c6e8ea62b5d 100644
--- a/GUI/Models/Sample/InterferenceItems.h
+++ b/GUI/Models/Sample/InterferenceItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_INTERFERENCEITEMS_H
#define BORNAGAIN_GUI_MODELS_SAMPLE_INTERFERENCEITEMS_H
-#include "GUI/Models/Session/SessionGraphicsItem.h"
#include "GUI/Models/Group/SelectionDescriptor.h"
+#include "GUI/Models/Session/SessionGraphicsItem.h"
class FTDecayFunction1DItem;
class FTDecayFunction2DItem;
diff --git a/GUI/Models/Sample/ItemWithParticles.cpp b/GUI/Models/Sample/ItemWithParticles.cpp
index ae24919a5722ed27ed6d2b5ad05d69776166038a..80fe66e37c3f5b14c3a732b2366122205a39ae56 100644
--- a/GUI/Models/Sample/ItemWithParticles.cpp
+++ b/GUI/Models/Sample/ItemWithParticles.cpp
@@ -14,12 +14,12 @@
#include "GUI/Models/Sample/ItemWithParticles.h"
#include "Base/Vector/Transform3D.h"
-#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
DoubleDescriptor ItemWithParticles::abundance() const
{
diff --git a/GUI/Models/Sample/ItemWithParticles.h b/GUI/Models/Sample/ItemWithParticles.h
index 7a6e1ba38a85df7c68014f5057e8c9b13d1eadcc..46c4f95cf45ea880f42b45968786238110c8c89b 100644
--- a/GUI/Models/Sample/ItemWithParticles.h
+++ b/GUI/Models/Sample/ItemWithParticles.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHPARTICLES_H
#include "Base/Vector/Vectors3D.h"
-#include "GUI/Models/Session/SessionGraphicsItem.h"
#include "GUI/Models/Group/SelectionDescriptor.h"
+#include "GUI/Models/Session/SessionGraphicsItem.h"
class RotationItem;
class TransformationItem;
diff --git a/GUI/Models/Sample/LayerItem.cpp b/GUI/Models/Sample/LayerItem.cpp
index 343eded90ac57f3c42799f113db6c58f14934960..5c0838720428038a89bd43d4fcc473b3a95b2464 100644
--- a/GUI/Models/Sample/LayerItem.cpp
+++ b/GUI/Models/Sample/LayerItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Models/Sample/LayerItem.h"
-#include "GUI/Models/Sample/LayerRoughnessItems.h"
+#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
+#include "GUI/Models/Sample/LayerRoughnessItems.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/UIntDescriptor.h"
diff --git a/GUI/Models/Sample/LayerItem.h b/GUI/Models/Sample/LayerItem.h
index ef2a966b4ca8dbd9efb9d043adbe6430db99783b..6f5b9f5f2f883ea75a9b88e2b182940bbdda1d10 100644
--- a/GUI/Models/Sample/LayerItem.h
+++ b/GUI/Models/Sample/LayerItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
#define BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
-#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Models/Group/SelectionDescriptor.h"
+#include "GUI/Models/Varia/ItemWithMaterial.h"
#include <variant>
class LayerZeroRoughnessItem;
diff --git a/GUI/Models/Sample/MesoCrystalItem.cpp b/GUI/Models/Sample/MesoCrystalItem.cpp
index 3dc87a4d5fbb1fd1752637c1cc1ce7bd25b6e084..d00879d9f70712ac8367d1bce43fd08ebd8b3263 100644
--- a/GUI/Models/Sample/MesoCrystalItem.cpp
+++ b/GUI/Models/Sample/MesoCrystalItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Models/Sample/MesoCrystalItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/utils/Error.h"
#include "Sample/Particle/Crystal.h"
diff --git a/GUI/Models/Sample/ParticleCompositionItem.cpp b/GUI/Models/Sample/ParticleCompositionItem.cpp
index 58dda136f4ac14a781d6fd611b60652e539af1fa..4ef46b32bc4cc3c85f08931ee8313fe1b7d1942f 100644
--- a/GUI/Models/Sample/ParticleCompositionItem.cpp
+++ b/GUI/Models/Sample/ParticleCompositionItem.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Models/Sample/ParticleCompositionItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Models/Sample/ParticleCoreShellItem.cpp b/GUI/Models/Sample/ParticleCoreShellItem.cpp
index e261f70d0faefebaf7ea9deef134494bab027263..ee17bef8a98213d0c54caa5cf3325da6faf3882a 100644
--- a/GUI/Models/Sample/ParticleCoreShellItem.cpp
+++ b/GUI/Models/Sample/ParticleCoreShellItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Models/Sample/ParticleItem.cpp b/GUI/Models/Sample/ParticleItem.cpp
index 4b91a11be63ee320f78bf11762532f069afc2fa0..f3cf3b7310ade9e494083194de023222b202a3d1 100644
--- a/GUI/Models/Sample/ParticleItem.cpp
+++ b/GUI/Models/Sample/ParticleItem.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Models/Sample/ParticleItem.h"
-#include "GUI/Models/Sample/FormFactorItems.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
+#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/IFormFactor.h"
diff --git a/GUI/Models/Sample/ParticleItem.h b/GUI/Models/Sample/ParticleItem.h
index 53909dc6c1bdd4312865b65858a72439c45d7f36..6585bdc43650b7430abe6309a925c0371fdb0c3a 100644
--- a/GUI/Models/Sample/ParticleItem.h
+++ b/GUI/Models/Sample/ParticleItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
-#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Models/Sample/ItemWithParticles.h"
+#include "GUI/Models/Varia/ItemWithMaterial.h"
class FormFactorItem;
class GroupItem;
diff --git a/GUI/Models/Sample/ParticleLayoutItem.cpp b/GUI/Models/Sample/ParticleLayoutItem.cpp
index ae16749b13a646926d8b659592bfe8a8630e41ad..7721b838fc0060366aadaf307ac2cf9ec0371de0 100644
--- a/GUI/Models/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Models/Sample/ParticleLayoutItem.cpp
@@ -14,7 +14,6 @@
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Sample/InterferenceItems.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
#include "GUI/Models/Sample/Lattice2DItems.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
@@ -22,6 +21,7 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Varia/ItemCatalog.h"
namespace {
diff --git a/GUI/Models/Sample/ParticleLayoutItem.h b/GUI/Models/Sample/ParticleLayoutItem.h
index 50e608e0424fb9d47a9d1d46f5bd541446062a49..9d95efe05e0be9740615c6f6e884a4da180ab798 100644
--- a/GUI/Models/Sample/ParticleLayoutItem.h
+++ b/GUI/Models/Sample/ParticleLayoutItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLELAYOUTITEM_H
+#include "GUI/Models/Group/SelectionDescriptor.h"
#include "GUI/Models/Session/SessionGraphicsItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Group/SelectionDescriptor.h"
class InterferenceItem;
class ItemWithParticles;
diff --git a/GUI/Models/Sample/SampleListModel.cpp b/GUI/Models/Sample/SampleListModel.cpp
index dcf30b46eab01d9fe28410cabd101e537ee0f184..8084e16b9b5e99b3dafe06ac9758acc2c5531f18 100644
--- a/GUI/Models/Sample/SampleListModel.cpp
+++ b/GUI/Models/Sample/SampleListModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Sample/SampleListModel.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include <QFontMetrics>
#include <QIcon>
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index 97f8e1c9ceb85b241baf12bc3a5d28dc7e08b953..69019163d4b27738ff643b74e1dbbcdb03e78b06 100644
--- a/GUI/Models/Sample/SampleModel.cpp
+++ b/GUI/Models/Sample/SampleModel.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
+#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Models/Varia/PropertyItem.h"
-#include "GUI/Mapper/ModelUtils.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index a76daba0b38396a7474579a08c95560d50640eec..126ac2defed57ff0645e654a155cd44bf81d6f87 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Varia/ItemFactory.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Session/SessionItemData.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Varia/PropertyItem.h"
//! Constructs new item with given model type. The type must be defined.
SessionItem::SessionItem(const QString& modelType)
diff --git a/GUI/Models/Session/SessionItemUtils.cpp b/GUI/Models/Session/SessionItemUtils.cpp
index df04c4a17ae20e26f3bc2d55284da3f3b4ef705e..80133b522f21fd3490371aa35f1b329bceaabeac 100644
--- a/GUI/Models/Session/SessionItemUtils.cpp
+++ b/GUI/Models/Session/SessionItemUtils.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Session/SessionGraphicsItem.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include <QColor>
#include <QIcon>
#include <QPixmap>
diff --git a/GUI/Models/Session/SessionModel.cpp b/GUI/Models/Session/SessionModel.cpp
index cf44248e491d0a25e7061a9c9d132406634ce781..77d3c170c63abf6e26150a3ea6f2cd53ca091ee9 100644
--- a/GUI/Models/Session/SessionModel.cpp
+++ b/GUI/Models/Session/SessionModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ItemFactory.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
+#include "GUI/Models/Varia/ItemFactory.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <QFile>
diff --git a/GUI/Models/Session/SessionXML.cpp b/GUI/Models/Session/SessionXML.cpp
index 711fa9abdd0d2b93fe6a363716dff364571bdfa8..53f9c9b2296a598950c2ff36ff8caf97aae02204 100644
--- a/GUI/Models/Session/SessionXML.cpp
+++ b/GUI/Models/Session/SessionXML.cpp
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/utils/DeserializationException.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/MessageService.h"
diff --git a/GUI/Models/Trafo/TransformationItem.cpp b/GUI/Models/Trafo/TransformationItem.cpp
index a8dddc1eab51527571dccf40d0ee0983f41882f4..55ec5f9d5d535d40de2b2932ad3083db316ac139 100644
--- a/GUI/Models/Trafo/TransformationItem.cpp
+++ b/GUI/Models/Trafo/TransformationItem.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Group/GroupInfo.h"
+#include "GUI/Models/Trafo/RotationItems.h"
TransformationItem::TransformationItem() : SessionGraphicsItem(M_TYPE)
{
diff --git a/GUI/Models/Types/DoubleDescriptor.cpp b/GUI/Models/Types/DoubleDescriptor.cpp
index e9bf254af48c100ef10c3c8d750830ea4ac2aaf7..086534b77c942b6b96317252de043ad0ab8c737f 100644
--- a/GUI/Models/Types/DoubleDescriptor.cpp
+++ b/GUI/Models/Types/DoubleDescriptor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Session/SessionItem.h"
+#include "GUI/Models/Varia/ModelPath.h"
DoubleDescriptor::DoubleDescriptor(const QString& label, SessionItem* item,
const variant<QString, Unit>& unit)
diff --git a/GUI/Models/Types/VectorDescriptor.h b/GUI/Models/Types/VectorDescriptor.h
index 82cc6eff1a37691f970ad41faf9e700613f41d45..a6ef2021012407a7920347de688cd05cae66dc38 100644
--- a/GUI/Models/Types/VectorDescriptor.h
+++ b/GUI/Models/Types/VectorDescriptor.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_TYPES_VECTORDESCRIPTOR_H
#define BORNAGAIN_GUI_MODELS_TYPES_VECTORDESCRIPTOR_H
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
//! Describes properties of a 3D vector, consisting of three double values.
//!
diff --git a/GUI/Models/Varia/DistributionItems.cpp b/GUI/Models/Varia/DistributionItems.cpp
index 4d5af7e3b3043c22709a58dc5f1fc117a284cad7..056e4ecaf194365065e5d36fd5f5dcfd63abff8c 100644
--- a/GUI/Models/Varia/DistributionItems.cpp
+++ b/GUI/Models/Varia/DistributionItems.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/RealLimitsItems.h"
#include "GUI/Models/Group/GroupInfo.h"
+#include "GUI/Models/Varia/RealLimitsItems.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include <cmath>
diff --git a/GUI/Models/Varia/ItemCatalog.cpp b/GUI/Models/Varia/ItemCatalog.cpp
index 0f238ff125aeb9d449bcae9edc900622793cb68a..d6f3ab00078185a05b03d25dd3d862935da03808 100644
--- a/GUI/Models/Varia/ItemCatalog.cpp
+++ b/GUI/Models/Varia/ItemCatalog.cpp
@@ -14,52 +14,52 @@
#include "GUI/Models/Varia/ItemCatalog.h"
#include "Base/Utils/Assert.h"
+#include "GUI/Models/Data/Data1DViewItem.h"
+#include "GUI/Models/Data/DataProperties.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Data/SpecularDataItem.h"
+#include "GUI/Models/Fit/FitParameterItems.h"
+#include "GUI/Models/Fit/FitSuiteItem.h"
+#include "GUI/Models/Fit/MinimizerItem.h"
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/BackgroundItems.h"
#include "GUI/Models/Instrument/BeamAngleItems.h"
#include "GUI/Models/Instrument/BeamWavelengthItem.h"
-#include "GUI/Models/Data/Data1DViewItem.h"
+#include "GUI/Models/Instrument/FootprintItems.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Instrument/RectangularDetectorItem.h"
+#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
+#include "GUI/Models/Instrument/SphericalDetectorItem.h"
+#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Material/MaterialDataItems.h"
+#include "GUI/Models/Material/MaterialItem.h"
+#include "GUI/Models/Material/MaterialItemContainer.h"
+#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Sample/FTDecayFunctionItems.h"
#include "GUI/Models/Sample/FTDistributionItems.h"
-#include "GUI/Models/Fit/FitParameterItems.h"
-#include "GUI/Models/Fit/FitSuiteItem.h"
-#include "GUI/Models/Instrument/FootprintItems.h"
#include "GUI/Models/Sample/FormFactorItems.h"
-#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Sample/InterferenceItems.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Sample/Lattice2DItems.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/LayerRoughnessItems.h"
-#include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Material/MaterialDataItems.h"
-#include "GUI/Models/Material/MaterialItem.h"
-#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
-#include "GUI/Models/Fit/MinimizerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Data/PointwiseAxisItem.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
-#include "GUI/Models/Varia/PropertyItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Varia/RealLimitsItems.h"
-#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
+#include "GUI/Models/Trafo/ProjectionItems.h"
#include "GUI/Models/Trafo/RotationItems.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
-#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
-#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Instrument/SphericalDetectorItem.h"
#include "GUI/Models/Trafo/TransformationItem.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Data/DataProperties.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Varia/RealLimitsItems.h"
+#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/utils/Error.h"
ItemCatalog::ItemCatalog()
diff --git a/GUI/Models/Varia/ItemFactory.cpp b/GUI/Models/Varia/ItemFactory.cpp
index 0068e47168eb89c4dc8b82b44b0d0ee66a307228..947d47da6f9dd2745f3576f441e1e808e54037df 100644
--- a/GUI/Models/Varia/ItemFactory.cpp
+++ b/GUI/Models/Varia/ItemFactory.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Varia/ItemFactory.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
#include "GUI/Models/Session/SessionItem.h"
+#include "GUI/Models/Varia/ItemCatalog.h"
SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
{
diff --git a/GUI/Models/Varia/ItemFileNameUtils.cpp b/GUI/Models/Varia/ItemFileNameUtils.cpp
index 9e4a0becb7433d1fb03eb87e72c4e32733b64cce..64578d3a91acc9d9f31af6c338168fb9ede6a7db 100644
--- a/GUI/Models/Varia/ItemFileNameUtils.cpp
+++ b/GUI/Models/Varia/ItemFileNameUtils.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Varia/ItemFileNameUtils.h"
+#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/utils/Helpers.h"
namespace {
diff --git a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
index e180c97aed4cedd64484c1162eed9e95f96eaecb..a8f102406213c3968d5510c61677e5b2ceacf094 100644
--- a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -19,12 +19,12 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Models/Data/DataItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include "GUI/Models/Fit/FitParameterItems.h"
#include "GUI/Models/Fit/FitSuiteItem.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Fit/MinimizerItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Domain/DomainSimulationBuilder.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index bbf904d90465e39df4413e04568da50f4cbd98f7..50d1e0072b8de8fe0c77fe16bf4c50c900251d93 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -14,13 +14,13 @@
#include "GUI/Views/FitWidgets/FitParameterWidget.h"
#include "GUI/Models/Fit/FitParameterItems.h"
-#include "GUI/Models/Fit/FitSuiteItem.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Fit/FitParameterProxyModel.h"
+#include "GUI/Models/Fit/FitSuiteItem.h"
#include "GUI/Models/Job/FitParameterHelper.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
+#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widgets/Info/OverlayLabelController.h"
diff --git a/GUI/Views/FitWidgets/FitSessionController.cpp b/GUI/Views/FitWidgets/FitSessionController.cpp
index afab561ebaee4fe9ea99a8e0cee453da9d94f772..6f5bf057f4e43c10ad92689374b12c57633d2a47 100644
--- a/GUI/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/Views/FitWidgets/FitSessionController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/FitSessionController.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Fit/FitParameterItems.h"
#include "GUI/Models/Fit/FitSuiteItem.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/FitWidgets/FitLog.h"
#include "GUI/Views/FitWidgets/FitObjectiveBuilder.h"
diff --git a/GUI/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 7f7fe6bb508be247491f70f9818053fdc125e896..728dcfa636a88951217d3a8a465e16eee7945cd7 100644
--- a/GUI/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Models/Fit/FitSuiteItem.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Fit/MinimizerItem.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index 512083dc3ebcacc6c97ed229d0768eed58c8314a..63f78fa2babd1622b44a503616eb2cfaafb1f775 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Parameter/ParameterTuningModel.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Parameter/ParameterTuningModel.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index df74e257dd0c6f34f827d87c1433b610c728d317..2bd00cd728fc461284ae9cd78c1915545706ecb2 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Parameter/ParameterTuningModel.h"
#include "GUI/Views/FitWidgets/JobRealTimeToolBar.h"
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
diff --git a/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
index 6cce451167e6d92720236f0f0bef97f3fc19978f..83f76d219c2d68b705df9c582c6b155df9f196b0 100644
--- a/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
+++ b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "Device/Data/OutputData.h"
#include "Device/InputOutput/DataFormatUtils.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Views/Loaders/QREDataLoader.h"
#include "GUI/utils/OutputDataUtils.h"
#include <QApplication>
diff --git a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
index e95754927aed84e1db8dcf58513cbe22fcd305b9..08a7149c7828ab9aa976fe281f267de77ee7f656 100644
--- a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/ImportDataWidgets/RealDataMaskWidget.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Instrument/MaskItems.h"
#include "GUI/Views/MaskWidgets/MaskEditor.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index 036661b5245fa661768968e3073e56a4aa64f00d..e56f527cd83ca676bfdd58dd5a73fb65a4a5dc4b 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Project/LinkInstrumentManager.h"
#include "GUI/Models/Project/ProjectDocument.h"
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 0de388df6b911b0c6760d0175903fd48b0ef1a81..c5cb5630d5eb8511ff819f72694520825741c04d 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -15,9 +15,9 @@
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/DataLoaders1D.h"
+#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
diff --git a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
index c8c7d22d079790b4a30d7c64ac240811c45e7a82..81eefd75c5c52b18749f258734881919af3c1e3a 100644
--- a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.h"
-#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Views/InstrumentWidgets/VectorEditor.h"
#include <QComboBox>
diff --git a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
index 18db32c9cdf92d77d61ae5d6c882144b8d769e87..222eafca6ec81678587cca2fddee0c09ff943991 100644
--- a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Varia/DistributionItems.h"
#include "GUI/Models/Varia/ItemWithDistribution.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
#include "GUI/Views/InstrumentWidgets/EditDistributionDialog.h"
#include "GUI/Views/PropertyEditor/GroupInfoBox.h"
diff --git a/GUI/Views/InstrumentWidgets/InclinationAnglesEditor.cpp b/GUI/Views/InstrumentWidgets/InclinationAnglesEditor.cpp
index fc49e5a11f3a2227aed803ade8aa1fe11312967a..9ac3968a3d88f13ccd49066118e05b04f8ee0321 100644
--- a/GUI/Views/InstrumentWidgets/InclinationAnglesEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InclinationAnglesEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/InclinationAnglesEditor.h"
-#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Data/PointwiseAxisItem.h"
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Views/InstrumentWidgets/SphericalAxisEditor.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index 3992bfe6b91407286146edbd461f5dc09415ed98..ca6030bcb55f6effa1d8ea33eb5a7e4e4aa77a6e 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/PlotConstants.h"
+#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
namespace {
diff --git a/GUI/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
index 665f3f6992e3c30041af3f12d42f3ad67c4a931e..b10d68971f8339c0b4b24855a037032027e63b9f 100644
--- a/GUI/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
@@ -19,8 +19,8 @@
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/PlotConstants.h"
+#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
namespace {
diff --git a/GUI/Views/JobWidgets/FitComparisonController.cpp b/GUI/Views/JobWidgets/FitComparisonController.cpp
index d9344b10ebd446f5cf0633dd93a41b51b9dd4725..2123946cc1855a72880f589a8513a312d8e5f7da 100644
--- a/GUI/Views/JobWidgets/FitComparisonController.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonController.cpp
@@ -16,10 +16,10 @@
#include "Device/Data/DataUtils.h"
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Data/SpecularDataItem.h"
+#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/IntensityDataWidgets/PropertyRepeater.h"
namespace {
diff --git a/GUI/Views/JobWidgets/FitComparisonViewController.cpp b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
index bb6fb7e4e9a53344818b0585b925229b9a68f1a3..305e61765bd1ea2801d3833197e576515be17615 100644
--- a/GUI/Views/JobWidgets/FitComparisonViewController.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
@@ -17,12 +17,12 @@
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Data/Data1DViewItem.h"
#include "GUI/Models/Data/DataItem.h"
-#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/IntensityDataWidgets/PropertyRepeater.h"
namespace {
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget.cpp b/GUI/Views/JobWidgets/FitComparisonWidget.cpp
index e4c33b7aed515749df11021b99f8a66d8e8c7a9b..c90e510557f7045b846bf9e6d91361404b805100 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/FitComparisonWidget.h"
-#include "GUI/Models/Fit/FitSuiteItem.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Data/RealDataItem.h"
+#include "GUI/Models/Fit/FitSuiteItem.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
diff --git a/GUI/Views/JobWidgets/FitComparisonWidget1D.cpp b/GUI/Views/JobWidgets/FitComparisonWidget1D.cpp
index b3b6578ef69f54e33cdd7190e12950f3ad3dd73a..e087f7b94b587710f91e0f5c05a3c27f35118dc4 100644
--- a/GUI/Views/JobWidgets/FitComparisonWidget1D.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonWidget1D.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/JobWidgets/FitComparisonWidget1D.h"
#include "GUI/Models/Data/Data1DViewItem.h"
+#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Fit/FitSuiteItem.h"
#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
#include "GUI/Views/IntensityDataWidgets/Plot1D.h"
diff --git a/GUI/Views/Loaders/AutomaticDataLoader1D.cpp b/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
index 926b5367d84de99beb8aa222faa5cd5785118bb5..176f13f49a44f73d0a739bfc81dd9be7e8082eaa 100644
--- a/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/Loaders/AutomaticDataLoader1D.h"
#include "Device/InputOutput/OutputDataReadReflectometry.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Views/Loaders/AutomaticDataLoader1DResultModel.h"
#include "GUI/utils/DeserializationException.h"
diff --git a/GUI/Views/Loaders/QREDataLoader.cpp b/GUI/Views/Loaders/QREDataLoader.cpp
index 0cf5272d31fa8472e269a725eb54c21b54a8c562..fe5bce97244e71e60a2f9982f6e14bcf88a972f4 100644
--- a/GUI/Views/Loaders/QREDataLoader.cpp
+++ b/GUI/Views/Loaders/QREDataLoader.cpp
@@ -15,9 +15,9 @@
#include "GUI/Views/Loaders/QREDataLoader.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Coord/AxisNames.h"
-#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Views/Loaders/QREDataLoaderProperties.h"
#include "GUI/Views/Loaders/QREDataLoaderResultModel.h"
#include "GUI/utils/DeserializationException.h"
diff --git a/GUI/Views/Main/ActionManager.cpp b/GUI/Views/Main/ActionManager.cpp
index 86ee0a09047878f3595fde9ff7553293619c73b9..31aa4879605ef693dd6aa0b5c92a49fd66d029cd 100644
--- a/GUI/Views/Main/ActionManager.cpp
+++ b/GUI/Views/Main/ActionManager.cpp
@@ -18,10 +18,10 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/JobWidgets/JobView.h"
-#include "GUI/Views/Main/PyImportAssistant.h"
#include "GUI/Views/Main/AboutDialog.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/Main/ProjectManager.h"
+#include "GUI/Views/Main/PyImportAssistant.h"
#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/Main/AutosaveController.cpp b/GUI/Views/Main/AutosaveController.cpp
index 44905dad2ab423affab9bf75547288baaad8032f..d40965705c119e1d90f1ce7650bd598048b8d973 100644
--- a/GUI/Views/Main/AutosaveController.cpp
+++ b/GUI/Views/Main/AutosaveController.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/Main/AutosaveController.h"
-#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
#include <QDir>
diff --git a/GUI/Views/Main/ProjectManager.cpp b/GUI/Views/Main/ProjectManager.cpp
index d4fcf56be2428db6499287a43574b6d4482e130a..2f7287cf33d6340325fe357937ef27feb59e314a 100644
--- a/GUI/Views/Main/ProjectManager.cpp
+++ b/GUI/Views/Main/ProjectManager.cpp
@@ -16,12 +16,12 @@
#include "Base/Utils/Assert.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Session/SessionData.h"
-#include "GUI/Views/Main/SaveService.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/Main/NewProjectDialog.h"
+#include "GUI/Views/Main/SaveService.h"
#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/GUIHelpers.h"
diff --git a/GUI/Views/Main/SaveService.cpp b/GUI/Views/Main/SaveService.cpp
index 20997c70e1d22d366a0a5675c7a065aa7949c290..dbc3e6d9cf7b10dca616bf5f31a64a6a67f2b6f8 100644
--- a/GUI/Views/Main/SaveService.cpp
+++ b/GUI/Views/Main/SaveService.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/Main/SaveService.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Views/Main/AutosaveController.h"
#include "GUI/Views/Main/SaveThread.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index 4efb7015bcd65194736dccbf6021b885dad83ac5..d840f6e51bcb3027bfa016460836548b3b527140 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -15,9 +15,9 @@
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Trafo/ProjectionItems.h"
#include "GUI/Models/Varia/PropertyItem.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsProxy.h"
#include "GUI/Views/MaskWidgets/MaskViewFactory.h"
diff --git a/GUI/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
index 651837eea0b9a83a123f52bb48bf77e17fb55f01..387f4419ee00be1e045119946922004101434264 100644
--- a/GUI/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/MaskWidgets/MaskViewFactory.h"
#include "GUI/Models/Instrument/MaskItems.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
#include "GUI/Models/Session/SessionItem.h"
+#include "GUI/Models/Trafo/ProjectionItems.h"
#include "GUI/Views/MaskWidgets/EllipseView.h"
#include "GUI/Views/MaskWidgets/LineViews.h"
#include "GUI/Views/MaskWidgets/MaskAllView.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index f1bc633a2c63e70517295fc415875b8d0bf7aa60..54445d9eac0dffa798a1b1ecad10dc3c5d2334bb 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,13 +14,13 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
#include "GUI/Widgets/Common/StyleUtils.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorModel.cpp b/GUI/Views/MaterialEditor/MaterialEditorModel.cpp
index 81f6dfec80d4c82c55b7a7870aaeac5c5e164d42..3f23b0d5e0f58cee460a750fd83274a5a8174289 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorModel.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorModel.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
#include "GUI/Models/Material/MaterialItem.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Types/VectorItem.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
index d81ecae02e88ff4bb8452ef83ad4d7e879d48eb8..5b86ea290e5ff97146d65915ec08590cb7a48a9d 100644
--- a/GUI/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentFlatView.h"
+#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/Views/PropertyEditor/PropertyWidgetItem.h"
#include "GUI/utils/LayoutUtils.h"
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index d8ba9cc2a56b8eb37a8f178895b138799543de8e..7519f46fd0a73fbc18704999d7f0915fa86a5c01 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widgets/Common/StyleUtils.h"
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index 04da235646e0eb9a357e4e50d18b8ee88cd888a8..a6f7a715c3b31eca06da1f5bd3dc50f6a43cd9e0 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index 4d4958785e456935544d0573dd7880e9fcfb6aeb..413a681441a2fe6582217193e9186693d5ad3098 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Session/SessionFlags.h"
#include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QLabel>
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index d93af99a7d0f2572672dab02664760aa8c390db2..e49fcbe01a3b465299428aa7124e76bd8f733227 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/TestComponentView.h"
-#include "GUI/Models/Instrument/BeamItems.h"
-#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Sample/ParticleItem.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
+#include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Instrument/BeamItems.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widgets/Common/StyleUtils.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index 6eb25531d0d1170b35b4bf1623acc40c165dc16b..c16f15eac0f4610144f9a778a96b926e83014e3e 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -15,13 +15,13 @@
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "Base/Const/Units.h"
#include "GUI/Models/Material/MaterialItem.h"
+#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Material/MaterialModel.h"
-#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index b78c840b7092312362ac9bd9fb9da807452652c7..0ef281cdc2a92b4d5f48a374931e54f2bd2054dd 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 8842a914283dd5088c6be01b83561210a743eb5d..62f946409c401bc51fed6019d4ae13043a0ac8bc 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -13,18 +13,18 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerScene.h"
+#include "GUI/Models/Parameter/FilterPropertyProxy.h"
+#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/InterferenceItems.h"
-#include "GUI/Models/Varia/ItemFactory.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Trafo/RotationItems.h"
-#include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Project/ProjectDocument.h"
-#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Trafo/RotationItems.h"
+#include "GUI/Models/Varia/ItemFactory.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index 6100a82bc2e498dd7a2704112fdda9f52d26d815..e8e854243767ada55a957d40f59eaa43c5bf2aa5 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Edit/DoubleLineEdit.h"
#include "GUI/Views/Edit/DoubleSpinBox.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index 0fa28752edf332b977ea92a3ff5fa5501ac5f693..1b9dd18f033646164817204a6c35a792621dc923 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
-#include "GUI/Models/Session/SessionGraphicsItem.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Session/SessionGraphicsItem.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index d625b7151799ca8d13b1c4f4adc912f75aef5dcd..655ef1fd581e897b26863622abb9a4600018108e 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleView.h"
-#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index 8ccb32c2535587477b4dd290c7892a041676918b..3869b7a69bea75af330b0884a1b601fc9496cb66 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SampleDesigner/SampleListView.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleListModel.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index 67b80624a81c06bffb43e599c1b2622847a6a293..e270578ec54826eb58fc7d11644ebe6d0cbb29d5 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleToolBox.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Sample/GUIExamplesFactory.h"
+#include "GUI/Models/Varia/ItemCatalog.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h"
#include <QApplication>
diff --git a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
index 8b3c634401e805b2a3c27570133eea2a50085839..7384ab6f16d0094065fa87e4f1ca97a850d42b8d 100644
--- a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Varia/ItemCatalog.h"
#include "GUI/Views/SampleDesigner/ItemTreeView.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
index 48d0e026382caa26bb64e5638a5e7b2d63d06294..a391073e2ca3734b0747c8f318f8d55e44fefcd2 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/Views/SampleDesigner/ScriptPanel.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "Core/Export/ExportToPython.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Domain/DomainObjectBuilder.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
index 195d6ac784f763294a616edd916e4732333beb1d..a9fa1c6bf12539ffafd759f135b966cf93e34fe5 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h"
+#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
#include "GUI/Models/Data/DataItemUtils.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
-#include "GUI/Models/Data/DataLoaders1D.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/Views/Main/MainWindow.h"
#include "ui_SpecularDataImportWidget.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
index 85fb072b15063c03bc3e485b696a135b5184e3af..840f952814bd9b9870d6fb91a6a71726e5c552c4 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Data/AxesItems.h"
#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/PlotConstants.h"
+#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
namespace {
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index 2c52588da391a487c174ab58b0b69ef1138e9e52..be820a1cbcd2ed86509f296996a122ecaead3d1a 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 60b7a783ce214d25a50b58c1560d194c1183f253..f1907fe83762354624062f69996a2c998cc86895 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -13,20 +13,20 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SimulationView.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DocumentModel.h"
+#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Sample/SampleValidator.h"
+#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/Main/ProjectManager.h"
diff --git a/GUI/Views/Toplevel/TestView.cpp b/GUI/Views/Toplevel/TestView.cpp
index 6d24a8128a7f84baecd85dec23af40489b17865f..3b71547e0fb9c52ee863ad76b81443b469a15500 100644
--- a/GUI/Views/Toplevel/TestView.cpp
+++ b/GUI/Views/Toplevel/TestView.cpp
@@ -14,11 +14,11 @@
#include "GUI/Views/Toplevel/TestView.h"
#include "GUI/Models/Data/Data1DViewItem.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Fit/MinimizerItem.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/Models/Fit/MinimizerItem.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/PropertyEditor/TestComponentView.h"
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 80caeddd42298641910ecbed682b8d1cba4585a8..d17cfb0d7ebb26642efeae0dade379263142b4bf 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -19,10 +19,10 @@
#include "Device/Data/DataUtils.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Histo/SimulationResult.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Models/Domain/DomainSimulationBuilder.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 5ee4ffebfe5f19d2f49ff7825d148be76f2f9f85..8d93a972e749a4c15a80787788a1bc6cf05c7f59 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -2,8 +2,8 @@
#include "Base/Axis/VariableBinAxis.h"
#include "Base/Const/Units.h"
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index 2bfc224db12d1b38ceea3708530e2c11f4b07ee8..7c31589ccc41ee41075301eed09fb82fdf41c536 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -1,15 +1,15 @@
-#include "GUI/Models/Sample/FormFactorItems.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ModelUtils.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Mapper/ComponentProxyModel.h"
-#include "GUI/Mapper/ComponentProxyStrategy.h"
-#include "GUI/Mapper/ModelUtils.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
index 95336eb9d022ae3eba6d78d164e63b9449e0da6b..2a60767bf071d2f7ec36e9f886cc7010883c32ce 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Models/Sample/FormFactorItems.h"
+#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Mapper/ComponentUtils.h"
#include "Tests/GTestWrapper/google_test.h"
class TestComponentUtils : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 9fd787dc885577a77dbebc004dbfbc8f88b4cc4c..548606f51cc973ab803e3282853d7f53c7e7b416 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Models/Data/DataItem.h"
-#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Data/DataItem.h"
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Data/SpecularDataItem.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/utils/Error.h"
diff --git a/Tests/Unit/GUI/TestDataItems.cpp b/Tests/Unit/GUI/TestDataItems.cpp
index d2fd756f796432e87b7efeebefd70b80f729961d..c03e11940561a90856c520fe1a745eef91d7a924 100644
--- a/Tests/Unit/GUI/TestDataItems.cpp
+++ b/Tests/Unit/GUI/TestDataItems.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Data/SpecularDataItem.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index eeae6358cce4556874eaeddc808e8824f7717240..01fffc4f4f7daf3cb7d6f4d87c076a211f78ac58 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -2,12 +2,12 @@
#include "Device/Detector/IDetector2D.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "Tests/GTestWrapper/google_test.h"
class TestDetectorItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestFitParameterModel.cpp b/Tests/Unit/GUI/TestFitParameterModel.cpp
index a33900eaec92a55eec3b9d790ee68273cdbf14fb..3f551ea3014092d063ae5e4e1745f74ddc4548a2 100644
--- a/Tests/Unit/GUI/TestFitParameterModel.cpp
+++ b/Tests/Unit/GUI/TestFitParameterModel.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/Fit/FitParameterItems.h"
-#include "GUI/Models/Fit/FitSuiteItem.h"
#include "GUI/Models/Fit/FitParameterProxyModel.h"
+#include "GUI/Models/Fit/FitSuiteItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index e34ef5612502724ab7af7887a096e787dcf09bdf..5dcd7aa34241d92609d2b7d919c39c1918b434f0 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Sample/FormFactorItems.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Varia/DistributionItems.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestLayerItems.cpp b/Tests/Unit/GUI/TestLayerItems.cpp
index 5242a9bf43bac4236deb055d938b67785b060245..f6780e050f9b200e0f14fcd65187e7052095979f 100644
--- a/Tests/Unit/GUI/TestLayerItems.cpp
+++ b/Tests/Unit/GUI/TestLayerItems.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Models/Sample/LayerItem.h"
-#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
index bb3117d17ab23b382083098d32d63509a9dc27c1..dd4af68ec0dbce136be6274a69aeb28caef818c4 100644
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
@@ -1,6 +1,6 @@
-#include "GUI/Models/Sample/LayerRoughnessItems.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Sample/LayerRoughnessItems.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index ed1cee26805196cedbdf2504251859cb3b6e13b8..9fc34db5aa9b5a2e5cd7ed1c182330b6570065da 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,10 +1,10 @@
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
-#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Instrument/RectangularDetectorItem.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Project/LinkInstrumentManager.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
index 9a751ea4df9eaec0df54405a839315eba0cee09a..701bdeefc244dd1cffa03d033978444e3fc80ca2 100644
--- a/Tests/Unit/GUI/TestMapperCases.cpp
+++ b/Tests/Unit/GUI/TestMapperCases.cpp
@@ -1,13 +1,13 @@
+#include "GUI/Models/Data/DocumentModel.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Varia/SimulationOptionsItem.h"
-#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/Unit/GUI/TestMapperForItem.cpp b/Tests/Unit/GUI/TestMapperForItem.cpp
index 15d242cd862a369a6f0a7a7d8b2abb11cc0728aa..074ad0c2b3b7417d710d7f779b6842c2e53973a0 100644
--- a/Tests/Unit/GUI/TestMapperForItem.cpp
+++ b/Tests/Unit/GUI/TestMapperForItem.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Instrument/MaskItems.h"
+#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Trafo/ProjectionItems.h"
-#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Session/SessionItemUtils.h"
+#include "GUI/Models/Trafo/ProjectionItems.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/Unit/GUI/TestModelUtils.cpp b/Tests/Unit/GUI/TestModelUtils.cpp
index 91fc7fb47e0e9e737c944b65cc432e5c63a23e2e..897d61e8021defb5827716cbea512b1494e87bc3 100644
--- a/Tests/Unit/GUI/TestModelUtils.cpp
+++ b/Tests/Unit/GUI/TestModelUtils.cpp
@@ -1,8 +1,8 @@
+#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QVector>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 7913d9267b9c63dcf74d0635f26bb606b478d6d2..414070e3fe19d6f74d66117bbac146de881283ac 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,14 +1,14 @@
#include "Device/Histo/IntensityDataIOFactory.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DataItem.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Job/JobItemUtils.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
diff --git a/Tests/Unit/GUI/TestParaCrystalItems.cpp b/Tests/Unit/GUI/TestParaCrystalItems.cpp
index 012ce90b46e578336dc16d5342c52118be1645cc..34748ba8b7e028d11a0fc048a9d65754c17e5553 100644
--- a/Tests/Unit/GUI/TestParaCrystalItems.cpp
+++ b/Tests/Unit/GUI/TestParaCrystalItems.cpp
@@ -1,11 +1,11 @@
#include "Base/Const/Units.h"
+#include "GUI/Models/Domain/TransformFromDomain.h"
#include "GUI/Models/Sample/FTDistributionItems.h"
#include "GUI/Models/Sample/InterferenceItems.h"
#include "GUI/Models/Sample/Lattice2DItems.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Domain/TransformFromDomain.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "Sample/Aggregate/Interference2DParaCrystal.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestParticleCoreShell.cpp b/Tests/Unit/GUI/TestParticleCoreShell.cpp
index b07aca831cd0e460f0983c8baaae3aeb62d975a0..d91aa3a54ddb140cbfc80c9c29d1759925c8efea 100644
--- a/Tests/Unit/GUI/TestParticleCoreShell.cpp
+++ b/Tests/Unit/GUI/TestParticleCoreShell.cpp
@@ -1,10 +1,10 @@
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
-#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/VectorItem.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/Unit/GUI/TestParticleItem.cpp b/Tests/Unit/GUI/TestParticleItem.cpp
index 7d49922045e4c31753697ca1b43591756c95857e..8d1cb2a753e70b471c81495061e3829472f7d764 100644
--- a/Tests/Unit/GUI/TestParticleItem.cpp
+++ b/Tests/Unit/GUI/TestParticleItem.cpp
@@ -1,8 +1,8 @@
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
-#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestParticleLayoutItem.h b/Tests/Unit/GUI/TestParticleLayoutItem.h
index 228ade1cfc5a6b7d3534b0ec027bbb0581c08abb..3c054612328fc8507b3290e96fd5fd8c921fd58b 100644
--- a/Tests/Unit/GUI/TestParticleLayoutItem.h
+++ b/Tests/Unit/GUI/TestParticleLayoutItem.h
@@ -5,8 +5,8 @@
#include "GUI/Models/Sample/InterferenceItems.h"
#include "GUI/Models/Sample/Lattice2DItems.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Session/SessionItemUtils.h"
#include "Tests/Unit/utilities/google_test.h"
class TestParticleLayoutItem : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index c9070de56d8b343736a70ec8004988356cf30fe0..e474186974019157ae3ddb8e24d00c6baf27c078 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,12 +1,12 @@
-#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Helpers.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 70733acc3538b5a61b8d59b9b9a42005346031e5..84fd4212e71f6f65e9d91e47d619ef75c27cf234 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index 13c3e1616eabea6e14de2c6517cfd9f8f6e0227c..bdb0772eb74bcff21e0084024a53f36b1f9bc4a8 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -1,12 +1,12 @@
-#include "GUI/Models/Sample/FormFactorItems.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Mapper/ComponentProxyModel.h"
-#include "GUI/Mapper/ComponentProxyStrategy.h"
-#include "GUI/Mapper/ModelUtils.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include "Tests/GTestWrapper/google_test.h"
class TestProxyModelStrategy : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
index 4e50b5b0d6b70c4eb94e20e7abf5db37fdcd0cf6..6edefe0ed72f8eb887b00bad449639bacfdfe315 100644
--- a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,7 +1,7 @@
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 5f12e92df2eaff7ab21db09be6c9495130e5d792..a196a85c381fafbf8ec5c0c07b5ce205fed57dfb 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,12 +1,12 @@
-#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Views/Main/AutosaveController.h"
#include "GUI/Views/Main/SaveService.h"
#include "GUI/utils/Error.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index ca27e0bd9228c44aa887eda70eb936d49e38c36d..d8f398a3b51dbf083591df586e7ca4b6ee1a0e50 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -1,19 +1,19 @@
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Histo/IntensityDataIOFactory.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DataItem.h"
-#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Data/IntensityDataItem.h"
-#include "GUI/Models/Varia/ItemFileNameUtils.h"
-#include "GUI/Models/Job/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Data/PointwiseAxisItem.h"
-#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
-#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Instrument/SpecularBeamInclinationItem.h"
+#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index d1f03f8ccee6d2dad239d0ddbc0720b2025cad8b..eb363d6f8a20496d78cad8738a3f4ad896dcf4a6 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,8 +1,8 @@
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemUtils : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index cebe1248b9e6a990c8b2923ca60663942e73516f..8b7d3295818897cdb7d56cf5732d6ab6c3448328 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,15 +1,15 @@
#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Instrument/MaskItems.h"
#include "GUI/Models/Job/JobItem.h"
+#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/LayerItem.h"
-#include "GUI/Models/Instrument/MaskItems.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Material/MaterialModel.h"
-#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
#include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index dd4c9d02bded91f2f2ba863a4ee457e2eda57bdc..c1696127ab918e87c3a9989d5516a5bf439e9653 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -2,8 +2,8 @@
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index d5a2c9425dce0bb70c203bdd72e7fd742df91489..e881923d9b4cca20b083d5cf5700d0d698e2a620 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -17,8 +17,8 @@
#include "Device/Data/DataUtils.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/utils/Error.h"
#include <QDir>
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 5095c4dd9ff6327d8651de51d214afa9a47e5c73..753270563c9c7e32b5c4fdfb710b7cc5e8f643dc 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/Models/Varia/PropertyItem.h"
#include "GUI/Models/Session/SessionXML.h"
+#include "GUI/Models/Varia/PropertyItem.h"
#include <QString>
#include <QXmlStreamWriter>