From 472c823242f5101777d26ee6c9acab8fc2772439 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 09:57:46 +0100
Subject: [PATCH] clang-format
---
App/main.cpp | 4 ++--
Device/Mask/Polygon.cpp | 3 +--
Fit/Tools/MultiOption.cpp | 8 ++++----
Fit/Tools/MultiOption.h | 2 +-
GUI/CommonWidgets/DesignerHelper.cpp | 2 +-
GUI/CommonWidgets/ItemStackWidget.cpp | 2 +-
GUI/CommonWidgets/ModelTreeView.cpp | 4 ++--
GUI/DataLoaders/AutomaticDataLoader1D.cpp | 2 +-
GUI/Items/Data1DViewItem.cpp | 4 ++--
GUI/Items/DataItem.h | 2 +-
GUI/Items/DetectorItems.cpp | 2 +-
GUI/Items/DistributionItems.cpp | 2 +-
GUI/Items/FTDecayFunctionItems.h | 2 +-
GUI/Items/FTDistributionItems.h | 2 +-
GUI/Items/FitParameterItems.cpp | 4 ++--
GUI/Items/FitSuiteItem.cpp | 2 +-
GUI/Items/FormFactorItems.h | 2 +-
GUI/Items/GroupItem.h | 2 +-
GUI/Items/GroupItemController.cpp | 2 +-
GUI/Items/InstrumentItems.cpp | 4 ++--
GUI/Items/IntensityDataItem.cpp | 6 +++---
GUI/Items/InterferenceItems.cpp | 4 ++--
GUI/Items/InterferenceItems.h | 2 +-
GUI/Items/ItemCatalog.cpp | 6 +++---
GUI/Items/ItemWithParticles.cpp | 2 +-
GUI/Items/ItemWithParticles.h | 2 +-
GUI/Items/JobItem.cpp | 2 +-
GUI/Items/JobItem.h | 2 +-
GUI/Items/JobModelFunctions.cpp | 4 ++--
GUI/Items/LayerItem.cpp | 4 ++--
GUI/Items/MaterialItem.cpp | 6 +++---
GUI/Items/MaterialItemUtils.cpp | 6 +++---
GUI/Items/MesoCrystalItem.cpp | 6 +++---
GUI/Items/MesoCrystalItem.h | 2 +-
GUI/Items/MinimizerItem.cpp | 2 +-
GUI/Items/MultiLayerItem.cpp | 4 ++--
GUI/Items/ParameterTreeItems.cpp | 2 +-
GUI/Items/ParticleCompositionItem.cpp | 4 ++--
GUI/Items/ParticleCoreShellItem.cpp | 6 +++---
GUI/Items/ParticleItem.cpp | 2 +-
GUI/Items/ParticleLayoutItem.cpp | 2 +-
GUI/Items/ParticleLayoutItem.h | 2 +-
GUI/Items/RealDataItem.cpp | 14 +++++++-------
GUI/Items/RealDataItem.h | 2 +-
GUI/Items/RectangularDetectorItem.cpp | 2 +-
GUI/Items/RectangularDetectorItem.h | 2 +-
GUI/Items/SessionModel.cpp | 2 +-
GUI/Items/SessionXML.cpp | 4 ++--
GUI/Items/SpecularDataItem.cpp | 4 ++--
GUI/Items/TransformationItem.cpp | 2 +-
GUI/Mapper/ComponentProxyModel.cpp | 2 +-
GUI/Mapper/ComponentProxyStrategy.cpp | 4 ++--
GUI/Mapper/ProxyModelStrategy.cpp | 2 +-
GUI/Models/Data/ApplicationModels.cpp | 6 +++---
GUI/Models/Data/DataProperties.cpp | 4 ++--
GUI/Models/Data/GUIObjectBuilder.cpp | 6 +++---
GUI/Models/Data/ImportDataInfo.cpp | 2 +-
GUI/Models/Domain/DomainObjectBuilder.cpp | 2 +-
GUI/Models/Domain/DomainSimulationBuilder.cpp | 4 ++--
GUI/Models/Domain/TransformFromDomain.cpp | 6 +++---
GUI/Models/Domain/TransformToDomain.cpp | 4 ++--
GUI/Models/Fit/FitParameterProxyModel.cpp | 6 +++---
GUI/Models/Group/SelectionDescriptor.h | 2 +-
GUI/Models/Instrument/InstrumentLibrary.cpp | 2 +-
GUI/Models/Instrument/InstrumentModel.cpp | 2 +-
GUI/Models/Job/FitParameterHelper.cpp | 2 +-
GUI/Models/Job/JobModel.cpp | 4 ++--
GUI/Models/Job/JobQueueData.cpp | 4 ++--
GUI/Models/Job/JobWorker.h | 2 +-
GUI/Models/Job/ParameterTreeUtils.cpp | 2 +-
GUI/Models/Parameter/ParameterTuningModel.cpp | 2 +-
GUI/Models/Sample/GUIDomainSampleVisitor.cpp | 12 ++++++------
GUI/Models/Sample/SampleListModel.cpp | 8 ++++----
GUI/Models/Sample/SampleListModel.h | 3 +--
GUI/Models/Sample/SampleModel.cpp | 2 +-
GUI/Models/Types/VectorDescriptor.h | 2 +-
GUI/Project/projectdocument.cpp | 6 +++---
GUI/Project/projectmanager.cpp | 10 +++++-----
GUI/Views/FitWidgets/FitActivityPanel.cpp | 6 ++----
GUI/Views/FitWidgets/FitObjectiveBuilder.cpp | 4 ++--
GUI/Views/FitWidgets/FitParameterWidget.cpp | 12 ++++++------
GUI/Views/FitWidgets/FitSessionController.cpp | 2 +-
GUI/Views/FitWidgets/FitSessionManager.cpp | 5 ++---
GUI/Views/FitWidgets/FitWorkerLauncher.cpp | 5 +----
GUI/Views/FitWidgets/FitWorkerLauncher.h | 2 +-
GUI/Views/FitWidgets/ParameterTuningDelegate.cpp | 4 ++--
GUI/Views/FitWidgets/ParameterTuningWidget.cpp | 6 +++---
GUI/Views/FitWidgets/RunFitControlWidget.cpp | 4 ++--
.../ImportDataWidgets/RealDataPresenter.cpp | 2 +-
.../RealDataPropertiesWidget.cpp | 6 +++---
.../ImportDataWidgets/RealDataSelectorWidget.cpp | 14 +++++++-------
.../DepthProbeInstrumentEditor.cpp | 2 +-
.../InstrumentWidgets/DistributionForms.cpp | 2 +-
GUI/Views/InstrumentWidgets/DistributionPlot.cpp | 2 +-
.../InstrumentWidgets/GISASInstrumentEditor.cpp | 2 +-
.../InstrumentLibraryEditor.cpp | 2 +-
.../InstrumentWidgets/InstrumentListModel.cpp | 9 +++++----
.../InstrumentWidgets/InstrumentListView.cpp | 2 +-
GUI/Views/InstrumentWidgets/InstrumentView.cpp | 4 ++--
.../OffSpecularInstrumentEditor.cpp | 2 +-
.../PolarizationAnalysisEditor.cpp | 13 ++++++-------
.../SpecularInstrumentEditor.cpp | 2 +-
GUI/Views/IntensityDataWidgets/ColorMap.cpp | 2 +-
GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp | 4 ++--
.../IntensityDataWidgets/IntensityDataCanvas.cpp | 6 +++---
.../IntensityDataFFTPresenter.cpp | 2 +-
GUI/Views/IntensityDataWidgets/Plot1D.cpp | 2 +-
.../JobWidgets/FitComparisonViewController.cpp | 4 ++--
GUI/Views/JobWidgets/JobListView.cpp | 2 +-
GUI/Views/JobWidgets/JobMessagePanel.cpp | 4 ++--
GUI/Views/JobWidgets/JobPropertiesWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobSelectorWidget.cpp | 3 +--
GUI/Views/JobWidgets/JobView.cpp | 4 ++--
GUI/Views/MaskWidgets/MaskEditorCanvas.cpp | 2 +-
GUI/Views/MaskWidgets/MaskGraphicsScene.cpp | 2 +-
GUI/Views/MaskWidgets/MaskViewFactory.cpp | 2 +-
.../MaterialEditor/MaterialEditorDialog.cpp | 10 +++++-----
GUI/Views/MaterialEditor/MaterialEditorModel.cpp | 2 +-
.../SaveProjectionsAssistant.cpp | 2 +-
GUI/Views/PropertyEditor/ComponentFlatView.cpp | 2 +-
GUI/Views/PropertyEditor/ComponentTreeView.cpp | 4 ++--
GUI/Views/PropertyEditor/CustomEditors.cpp | 6 +++---
.../PropertyEditor/PropertyEditorFactory.cpp | 4 ++--
GUI/Views/PropertyEditor/TestComponentView.cpp | 10 +++++-----
GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp | 2 +-
.../RealSpaceWidgets/RealSpaceBuilderUtils.cpp | 6 +++---
GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp | 6 +++---
GUI/Views/SampleDesigner/ConnectableView.cpp | 4 ++--
GUI/Views/SampleDesigner/DesignerScene.cpp | 8 ++++----
GUI/Views/SampleDesigner/FormLayouter.cpp | 2 +-
GUI/Views/SampleDesigner/FormLayouter.h | 4 ++--
GUI/Views/SampleDesigner/ILayerView.cpp | 6 +++---
GUI/Views/SampleDesigner/InterferenceForm.cpp | 2 +-
GUI/Views/SampleDesigner/LayerEditorUtils.cpp | 2 +-
.../SampleDesigner/LayerOrientedSampleEditor.cpp | 2 +-
GUI/Views/SampleDesigner/LayerView.cpp | 2 +-
GUI/Views/SampleDesigner/MaterialInplaceForm.cpp | 10 +++++-----
GUI/Views/SampleDesigner/MesoCrystalForm.cpp | 2 +-
GUI/Views/SampleDesigner/MesoCrystalView.cpp | 4 ++--
GUI/Views/SampleDesigner/MultiLayerForm.cpp | 2 +-
GUI/Views/SampleDesigner/MultiLayerView.cpp | 4 ++--
.../SampleDesigner/ParticleCompositionForm.cpp | 2 +-
.../SampleDesigner/ParticleCompositionView.cpp | 2 +-
.../SampleDesigner/ParticleCoreShellForm.cpp | 2 +-
.../SampleDesigner/ParticleCoreShellView.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleForm.cpp | 4 ++--
GUI/Views/SampleDesigner/ParticleLayoutView.cpp | 4 ++--
GUI/Views/SampleDesigner/ParticleView.cpp | 6 +++---
.../SampleDesigner/SampleEditorController.cpp | 2 +-
GUI/Views/SampleDesigner/SampleListView.cpp | 10 +++++-----
GUI/Views/SampleDesigner/SampleToolBar.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBox.cpp | 2 +-
GUI/Views/SampleDesigner/SampleTreeWidget.cpp | 2 +-
GUI/Views/SampleDesigner/SampleViewAligner.cpp | 2 +-
GUI/Views/SampleDesigner/ScriptPanel.cpp | 8 ++++----
.../SimulationWidgets/PythonScriptWidget.cpp | 4 ++--
.../SpecularDataWidgets/SpecularDataCanvas.cpp | 2 +-
.../SpecularDataImportWidget.cpp | 4 ++--
.../SpecularDataImportWidget.h | 2 +-
GUI/Views/SpecularDataWidgets/SpecularPlot.cpp | 2 +-
GUI/Views/Toplevel/ImportDataView.cpp | 4 ++--
GUI/Views/Toplevel/ProjectSettingsView.cpp | 2 +-
GUI/Views/Toplevel/SampleView.cpp | 6 +++---
GUI/Views/Toplevel/SessionModelView.cpp | 8 ++++----
GUI/Views/Toplevel/SimulationView.cpp | 16 ++++++++--------
GUI/Views/Toplevel/TestView.cpp | 2 +-
GUI/Views/Toplevel/WelcomeView.cpp | 2 +-
GUI/mainwindow/LinkInstrumentManager.cpp | 2 +-
GUI/mainwindow/OutputDataIOService.cpp | 4 ++--
GUI/mainwindow/PyImportAssistant.cpp | 8 ++++----
GUI/mainwindow/SaveService.cpp | 6 +++---
GUI/mainwindow/actionmanager.cpp | 4 ++--
GUI/mainwindow/mainwindow.cpp | 6 +++---
Tests/Functional/GUI/Check.cpp | 6 +++---
Tests/Unit/GUI/TestAxesItems.cpp | 2 +-
Tests/Unit/GUI/TestComponentProxyModel.cpp | 8 ++++----
Tests/Unit/GUI/TestComponentUtils.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 8 ++++----
Tests/Unit/GUI/TestDetectorItems.cpp | 4 ++--
Tests/Unit/GUI/TestFitParameterModel.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 4 ++--
Tests/Unit/GUI/TestLayerItems.cpp | 2 +-
Tests/Unit/GUI/TestLayerRoughnessItems.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 4 ++--
Tests/Unit/GUI/TestMapperCases.cpp | 6 +++---
Tests/Unit/GUI/TestMapperForItem.cpp | 4 ++--
Tests/Unit/GUI/TestModelUtils.cpp | 2 +-
Tests/Unit/GUI/TestMultiLayerItem.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 10 +++++-----
Tests/Unit/GUI/TestParaCrystalItems.cpp | 2 +-
Tests/Unit/GUI/TestParticleCoreShell.cpp | 4 ++--
Tests/Unit/GUI/TestParticleItem.cpp | 4 ++--
Tests/Unit/GUI/TestParticleLayoutItem.h | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 4 ++--
Tests/Unit/GUI/TestProjectUtils.cpp | 2 +-
Tests/Unit/GUI/TestProxyModelStrategy.cpp | 6 +++---
Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 10 +++++-----
Tests/Unit/GUI/TestSavingSpecularData.cpp | 10 +++++-----
Tests/Unit/GUI/TestSessionItemController.cpp | 2 +-
.../Unit/GUI/TestSessionItemControllerHelper.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemTags.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemUtils.cpp | 2 +-
Tests/Unit/GUI/TestSessionModel.cpp | 8 ++++----
Tests/Unit/GUI/Utils.cpp | 2 +-
205 files changed, 400 insertions(+), 409 deletions(-)
diff --git a/App/main.cpp b/App/main.cpp
index 1bfedcc3f64..d72f056457c 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/Application/Application.h"
-#include "GUI/DataLoaders/DataLoaderUtil.h"
#include "App/MessageHandler.h"
#include "App/appoptions.h"
+#include "GUI/Application/Application.h"
+#include "GUI/DataLoaders/DataLoaderUtil.h"
#include "GUI/mainwindow/mainwindow.h"
#include "config_build.h"
#include <QDir>
diff --git a/Device/Mask/Polygon.cpp b/Device/Mask/Polygon.cpp
index 7876297f6a6..99c28d7ba3a 100644
--- a/Device/Mask/Polygon.cpp
+++ b/Device/Mask/Polygon.cpp
@@ -97,8 +97,7 @@ bool Polygon::contains(double x, double y) const
// return within(PolygonPrivate::point_t(x, y), m_d->polygon);
// including borders
- return boost::geometry::covered_by(PolygonPrivate::point_t(x, y),
- m_d->polygon);
+ return boost::geometry::covered_by(PolygonPrivate::point_t(x, y), m_d->polygon);
}
bool Polygon::contains(const Bin1D& binx, const Bin1D& biny) const
diff --git a/Fit/Tools/MultiOption.cpp b/Fit/Tools/MultiOption.cpp
index 71617944c77..57ddf95bccb 100644
--- a/Fit/Tools/MultiOption.cpp
+++ b/Fit/Tools/MultiOption.cpp
@@ -46,13 +46,13 @@ MultiOption::variant_t& MultiOption::defaultValue()
void MultiOption::setFromString(const std::string& value)
{
const std::size_t idx = m_value.index();
- switch(idx) {
+ switch (idx) {
case 0:
m_value = std::stoi(value);
- break;
+ break;
case 1:
m_value = std::stod(value);
- break;
+ break;
default:
m_value = value;
}
@@ -65,6 +65,6 @@ std::string MultiOption::value_str()
return std::to_string(std::get<int>(m_value));
else if (std::holds_alternative<double>(m_value))
return std::to_string(std::get<double>(m_value));
- else // std::holds_alternative<std::string>(m_value)
+ else // std::holds_alternative<std::string>(m_value)
return std::get<std::string>(m_value);
}
diff --git a/Fit/Tools/MultiOption.h b/Fit/Tools/MultiOption.h
index 29f430de70d..871cb432c24 100644
--- a/Fit/Tools/MultiOption.h
+++ b/Fit/Tools/MultiOption.h
@@ -20,8 +20,8 @@
#ifndef BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
#define BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
-#include <variant>
#include <string>
+#include <variant>
//! Stores a single option for minimization algorithm. Int, double, string values are available.
diff --git a/GUI/CommonWidgets/DesignerHelper.cpp b/GUI/CommonWidgets/DesignerHelper.cpp
index 55d4006838a..e250e6fa3e5 100644
--- a/GUI/CommonWidgets/DesignerHelper.cpp
+++ b/GUI/CommonWidgets/DesignerHelper.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/MaterialItemUtils.h"
#include <QPainter>
#include <cmath>
#include <iostream>
diff --git a/GUI/CommonWidgets/ItemStackWidget.cpp b/GUI/CommonWidgets/ItemStackWidget.cpp
index 5f2d03d8cbd..e66ee7f0fec 100644
--- a/GUI/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/CommonWidgets/ItemStackWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/CommonWidgets/ItemStackWidget.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/utils/Error.h"
#include <QStackedWidget>
#include <QVBoxLayout>
diff --git a/GUI/CommonWidgets/ModelTreeView.cpp b/GUI/CommonWidgets/ModelTreeView.cpp
index 5d2ce512835..2b9f0a4b2bd 100644
--- a/GUI/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/CommonWidgets/ModelTreeView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/CommonWidgets/ModelTreeView.h"
-#include "GUI/utils/Error.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Items/SessionDecorationModel.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/utils/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/DataLoaders/AutomaticDataLoader1D.cpp b/GUI/DataLoaders/AutomaticDataLoader1D.cpp
index dc0d9eb3759..137324d318e 100644
--- a/GUI/DataLoaders/AutomaticDataLoader1D.cpp
+++ b/GUI/DataLoaders/AutomaticDataLoader1D.cpp
@@ -15,9 +15,9 @@
#include "GUI/DataLoaders/AutomaticDataLoader1D.h"
#include "Device/InputOutput/OutputDataReadReflectometry.h"
#include "GUI/DataLoaders/AutomaticDataLoader1DResultModel.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/utils/DeserializationException.h"
QString AutomaticDataLoader1D::name() const
diff --git a/GUI/Items/Data1DViewItem.cpp b/GUI/Items/Data1DViewItem.cpp
index 12f148fa55b..97a3cf19d26 100644
--- a/GUI/Items/Data1DViewItem.cpp
+++ b/GUI/Items/Data1DViewItem.cpp
@@ -14,13 +14,13 @@
#include "GUI/Items/Data1DViewItem.h"
#include "GUI/Items/AxesItems.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/DataItem.h"
+#include "GUI/Items/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/utils/Error.h"
-#include "GUI/Items/JobItem.h"
namespace {
const QString x_axis_default_name = "X [nbins]";
diff --git a/GUI/Items/DataItem.h b/GUI/Items/DataItem.h
index 717328e539a..533971cdc74 100644
--- a/GUI/Items/DataItem.h
+++ b/GUI/Items/DataItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_ITEMS_DATAITEM_H
#include "Device/Data/OutputData.h"
-#include "GUI/utils/SaveLoadInterface.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/utils/SaveLoadInterface.h"
#include <QDateTime>
#include <mutex>
diff --git a/GUI/Items/DetectorItems.cpp b/GUI/Items/DetectorItems.cpp
index 23755212a29..554fe072a7f 100644
--- a/GUI/Items/DetectorItems.cpp
+++ b/GUI/Items/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/Items/MaskItems.h"
#include "GUI/Items/ResolutionFunctionItems.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/SphericalDetectorItem.h"
+#include "GUI/Models/Group/GroupInfo.h"
namespace {
const QString res_func_group_label = "Type";
diff --git a/GUI/Items/DistributionItems.cpp b/GUI/Items/DistributionItems.cpp
index 50a2fb4c5fe..f7df1ed1c50 100644
--- a/GUI/Items/DistributionItems.cpp
+++ b/GUI/Items/DistributionItems.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Items/DistributionItems.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/RealLimitsItems.h"
+#include "GUI/Models/Group/GroupInfo.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include <cmath>
diff --git a/GUI/Items/FTDecayFunctionItems.h b/GUI/Items/FTDecayFunctionItems.h
index 45f9a638730..b91896914a7 100644
--- a/GUI/Items/FTDecayFunctionItems.h
+++ b/GUI/Items/FTDecayFunctionItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_ITEMS_FTDECAYFUNCTIONITEMS_H
#define BORNAGAIN_GUI_ITEMS_FTDECAYFUNCTIONITEMS_H
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Sample/Correlations/FTDecay1D.h"
#include "Sample/Correlations/FTDecay2D.h"
diff --git a/GUI/Items/FTDistributionItems.h b/GUI/Items/FTDistributionItems.h
index 6d5b15c6d73..2fc9c953336 100644
--- a/GUI/Items/FTDistributionItems.h
+++ b/GUI/Items/FTDistributionItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_ITEMS_FTDISTRIBUTIONITEMS_H
#define BORNAGAIN_GUI_ITEMS_FTDISTRIBUTIONITEMS_H
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Sample/Correlations/FTDistributions1D.h"
#include "Sample/Correlations/FTDistributions2D.h"
diff --git a/GUI/Items/FitParameterItems.cpp b/GUI/Items/FitParameterItems.cpp
index 43301b6de02..d5f4f784658 100644
--- a/GUI/Items/FitParameterItems.cpp
+++ b/GUI/Items/FitParameterItems.cpp
@@ -15,11 +15,11 @@
#include "GUI/Items/FitParameterItems.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/Parameters.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/ParameterTreeItems.h"
+#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/Error.h"
#include <cmath>
namespace {
diff --git a/GUI/Items/FitSuiteItem.cpp b/GUI/Items/FitSuiteItem.cpp
index f944c6fad26..29316331836 100644
--- a/GUI/Items/FitSuiteItem.cpp
+++ b/GUI/Items/FitSuiteItem.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Items/FitSuiteItem.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FitParameterItems.h"
#include "GUI/Items/MinimizerItem.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/utils/Error.h"
FitSuiteItem::FitSuiteItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Items/FormFactorItems.h b/GUI/Items/FormFactorItems.h
index ea0503269de..0f4b4d50a2f 100644
--- a/GUI/Items/FormFactorItems.h
+++ b/GUI/Items/FormFactorItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_ITEMS_FORMFACTORITEMS_H
#define BORNAGAIN_GUI_ITEMS_FORMFACTORITEMS_H
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
class IFormFactor;
class GroupInfo;
diff --git a/GUI/Items/GroupItem.h b/GUI/Items/GroupItem.h
index 44e4c3e6f13..a1febaf14c2 100644
--- a/GUI/Items/GroupItem.h
+++ b/GUI/Items/GroupItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_ITEMS_GROUPITEM_H
#define BORNAGAIN_GUI_ITEMS_GROUPITEM_H
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/GroupItemController.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Models/Group/GroupInfo.h"
#include <memory>
class GroupInfo;
diff --git a/GUI/Items/GroupItemController.cpp b/GUI/Items/GroupItemController.cpp
index 0b82fa39653..0bad7c36155 100644
--- a/GUI/Items/GroupItemController.cpp
+++ b/GUI/Items/GroupItemController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Items/GroupItemController.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/ItemFactory.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Models/Group/ComboProperty.h"
GroupItemController::GroupItemController(SessionItem* groupItem, GroupInfo groupInfo)
: m_groupItem(groupItem), m_groupInfo(groupInfo)
diff --git a/GUI/Items/InstrumentItems.cpp b/GUI/Items/InstrumentItems.cpp
index 515c255c1b6..ff9c87c95a2 100644
--- a/GUI/Items/InstrumentItems.cpp
+++ b/GUI/Items/InstrumentItems.cpp
@@ -24,7 +24,6 @@
#include "GUI/Items/BackgroundItems.h"
#include "GUI/Items/BeamWavelengthItem.h"
#include "GUI/Items/DetectorItems.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ItemFileNameUtils.h"
#include "GUI/Items/JobItemUtils.h"
@@ -32,8 +31,9 @@
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/RectangularDetectorItem.h"
#include "GUI/Items/SphericalDetectorItem.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
namespace {
diff --git a/GUI/Items/IntensityDataItem.cpp b/GUI/Items/IntensityDataItem.cpp
index 532c739f50c..513e1f77bec 100644
--- a/GUI/Items/IntensityDataItem.cpp
+++ b/GUI/Items/IntensityDataItem.cpp
@@ -14,13 +14,13 @@
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/AxesItems.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Items/JobItemUtils.h"
#include "GUI/Items/MaskItems.h"
-#include "GUI/Models/Data/MaskUnitsConverter.h"
#include "GUI/Items/ProjectionItems.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Models/Data/MaskUnitsConverter.h"
+#include "GUI/utils/Error.h"
namespace {
ComboProperty gradientCombo()
diff --git a/GUI/Items/InterferenceItems.cpp b/GUI/Items/InterferenceItems.cpp
index 33778e05c34..79907bb8db0 100644
--- a/GUI/Items/InterferenceItems.cpp
+++ b/GUI/Items/InterferenceItems.cpp
@@ -14,12 +14,12 @@
#include "GUI/Items/InterferenceItems.h"
#include "Base/Const/Units.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/FTDecayFunctionItems.h"
#include "GUI/Items/FTDistributionItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/Lattice2DItems.h"
+#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Sample/Aggregate/Interferences.h"
// TODO (when back compatibility will be broken again)
diff --git a/GUI/Items/InterferenceItems.h b/GUI/Items/InterferenceItems.h
index 95593237d7a..9839e0414ec 100644
--- a/GUI/Items/InterferenceItems.h
+++ b/GUI/Items/InterferenceItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_ITEMS_INTERFERENCEITEMS_H
#define BORNAGAIN_GUI_ITEMS_INTERFERENCEITEMS_H
-#include "GUI/Models/Group/SelectionDescriptor.h"
#include "GUI/Items/SessionGraphicsItem.h"
+#include "GUI/Models/Group/SelectionDescriptor.h"
class FTDecayFunction1DItem;
class FTDecayFunction2DItem;
diff --git a/GUI/Items/ItemCatalog.cpp b/GUI/Items/ItemCatalog.cpp
index 277615775c5..6e08a247a0f 100644
--- a/GUI/Items/ItemCatalog.cpp
+++ b/GUI/Items/ItemCatalog.cpp
@@ -18,9 +18,6 @@
#include "GUI/Items/BeamAngleItems.h"
#include "GUI/Items/BeamWavelengthItem.h"
#include "GUI/Items/Data1DViewItem.h"
-#include "GUI/Models/Data/DataProperties.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FTDecayFunctionItems.h"
#include "GUI/Items/FTDistributionItems.h"
#include "GUI/Items/FitParameterItems.h"
@@ -61,6 +58,9 @@
#include "GUI/Items/SphericalDetectorItem.h"
#include "GUI/Items/TransformationItem.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Data/DataProperties.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/utils/Error.h"
ItemCatalog::ItemCatalog()
{
diff --git a/GUI/Items/ItemWithParticles.cpp b/GUI/Items/ItemWithParticles.cpp
index a2286cf51b0..586059f9e33 100644
--- a/GUI/Items/ItemWithParticles.cpp
+++ b/GUI/Items/ItemWithParticles.cpp
@@ -18,8 +18,8 @@
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/TransformationItem.h"
-#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Types/VectorDescriptor.h"
DoubleDescriptor ItemWithParticles::abundance() const
{
diff --git a/GUI/Items/ItemWithParticles.h b/GUI/Items/ItemWithParticles.h
index b7db1fca525..bf04fb3f71e 100644
--- a/GUI/Items/ItemWithParticles.h
+++ b/GUI/Items/ItemWithParticles.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_ITEMS_ITEMWITHPARTICLES_H
#include "Base/Vector/Vectors3D.h"
-#include "GUI/Models/Group/SelectionDescriptor.h"
#include "GUI/Items/SessionGraphicsItem.h"
+#include "GUI/Models/Group/SelectionDescriptor.h"
class RotationItem;
class TransformationItem;
diff --git a/GUI/Items/JobItem.cpp b/GUI/Items/JobItem.cpp
index d6c60d67b64..ff1542b0975 100644
--- a/GUI/Items/JobItem.cpp
+++ b/GUI/Items/JobItem.cpp
@@ -15,7 +15,6 @@
#include "GUI/Items/JobItem.h"
#include "Base/Utils/Assert.h"
#include "GUI/Items/Data1DViewItem.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/IntensityDataItem.h"
@@ -27,6 +26,7 @@
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SimulationOptionsItem.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/utils/Error.h"
JobItem::JobItem() : SessionItem(M_TYPE)
{
diff --git a/GUI/Items/JobItem.h b/GUI/Items/JobItem.h
index ff41e4b940b..75e104cec3e 100644
--- a/GUI/Items/JobItem.h
+++ b/GUI/Items/JobItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_ITEMS_JOBITEM_H
#include "GUI/Items/SessionItem.h"
-#include "GUI/Models/Job/JobStatus.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Job/JobStatus.h"
class DataItem;
class Data1DViewItem;
diff --git a/GUI/Items/JobModelFunctions.cpp b/GUI/Items/JobModelFunctions.cpp
index 16f30ef087d..ba322ff74a5 100644
--- a/GUI/Items/JobModelFunctions.cpp
+++ b/GUI/Items/JobModelFunctions.cpp
@@ -16,8 +16,6 @@
#include "Base/Utils/Assert.h"
#include "Device/Instrument/Instrument.h"
#include "GUI/Items/Data1DViewItem.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FitParameterItems.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/GroupItem.h"
@@ -34,6 +32,8 @@
#include "GUI/Items/PointwiseAxisItem.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <map>
diff --git a/GUI/Items/LayerItem.cpp b/GUI/Items/LayerItem.cpp
index a737cbcb66e..8ed3bc8f023 100644
--- a/GUI/Items/LayerItem.cpp
+++ b/GUI/Items/LayerItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Items/LayerItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/LayerRoughnessItems.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
+#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Group/SelectionDescriptor.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/UIntDescriptor.h"
using std::function;
diff --git a/GUI/Items/MaterialItem.cpp b/GUI/Items/MaterialItem.cpp
index efaf3b07ac0..282b2229622 100644
--- a/GUI/Items/MaterialItem.cpp
+++ b/GUI/Items/MaterialItem.cpp
@@ -14,11 +14,11 @@
#include "GUI/Items/MaterialItem.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/MaterialDataItems.h"
-#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Group/GroupInfo.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
diff --git a/GUI/Items/MaterialItemUtils.cpp b/GUI/Items/MaterialItemUtils.cpp
index 7968b6cfc67..cb75573c515 100644
--- a/GUI/Items/MaterialItemUtils.cpp
+++ b/GUI/Items/MaterialItemUtils.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/Items/MaterialItemUtils.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MaterialItemContainer.h"
-#include "GUI/Models/Material/MaterialModel.h"
-#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
+#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Material/MaterialModelStore.h"
+#include "GUI/utils/Error.h"
#include "Sample/Material/Material.h"
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/Items/MesoCrystalItem.cpp b/GUI/Items/MesoCrystalItem.cpp
index c34880cca25..3969758707f 100644
--- a/GUI/Items/MesoCrystalItem.cpp
+++ b/GUI/Items/MesoCrystalItem.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/Items/MesoCrystalItem.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FormFactorItems.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/Items/VectorItem.h"
#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Items/VectorItem.h"
+#include "GUI/utils/Error.h"
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/Items/MesoCrystalItem.h b/GUI/Items/MesoCrystalItem.h
index 61574f3327a..ee9aabf62d9 100644
--- a/GUI/Items/MesoCrystalItem.h
+++ b/GUI/Items/MesoCrystalItem.h
@@ -17,8 +17,8 @@
#include "Base/Vector/Vectors3D.h"
#include "GUI/Items/ItemWithParticles.h"
-#include "GUI/Models/Group/SelectionDescriptor.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Group/SelectionDescriptor.h"
#include "Sample/Lattice/Lattice3D.h"
class FormFactorItem;
diff --git a/GUI/Items/MinimizerItem.cpp b/GUI/Items/MinimizerItem.cpp
index 6e162156aaf..8e8ff16ed51 100644
--- a/GUI/Items/MinimizerItem.cpp
+++ b/GUI/Items/MinimizerItem.cpp
@@ -21,8 +21,8 @@
#include "Fit/Adapter/Minuit2Minimizer.h"
#include "Fit/Adapter/SimAnMinimizer.h"
#include "Fit/Minimizer/TestMinimizer.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/MinimizerItemCatalog.h"
+#include "GUI/Models/Group/GroupInfo.h"
namespace {
diff --git a/GUI/Items/MultiLayerItem.cpp b/GUI/Items/MultiLayerItem.cpp
index 68f90b5b133..9ea4444fdb1 100644
--- a/GUI/Items/MultiLayerItem.cpp
+++ b/GUI/Items/MultiLayerItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Items/MultiLayerItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/VectorDescriptor.h"
namespace {
const QString external_field_tooltip = "External field (A/m)";
diff --git a/GUI/Items/ParameterTreeItems.cpp b/GUI/Items/ParameterTreeItems.cpp
index 37ccfaa14d3..600c01b7910 100644
--- a/GUI/Items/ParameterTreeItems.cpp
+++ b/GUI/Items/ParameterTreeItems.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Items/ParameterTreeItems.h"
-#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Job/FitParameterHelper.h"
// ----------------------------------------------------------------------------
diff --git a/GUI/Items/ParticleCompositionItem.cpp b/GUI/Items/ParticleCompositionItem.cpp
index 3cee3c39751..2ab5f0a0bae 100644
--- a/GUI/Items/ParticleCompositionItem.cpp
+++ b/GUI/Items/ParticleCompositionItem.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Items/ParticleCompositionItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Items/ParticleCoreShellItem.cpp b/GUI/Items/ParticleCoreShellItem.cpp
index 2703d038011..4c7ab66f9b4 100644
--- a/GUI/Items/ParticleCoreShellItem.cpp
+++ b/GUI/Items/ParticleCoreShellItem.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Items/ParticleCoreShellItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/utils/Error.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Items/ParticleItem.cpp b/GUI/Items/ParticleItem.cpp
index ce691284345..5ca7c00a8ae 100644
--- a/GUI/Items/ParticleItem.cpp
+++ b/GUI/Items/ParticleItem.cpp
@@ -19,8 +19,8 @@
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Items/SessionItemUtils.h"
-#include "GUI/Models/Domain/TransformToDomain.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Domain/TransformToDomain.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/IFormFactor.h"
diff --git a/GUI/Items/ParticleLayoutItem.cpp b/GUI/Items/ParticleLayoutItem.cpp
index 8b630763c04..f64a4bad40a 100644
--- a/GUI/Items/ParticleLayoutItem.cpp
+++ b/GUI/Items/ParticleLayoutItem.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Items/ParticleLayoutItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/ItemCatalog.h"
#include "GUI/Items/Lattice2DItems.h"
@@ -22,6 +21,7 @@
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
namespace {
diff --git a/GUI/Items/ParticleLayoutItem.h b/GUI/Items/ParticleLayoutItem.h
index c200d6cd531..7bd8a7087eb 100644
--- a/GUI/Items/ParticleLayoutItem.h
+++ b/GUI/Items/ParticleLayoutItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_ITEMS_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_ITEMS_PARTICLELAYOUTITEM_H
-#include "GUI/Models/Group/SelectionDescriptor.h"
#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Group/SelectionDescriptor.h"
class InterferenceItem;
class ItemWithParticles;
diff --git a/GUI/Items/RealDataItem.cpp b/GUI/Items/RealDataItem.cpp
index 3649e4b6c0d..441aeaa1032 100644
--- a/GUI/Items/RealDataItem.cpp
+++ b/GUI/Items/RealDataItem.cpp
@@ -14,13 +14,7 @@
#include "GUI/Items/RealDataItem.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/Models/Data/AbstractDataLoader1D.h"
-#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Data/DataLoaders1D.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/ItemFileNameUtils.h"
#include "GUI/Items/JobItem.h"
@@ -28,10 +22,16 @@
#include "GUI/Items/JobModelFunctions.h"
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/ProjectionItems.h"
-#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Items/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/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Project/projectmanager.h"
#include "GUI/utils/DeserializationException.h"
+#include "GUI/utils/Error.h"
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Items/RealDataItem.h b/GUI/Items/RealDataItem.h
index dfbd0d18a26..0cf5b721c9c 100644
--- a/GUI/Items/RealDataItem.h
+++ b/GUI/Items/RealDataItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_ITEMS_REALDATAITEM_H
#define BORNAGAIN_GUI_ITEMS_REALDATAITEM_H
-#include "GUI/Models/Data/AbstractDataLoader.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Models/Data/AbstractDataLoader.h"
#include <QPointer>
class DataItem;
diff --git a/GUI/Items/RectangularDetectorItem.cpp b/GUI/Items/RectangularDetectorItem.cpp
index 0bb3ca10e56..cb64fc2adc3 100644
--- a/GUI/Items/RectangularDetectorItem.cpp
+++ b/GUI/Items/RectangularDetectorItem.cpp
@@ -15,8 +15,8 @@
#include "GUI/Items/RectangularDetectorItem.h"
#include "Device/Detector/RectangularDetector.h"
#include "GUI/Items/AxesItems.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/utils/Error.h"
namespace {
const double default_detector_width = 20.0;
diff --git a/GUI/Items/RectangularDetectorItem.h b/GUI/Items/RectangularDetectorItem.h
index 3f2af6e1fb2..3836ba75198 100644
--- a/GUI/Items/RectangularDetectorItem.h
+++ b/GUI/Items/RectangularDetectorItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_ITEMS_RECTANGULARDETECTORITEM_H
#include "Base/Vector/Vectors3D.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/DetectorItems.h"
+#include "GUI/Models/Group/ComboProperty.h"
class BasicAxisItem;
class VectorItem;
diff --git a/GUI/Items/SessionModel.cpp b/GUI/Items/SessionModel.cpp
index afd5e555920..fc9c78ffda7 100644
--- a/GUI/Items/SessionModel.cpp
+++ b/GUI/Items/SessionModel.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Items/SessionModel.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/ItemFactory.h"
#include "GUI/Items/SessionItemTags.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <QFile>
#include <QMimeData>
diff --git a/GUI/Items/SessionXML.cpp b/GUI/Items/SessionXML.cpp
index be5351a226e..926b304d222 100644
--- a/GUI/Items/SessionXML.cpp
+++ b/GUI/Items/SessionXML.cpp
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/MaterialItem.h"
#include "GUI/Items/SessionItemTags.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/utils/DeserializationException.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/MessageService.h"
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Items/SpecularDataItem.cpp b/GUI/Items/SpecularDataItem.cpp
index 927fc9fab2a..300b2e395af 100644
--- a/GUI/Items/SpecularDataItem.cpp
+++ b/GUI/Items/SpecularDataItem.cpp
@@ -14,9 +14,9 @@
#include "GUI/Items/SpecularDataItem.h"
#include "GUI/Items/AxesItems.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Items/JobItemUtils.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Items/TransformationItem.cpp b/GUI/Items/TransformationItem.cpp
index 7b64e483d06..82c82b80e8f 100644
--- a/GUI/Items/TransformationItem.cpp
+++ b/GUI/Items/TransformationItem.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Items/TransformationItem.h"
-#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Items/RotationItems.h"
+#include "GUI/Models/Group/GroupInfo.h"
TransformationItem::TransformationItem() : SessionGraphicsItem(M_TYPE)
{
diff --git a/GUI/Mapper/ComponentProxyModel.cpp b/GUI/Mapper/ComponentProxyModel.cpp
index c9320eb999a..74baee7e744 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/Items/GroupItem.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
#include <QSet>
#include <functional>
diff --git a/GUI/Mapper/ComponentProxyStrategy.cpp b/GUI/Mapper/ComponentProxyStrategy.cpp
index 9b265b0ed3b..a9b04fb0a6b 100644
--- a/GUI/Mapper/ComponentProxyStrategy.cpp
+++ b/GUI/Mapper/ComponentProxyStrategy.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Mapper/ComponentProxyStrategy.h"
-#include "GUI/Mapper/ComponentProxyModel.h"
-#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentUtils.h"
void ComponentProxyStrategy::onDataChanged(SessionModel* source, ComponentProxyModel* proxy)
{
diff --git a/GUI/Mapper/ProxyModelStrategy.cpp b/GUI/Mapper/ProxyModelStrategy.cpp
index 59bdd6ec830..6f1b43d2388 100644
--- a/GUI/Mapper/ProxyModelStrategy.cpp
+++ b/GUI/Mapper/ProxyModelStrategy.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
+#include "GUI/Items/SessionModel.h"
#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Mapper/ModelUtils.h"
-#include "GUI/Items/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 da4fbf53004..70858fac491 100644
--- a/GUI/Models/Data/ApplicationModels.cpp
+++ b/GUI/Models/Data/ApplicationModels.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Items/InstrumentItems.h"
+#include "GUI/Items/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/Data/RealDataModel.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Items/SimulationOptionsItem.h"
#include "GUI/utils/DeserializationException.h"
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/Data/DataProperties.cpp b/GUI/Models/Data/DataProperties.cpp
index 6529e75047f..73882414b0a 100644
--- a/GUI/Models/Data/DataProperties.cpp
+++ b/GUI/Models/Data/DataProperties.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Models/Data/DataProperties.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/DataItem.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/Error.h"
#include <QColor>
namespace {
diff --git a/GUI/Models/Data/GUIObjectBuilder.cpp b/GUI/Models/Data/GUIObjectBuilder.cpp
index 0ce935fed20..a52337d59bf 100644
--- a/GUI/Models/Data/GUIObjectBuilder.cpp
+++ b/GUI/Models/Data/GUIObjectBuilder.cpp
@@ -17,12 +17,12 @@
#include "Base/Utils/Assert.h"
#include "Core/Simulation/includeSimulations.h"
#include "Device/Instrument/Instrument.h"
-#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/SimulationOptionsItem.h"
+#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "Resample/Options/SimulationOptions.h"
namespace {
diff --git a/GUI/Models/Data/ImportDataInfo.cpp b/GUI/Models/Data/ImportDataInfo.cpp
index b0a1c3db6c8..3c191c14794 100644
--- a/GUI/Models/Data/ImportDataInfo.cpp
+++ b/GUI/Models/Data/ImportDataInfo.cpp
@@ -15,8 +15,8 @@
#include "GUI/Models/Data/ImportDataInfo.h"
#include "Device/Coord/AxisNames.h"
#include "Device/Data/OutputData.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/JobItemUtils.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/OutputDataUtils.h"
namespace {
diff --git a/GUI/Models/Domain/DomainObjectBuilder.cpp b/GUI/Models/Domain/DomainObjectBuilder.cpp
index 65c07c4420c..2623e4d86f8 100644
--- a/GUI/Models/Domain/DomainObjectBuilder.cpp
+++ b/GUI/Models/Domain/DomainObjectBuilder.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Models/Domain/DomainObjectBuilder.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/utils/Error.h"
std::unique_ptr<MultiLayer>
GUI::Model::DomainObjectBuilder::buildMultiLayer(const MultiLayerItem& multilayer_item)
diff --git a/GUI/Models/Domain/DomainSimulationBuilder.cpp b/GUI/Models/Domain/DomainSimulationBuilder.cpp
index 4945e2b0938..ce156b2895e 100644
--- a/GUI/Models/Domain/DomainSimulationBuilder.cpp
+++ b/GUI/Models/Domain/DomainSimulationBuilder.cpp
@@ -21,13 +21,13 @@
#include "Device/Beam/IFootprintFactor.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/BackgroundItems.h"
-#include "GUI/Models/Domain/DomainObjectBuilder.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FootprintItems.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/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 00b4cc9cb68..609006cc43d 100644
--- a/GUI/Models/Domain/TransformFromDomain.cpp
+++ b/GUI/Models/Domain/TransformFromDomain.cpp
@@ -36,8 +36,6 @@
#include "GUI/Items/BackgroundItems.h"
#include "GUI/Items/BeamAngleItems.h"
#include "GUI/Items/BeamWavelengthItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FTDecayFunctionItems.h"
#include "GUI/Items/FTDistributionItems.h"
#include "GUI/Items/InstrumentItems.h"
@@ -49,8 +47,10 @@
#include "GUI/Items/RectangularDetectorItem.h"
#include "GUI/Items/ResolutionFunctionItems.h"
#include "GUI/Items/SphericalDetectorItem.h"
-#include "GUI/Models/Types/UIntDescriptor.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/UIntDescriptor.h"
+#include "GUI/utils/Error.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Node/NodeUtils.h"
diff --git a/GUI/Models/Domain/TransformToDomain.cpp b/GUI/Models/Domain/TransformToDomain.cpp
index 00b3fad786d..a5ca00c8540 100644
--- a/GUI/Models/Domain/TransformToDomain.cpp
+++ b/GUI/Models/Domain/TransformToDomain.cpp
@@ -20,7 +20,6 @@
#include "GUI/Items/BeamAngleItems.h"
#include "GUI/Items/BeamItems.h"
#include "GUI/Items/BeamWavelengthItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/JobModelFunctions.h"
#include "GUI/Items/LayerItem.h"
@@ -35,8 +34,9 @@
#include "GUI/Items/RotationItems.h"
#include "GUI/Items/SimulationOptionsItem.h"
#include "GUI/Items/TransformationItem.h"
-#include "GUI/Models/Types/UIntDescriptor.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Types/UIntDescriptor.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Resample/Options/SimulationOptions.h"
#include "Sample/Particle/MesoCrystal.h"
diff --git a/GUI/Models/Fit/FitParameterProxyModel.cpp b/GUI/Models/Fit/FitParameterProxyModel.cpp
index 87c85c808b5..80e1a1132ba 100644
--- a/GUI/Models/Fit/FitParameterProxyModel.cpp
+++ b/GUI/Models/Fit/FitParameterProxyModel.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Models/Fit/FitParameterProxyModel.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Items/FitParameterItems.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/Models/Job/FitParameterHelper.h"
+#include "GUI/Models/Job/JobModel.h"
+#include "GUI/utils/Error.h"
#include <QColor>
#include <QMimeData>
diff --git a/GUI/Models/Group/SelectionDescriptor.h b/GUI/Models/Group/SelectionDescriptor.h
index e111ecbdb07..92aab993dbf 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/ComboProperty.h"
#include "GUI/Items/GroupItem.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include <QString>
#include <QStringList>
#include <functional>
diff --git a/GUI/Models/Instrument/InstrumentLibrary.cpp b/GUI/Models/Instrument/InstrumentLibrary.cpp
index 307d839b6f3..dda61713f38 100644
--- a/GUI/Models/Instrument/InstrumentLibrary.cpp
+++ b/GUI/Models/Instrument/InstrumentLibrary.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Instrument/InstrumentLibrary.h"
-#include "GUI/Models/Instrument/InstrumentsTreeModel.h"
#include "GUI/Items/InstrumentItems.h"
+#include "GUI/Models/Instrument/InstrumentsTreeModel.h"
#include <QFile>
#include <QXmlStreamWriter>
diff --git a/GUI/Models/Instrument/InstrumentModel.cpp b/GUI/Models/Instrument/InstrumentModel.cpp
index 6ff6de5258b..4e2e294a47e 100644
--- a/GUI/Models/Instrument/InstrumentModel.cpp
+++ b/GUI/Models/Instrument/InstrumentModel.cpp
@@ -15,8 +15,8 @@
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/PointwiseAxisItem.h"
+#include "GUI/Mapper/ModelUtils.h"
InstrumentModel::InstrumentModel(QObject* parent)
: SessionModel(GUI::Session::XML::InstrumentModelTag, parent)
diff --git a/GUI/Models/Job/FitParameterHelper.cpp b/GUI/Models/Job/FitParameterHelper.cpp
index 5752642146e..04ce042676f 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/Items/FitParameterItems.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/ParameterTreeItems.h"
+#include "GUI/Models/Job/JobModel.h"
//! Creates fit parameter from given ParameterItem, sets starting value to the value
//! of ParameterItem, copies link.
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index 6310fb08563..9ab61eff4df 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -18,12 +18,12 @@
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/JobModelFunctions.h"
-#include "GUI/Models/Job/JobQueueData.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParameterTreeItems.h"
-#include "GUI/Models/Job/ParameterTreeUtils.h"
#include "GUI/Items/PointwiseAxisItem.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Models/Job/JobQueueData.h"
+#include "GUI/Models/Job/ParameterTreeUtils.h"
#include "GUI/utils/Helpers.h"
JobModel::JobModel(QObject* parent)
diff --git a/GUI/Models/Job/JobQueueData.cpp b/GUI/Models/Job/JobQueueData.cpp
index a9a100b3fdc..361024f4a53 100644
--- a/GUI/Models/Job/JobQueueData.cpp
+++ b/GUI/Models/Job/JobQueueData.cpp
@@ -14,11 +14,11 @@
#include "GUI/Models/Job/JobQueueData.h"
#include "Core/Simulation/GISASSimulation.h"
-#include "GUI/Models/Domain/DomainSimulationBuilder.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/JobItem.h"
+#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Job/JobWorker.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <QThread>
diff --git a/GUI/Models/Job/JobWorker.h b/GUI/Models/Job/JobWorker.h
index 9f5895dd67c..ea863a26255 100644
--- a/GUI/Models/Job/JobWorker.h
+++ b/GUI/Models/Job/JobWorker.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODELS_JOB_JOBWORKER_H
#include "GUI/Models/Job/JobStatus.h"
-#include <QObject>
#include <QDateTime>
+#include <QObject>
class ISimulation;
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index ece7a649a2d..e49942169f8 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Models/Job/ParameterTreeUtils.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/JobItem.h"
@@ -22,6 +21,7 @@
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParameterTreeItems.h"
#include "GUI/Items/PropertyItem.h"
+#include "GUI/utils/Error.h"
#include <QStack>
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/Models/Parameter/ParameterTuningModel.cpp b/GUI/Models/Parameter/ParameterTuningModel.cpp
index ad73ed7228a..593ed95caac 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/Items/ParameterTreeItems.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Job/FitParameterHelper.h"
#include <QMimeData>
ParameterTuningModel::ParameterTuningModel(QObject* parent) : FilterPropertyProxy(2, parent) {}
diff --git a/GUI/Models/Sample/GUIDomainSampleVisitor.cpp b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
index 683526cb93b..44a0f37bac1 100644
--- a/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
@@ -14,14 +14,10 @@
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "Base/Const/Units.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MaterialItemUtils.h"
-#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleCompositionItem.h"
@@ -29,10 +25,14 @@
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Items/RotationItems.h"
-#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Domain/TransformFromDomain.h"
#include "GUI/Items/TransformationItem.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Domain/TransformFromDomain.h"
+#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/utils/Error.h"
#include "Param/Node/NodeUtils.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/HardParticles.h"
diff --git a/GUI/Models/Sample/SampleListModel.cpp b/GUI/Models/Sample/SampleListModel.cpp
index 31a7f08bc11..770d9335df2 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/GUIExamplesFactory.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/MultiLayerItem.h"
+#include "GUI/Mapper/ModelUtils.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleModel.h"
#include <QFontMetrics>
#include <QIcon>
@@ -145,8 +145,8 @@ QModelIndex SampleListModel::createSampleFromExamples(const QString& className,
const int row = m_sampleModel->multiLayerItems().size();
beginInsertRows(QModelIndex(), row, row);
- auto* sample = dynamic_cast<MultiLayerItem*>(GUIExamplesFactory::createSampleItems(
- className, m_sampleModel, materialModel));
+ auto* sample = dynamic_cast<MultiLayerItem*>(
+ GUIExamplesFactory::createSampleItems(className, m_sampleModel, materialModel));
sample->setItemName(title);
sample->setDescription(description);
diff --git a/GUI/Models/Sample/SampleListModel.h b/GUI/Models/Sample/SampleListModel.h
index 1075037508f..b0adaf3bc20 100644
--- a/GUI/Models/Sample/SampleListModel.h
+++ b/GUI/Models/Sample/SampleListModel.h
@@ -44,8 +44,7 @@ public:
//! Create a new sample (multilayer) and return the index of it.
QModelIndex createSample();
QModelIndex createSampleFromExamples(const QString& className, const QString& title,
- const QString& description,
- MaterialModel* materialModel);
+ const QString& description, MaterialModel* materialModel);
private:
SampleModel* m_sampleModel = nullptr;
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index 7d6b3613a63..9e7497af397 100644
--- a/GUI/Models/Sample/SampleModel.cpp
+++ b/GUI/Models/Sample/SampleModel.cpp
@@ -15,9 +15,9 @@
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/PropertyItem.h"
+#include "GUI/Mapper/ModelUtils.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Models/Types/VectorDescriptor.h b/GUI/Models/Types/VectorDescriptor.h
index 631096ac518..65a4c3475de 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/DoubleDescriptor.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
//! Describes properties of a 3D vector, consisting of three double values.
//!
diff --git a/GUI/Project/projectdocument.cpp b/GUI/Project/projectdocument.cpp
index 86cf0154735..4473f455659 100644
--- a/GUI/Project/projectdocument.cpp
+++ b/GUI/Project/projectdocument.cpp
@@ -14,13 +14,13 @@
#include "GUI/Project/projectdocument.h"
#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/utils/Error.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/mainwindow/OutputDataIOService.h"
#include "GUI/Project/ProjectUtils.h"
+#include "GUI/mainwindow/LinkInstrumentManager.h"
+#include "GUI/mainwindow/OutputDataIOService.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/MessageService.h"
-#include "GUI/mainwindow/LinkInstrumentManager.h"
#include <QDir>
#include <QElapsedTimer>
#include <QXmlStreamReader>
diff --git a/GUI/Project/projectmanager.cpp b/GUI/Project/projectmanager.cpp
index e8fd7cae6bb..756a0228d27 100644
--- a/GUI/Project/projectmanager.cpp
+++ b/GUI/Project/projectmanager.cpp
@@ -15,17 +15,17 @@
#include "GUI/Project/projectmanager.h"
#include "Base/Utils/Assert.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/utils/Error.h"
-#include "GUI/utils/GUIHelpers.h"
#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
-#include "GUI/utils/mainwindow_constants.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/mainwindow/newprojectdialog.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/utils/Error.h"
+#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/MessageService.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QDateTime>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
index 8418f5124ef..2f8facdda5f 100644
--- a/GUI/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/Views/FitWidgets/FitActivityPanel.cpp
@@ -27,9 +27,7 @@
#include <QVBoxLayout>
FitActivityPanel::FitActivityPanel(QWidget* parent)
- : QWidget(parent)
- , m_realTimeWidget(nullptr)
- , m_fitSessionManager(new FitSessionManager(this))
+ : QWidget(parent), m_realTimeWidget(nullptr), m_fitSessionManager(new FitSessionManager(this))
{
setWindowTitle(GUI::Constants::JobFitPanelName);
setObjectName("FitActivityPanel");
@@ -47,7 +45,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
m_nofitLabel = new QLabel("Job has no real data linked to it for fitting.", m_stack);
m_nofitLabel->setAlignment(Qt::AlignCenter);
m_stack->addWidget(m_nofitLabel);
-
+
m_fitSessionWidget = new FitSessionWidget(m_stack);
m_stack->addWidget(m_fitSessionWidget);
}
diff --git a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
index 07f0af1ab2a..a00e5b9ec30 100644
--- a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -19,14 +19,14 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Items/DataItem.h"
-#include "GUI/Models/Domain/DomainSimulationBuilder.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FitParameterItems.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/MinimizerItem.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index 3e6e7df9b4a..bf55052c02c 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -13,19 +13,19 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/FitParameterWidget.h"
-#include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Job/FitParameterHelper.h"
+#include "GUI/InfoWidgets/OverlayLabelController.h"
#include "GUI/Items/FitParameterItems.h"
-#include "GUI/Models/Fit/FitParameterProxyModel.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/ParameterTreeItems.h"
+#include "GUI/Models/Fit/FitParameterProxyModel.h"
+#include "GUI/Models/Job/FitParameterHelper.h"
+#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/InfoWidgets/OverlayLabelController.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
-#include "GUI/utils/mainwindow_constants.h"
#include "GUI/utils/CustomEventFilters.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QAction>
#include <QMenu>
#include <QTreeView>
diff --git a/GUI/Views/FitWidgets/FitSessionController.cpp b/GUI/Views/FitWidgets/FitSessionController.cpp
index 4d5c44295d5..92159e88f45 100644
--- a/GUI/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/Views/FitWidgets/FitSessionController.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/FitSessionController.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FitParameterItems.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/IntensityDataItem.h"
@@ -22,6 +21,7 @@
#include "GUI/Views/FitWidgets/FitObjectiveBuilder.h"
#include "GUI/Views/FitWidgets/FitWorkerLauncher.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
namespace {
diff --git a/GUI/Views/FitWidgets/FitSessionManager.cpp b/GUI/Views/FitWidgets/FitSessionManager.cpp
index f598971c11c..55d57cdce54 100644
--- a/GUI/Views/FitWidgets/FitSessionManager.cpp
+++ b/GUI/Views/FitWidgets/FitSessionManager.cpp
@@ -13,13 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/FitSessionManager.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Views/FitWidgets/FitLog.h"
#include "GUI/Views/FitWidgets/FitSessionController.h"
+#include "GUI/utils/Error.h"
-FitSessionManager::FitSessionManager(QObject* parent)
- : QObject(parent), m_activeController(nullptr)
+FitSessionManager::FitSessionManager(QObject* parent) : QObject(parent), m_activeController(nullptr)
{
}
diff --git a/GUI/Views/FitWidgets/FitWorkerLauncher.cpp b/GUI/Views/FitWidgets/FitWorkerLauncher.cpp
index 6a528b55542..3e155d10e37 100644
--- a/GUI/Views/FitWidgets/FitWorkerLauncher.cpp
+++ b/GUI/Views/FitWidgets/FitWorkerLauncher.cpp
@@ -16,10 +16,7 @@
#include "GUI/Views/FitWidgets/FitWorker.h"
#include <QThread>
-FitWorkerLauncher::FitWorkerLauncher(QObject* parent)
- : QObject(parent), m_is_fit_running(false)
-{
-}
+FitWorkerLauncher::FitWorkerLauncher(QObject* parent) : QObject(parent), m_is_fit_running(false) {}
void FitWorkerLauncher::runFitting(std::shared_ptr<FitObjectiveBuilder> suite)
{
diff --git a/GUI/Views/FitWidgets/FitWorkerLauncher.h b/GUI/Views/FitWidgets/FitWorkerLauncher.h
index 336a022d750..c3fe9887de1 100644
--- a/GUI/Views/FitWidgets/FitWorkerLauncher.h
+++ b/GUI/Views/FitWidgets/FitWorkerLauncher.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
-#include <QObject>
#include <QDateTime>
+#include <QObject>
#include <atomic>
#include <memory>
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index cf36c4532e3..2a3181b7082 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/ParameterTreeItems.h"
-#include "GUI/Models/Parameter/ParameterTuningModel.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Models/Parameter/ParameterTuningModel.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QHBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index 3abc4fbaaae..72fe8a4ac8e 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/utils/Error.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/ParameterTreeItems.h"
+#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Parameter/ParameterTuningModel.h"
#include "GUI/Views/FitWidgets/JobRealTimeToolBar.h"
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
#include "GUI/Views/FitWidgets/SliderSettingsWidget.h"
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/utils/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 151e1d79ff5..40def85c021 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Items/FitSuiteItem.h"
-#include "GUI/Items/JobItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Items/FitSuiteItem.h"
+#include "GUI/Items/JobItem.h"
#include "GUI/utils/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
index 8fdb991914b..bbc1b53b59c 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Views/ImportDataWidgets/RealDataMaskWidget.h"
#include "GUI/Views/IntensityDataWidgets/IntensityDataWidget.h"
#include "GUI/Views/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
#include "GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h"
#include "GUI/Views/SpecularDataWidgets/SpecularDataWidget.h"
+#include "GUI/utils/Error.h"
#include <QAction>
RealDataPresenter::RealDataPresenter(QWidget* parent) : ItemComboWidget(parent)
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index cc5c016e277..eadda81e442 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -14,11 +14,11 @@
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/LinkInstrumentManager.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Project/projectdocument.h"
+#include "GUI/mainwindow/LinkInstrumentManager.h"
+#include "GUI/mainwindow/mainwindow.h"
#include <QComboBox>
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 5b7612fc72a..5393dfd7124 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -15,20 +15,20 @@
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Application/Application.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/DataLoaders1D.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/utils/GUIHelpers.h"
-#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/utils/Error.h"
+#include "GUI/utils/GUIHelpers.h"
#include <QApplication>
#include <QFileDialog>
#include <QItemSelectionModel>
diff --git a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index f81237dcdae..ca5a3bb98d3 100644
--- a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Items/BeamWavelengthItem.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Views/InstrumentWidgets/InclinationAnglesEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index 0a41906d857..f09b10f798b 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Items/DistributionItems.h"
#include "GUI/Items/ItemWithDistribution.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include <QDoubleSpinBox>
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 11423a09a70..d170416aad3 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
+#include "GUI/InfoWidgets/CautionSign.h"
#include "GUI/Items/DistributionItems.h"
#include "GUI/Items/RealLimitsItems.h"
-#include "GUI/InfoWidgets/CautionSign.h"
#include "Param/Distrib/Distributions.h"
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
index 4b5565831da..3f7b835ae55 100644
--- a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h"
-#include "GUI/Items/InstrumentItems.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/GISASBeamEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index 9ce20171314..ff75f32341d 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Application/Application.h"
-#include "GUI/Items/InstrumentItems.h"
#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/InstrumentItems.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListModel.cpp b/GUI/Views/InstrumentWidgets/InstrumentListModel.cpp
index 11276e68d9f..681aef00deb 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListModel.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListModel.cpp
@@ -186,9 +186,10 @@ template <class Instrument> QModelIndex InstrumentListModel::addNewInstrument()
void InstrumentListModel::attachToInstrument(InstrumentItem* instrument)
{
- instrument->mapper()->setOnPropertyChange
- (std::bind(&InstrumentListModel::notifyInstrumentPropertyChange, this, instrument,
- std::placeholders::_1), this);
+ instrument->mapper()->setOnPropertyChange(
+ std::bind(&InstrumentListModel::notifyInstrumentPropertyChange, this, instrument,
+ std::placeholders::_1),
+ this);
}
void InstrumentListModel::detachFromInstrument(InstrumentItem* instrument)
@@ -203,6 +204,6 @@ void InstrumentListModel::notifyInstrumentPropertyChange(InstrumentItem* instrum
QVector<InstrumentItem*> instruments = m_instruments->instrumentItems();
int i = instruments.indexOf(instrument);
if (i != -1)
- emit dataChanged(index(i,0),index(i,0));
+ emit dataChanged(index(i, 0), index(i, 0));
}
}
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index 2e6374d48f7..4844018cf2e 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -16,10 +16,10 @@
#include "GUI/Application/Application.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
#include <QAction>
#include <QListView>
#include <QMessageBox>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index 53ef53b1891..53e8ab8fdb2 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
-#include "GUI/Project/projectdocument.h"
#include <QBoxLayout>
InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
diff --git a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
index 6c2ca299ffc..4531013fce2 100644
--- a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h"
-#include "GUI/Items/InstrumentItems.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
diff --git a/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp b/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
index e75ef90030f..e4a14a69da8 100644
--- a/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
@@ -135,15 +135,14 @@ PolarizationAnalysisEditor::PolarizationAnalysisEditor(QWidget* parent, Qt::Wind
QGridLayout* grid = new QGridLayout(m_polarizerAnalyzerWidget);
grid->setMargin(0);
- m_polarizerEditor =
- new VectorEditor("Polarizer (Bloch vector)",
- "Polarization of the beam, given as the Bloch vector (%1)",
- m_polarizerAnalyzerWidget);
+ m_polarizerEditor = new VectorEditor("Polarizer (Bloch vector)",
+ "Polarization of the beam, given as the Bloch vector (%1)",
+ m_polarizerAnalyzerWidget);
grid->addWidget(m_polarizerEditor, 0, 0);
- m_analyzerEditor = new VectorEditor("Analyzer orientation",
- "Direction of the polarization analysis (%1)",
- m_polarizerAnalyzerWidget);
+ m_analyzerEditor =
+ new VectorEditor("Analyzer orientation", "Direction of the polarization analysis (%1)",
+ m_polarizerAnalyzerWidget);
grid->addWidget(m_analyzerEditor, 0, 1);
m_propertiesEditor = new AnalyzerPropertiesEditor(m_polarizerAnalyzerWidget);
diff --git a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
index b66f43eeb86..2eb5d9dd2ef 100644
--- a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
-#include "GUI/Items/InstrumentItems.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/Views/InstrumentWidgets/SpecularBeamEditor.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index 189b6a0e996..b0368d3b710 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/IntensityDataItem.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 3d3bc385ce9..521ec47dcbb 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Items/IntensityDataItem.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/IntensityDataItem.h"
+#include "GUI/utils/Error.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index bd41eca55fe..34b94176396 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -13,15 +13,15 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/utils/GUIHelpers.h"
+#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectmanager.h"
+#include "GUI/utils/GUIHelpers.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
index acbcdc35493..b7b3e547d6b 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/utils/Error.h"
#include <QAction>
#include <QApplication>
#include <QWidget>
diff --git a/GUI/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
index 32e21f82176..d79c8bd3097 100644
--- a/GUI/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/Plot1D.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/Data1DViewItem.h"
#include "GUI/Items/DataItem.h"
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/JobWidgets/FitComparisonViewController.cpp b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
index 613fe1f344c..9e1fd85bc45 100644
--- a/GUI/Views/JobWidgets/FitComparisonViewController.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
@@ -15,14 +15,14 @@
#include "GUI/Views/JobWidgets/FitComparisonViewController.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Items/AxesItems.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/Data1DViewItem.h"
#include "GUI/Items/DataItem.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/IntensityDataWidgets/PropertyRepeater.h"
namespace {
diff --git a/GUI/Views/JobWidgets/JobListView.cpp b/GUI/Views/JobWidgets/JobListView.cpp
index b064bdfbb33..46a181d0c2f 100644
--- a/GUI/Views/JobWidgets/JobListView.cpp
+++ b/GUI/Views/JobWidgets/JobListView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobListView.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/JobWidgets/JobListModel.h"
#include "GUI/Views/JobWidgets/JobListViewDelegate.h"
#include <QAction>
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.cpp b/GUI/Views/JobWidgets/JobMessagePanel.cpp
index 8282b14d74e..1730525f414 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/Views/JobWidgets/JobMessagePanel.cpp
@@ -43,8 +43,8 @@ QColor color(FitLogLevel level)
} // namespace
-JobMessagePanel::JobMessagePanel(QWidget* parent) : InfoPanel(parent), m_log(nullptr),
- m_plainLog(new QTextEdit)
+JobMessagePanel::JobMessagePanel(QWidget* parent)
+ : InfoPanel(parent), m_log(nullptr), m_plainLog(new QTextEdit)
{
setWindowTitle(GUI::Constants::JobMessagePanelName);
setObjectName("JobMessagePanel");
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index 6bc7fc77511..392c61ca8f3 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/Items/JobItem.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/JobItem.h"
#include "GUI/Views/JobWidgets/JobPropertiesTableModel.h"
#include "GUI/utils/mainwindow_constants.h"
#include <QTabBar>
diff --git a/GUI/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
index d09819d36b8..66a65af95e0 100644
--- a/GUI/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
@@ -22,8 +22,7 @@
#include <QVBoxLayout>
JobSelectorWidget::JobSelectorWidget(JobModel* jobModel, QWidget* parent)
- : QWidget(parent)
- , m_jobModel(jobModel)
+ : QWidget(parent), m_jobModel(jobModel)
{
setWindowTitle(GUI::Constants::JobSelectorWidgetName);
setObjectName("JobSelectorWidget");
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 710997fdca7..74ada46f221 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -13,9 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobView.h"
+#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/CommonWidgets/DocksController.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/FitWidgets/FitActivityPanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
@@ -24,7 +25,6 @@
#include "GUI/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectmanager.h"
#include <QMenu>
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index 02e7e3554c4..431e2dcfe96 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -15,13 +15,13 @@
#include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/MaskItems.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
-#include "GUI/Project/projectmanager.h"
#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index 4ab7efdb9e3..f7fdaed79a9 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/ProjectionItems.h"
@@ -23,6 +22,7 @@
#include "GUI/Views/MaskWidgets/MaskGraphicsProxy.h"
#include "GUI/Views/MaskWidgets/MaskViewFactory.h"
#include "GUI/Views/MaskWidgets/PolygonView.h"
+#include "GUI/utils/Error.h"
#include <QGraphicsItem>
#include <QGraphicsSceneMoveEvent>
#include <QItemSelection>
diff --git a/GUI/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
index bb79755a9eb..0225fdb91d5 100644
--- a/GUI/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/MaskWidgets/MaskViewFactory.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/ProjectionItems.h"
#include "GUI/Items/SessionItem.h"
@@ -24,6 +23,7 @@
#include "GUI/Views/MaskWidgets/PolygonPointView.h"
#include "GUI/Views/MaskWidgets/PolygonView.h"
#include "GUI/Views/MaskWidgets/RegionOfInterestView.h"
+#include "GUI/utils/Error.h"
#include <boost/polymorphic_cast.hpp>
using boost::polymorphic_downcast;
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 1a9a3371403..3c0bcb76afd 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,18 +14,18 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Application/Application.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
+#include "GUI/Items/VectorItem.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Items/VectorItem.h"
-#include "GUI/utils/GUIHelpers.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
-#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/utils/GUIHelpers.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "ui_MaterialEditorDialog.h"
#include <QAction>
diff --git a/GUI/Views/MaterialEditor/MaterialEditorModel.cpp b/GUI/Views/MaterialEditor/MaterialEditorModel.cpp
index 9699b4085d0..54acf9182f3 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/Items/MaterialItem.h"
-#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Material/MaterialModel.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index d929c73e275..92b28544be0 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -17,11 +17,11 @@
#include "Device/Histo/Histogram1D.h"
#include "Device/Histo/Histogram2D.h"
#include "GUI/Application/Application.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/ProjectionItems.h"
#include "GUI/Project/projectmanager.h"
+#include "GUI/utils/Error.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
index e76cd35117b..0c1f98797ed 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/Items/GroupItem.h"
#include "GUI/Items/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 984fbb4e7cb..bedc9ddb491 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/Mapper/ComponentProxyModel.h"
-#include "GUI/Items/SessionModel.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/SessionModel.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index cb063ca6560..5bacb10c00c 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -15,11 +15,11 @@
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/CommonWidgets/ScientificSpinBox.h"
-#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
+#include "GUI/Items/MaterialItemUtils.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Project/projectmanager.h"
+#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index a2935c4ac5b..d874546bc07 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/SessionFlags.h"
#include "GUI/Items/SessionItem.h"
-#include "GUI/CommonWidgets/ScientificSpinBox.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include <QLabel>
#include <QLineEdit>
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index 05dd5aa37ba..d0a35f1205f 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -13,15 +13,15 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/TestComponentView.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Items/BeamItems.h"
-#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Items/IntensityDataItem.h"
-#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Items/ParticleItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/VectorItem.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Models/Data/GUIObjectBuilder.h"
+#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
index d268d3ffebf..a28f5c7eb71 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MesoCrystalItem.h"
@@ -22,6 +21,7 @@
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Views/RealSpaceWidgets/Particle3DContainer.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index 14112e616c8..cfcb794f86d 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -14,15 +14,15 @@
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h"
#include "Base/Const/Units.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/MaterialItem.h"
-#include "GUI/Models/Material/MaterialModel.h"
-#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/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"
#include "GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 1fc7aae040c..21223b5e11e 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -14,14 +14,14 @@
#include "GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/Application/Application.h"
+#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Items/SessionItemUtils.h"
-#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
-#include "GUI/Project/projectmanager.h"
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 961cd4a99b3..b33a95f9313 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ConnectableView.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
+#include "GUI/utils/Error.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 6d3cf868fd9..f5da0b66316 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -13,8 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Sample/GUIExamplesFactory.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/ItemFactory.h"
#include "GUI/Items/MesoCrystalItem.h"
@@ -23,8 +22,10 @@
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Items/RotationItems.h"
+#include "GUI/Models/Parameter/FilterPropertyProxy.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
@@ -32,7 +33,6 @@
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/Views/SampleDesigner/SampleViewFactory.h"
-#include "GUI/Project/projectdocument.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/FormLayouter.cpp b/GUI/Views/SampleDesigner/FormLayouter.cpp
index 2e71e9c8eb9..de2ac7e28a2 100644
--- a/GUI/Views/SampleDesigner/FormLayouter.cpp
+++ b/GUI/Views/SampleDesigner/FormLayouter.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/FormLayouter.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Models/Types/UIntDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/FormLayouter.h b/GUI/Views/SampleDesigner/FormLayouter.h
index 70d8fc12d24..b1ae3f23cc3 100644
--- a/GUI/Views/SampleDesigner/FormLayouter.h
+++ b/GUI/Views/SampleDesigner/FormLayouter.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_FORMLAYOUTER_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_FORMLAYOUTER_H
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Group/SelectionDescriptor.h"
-#include "GUI/utils/Unit.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
+#include "GUI/utils/Unit.h"
#include <QFormLayout>
class QWidget;
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index a8ee9a04b47..34c761d6a25 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/utils/Error.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
+#include "GUI/utils/Error.h"
#include <QGraphicsSceneMouseEvent>
QLineF MultiLayerCandidate::getInterfaceToScene()
diff --git a/GUI/Views/SampleDesigner/InterferenceForm.cpp b/GUI/Views/SampleDesigner/InterferenceForm.cpp
index 994b01f87ef..a15a23aeee9 100644
--- a/GUI/Views/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceForm.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/ParticleLayoutItem.h"
-#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
+#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
#include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
index 5a429ba9494..bf82525f465 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Items/FTDecayFunctionItems.h"
#include "GUI/Items/FTDistributionItems.h"
#include "GUI/Items/FormFactorItems.h"
@@ -23,7 +24,6 @@
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/RotationItems.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
diff --git a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
index 15cc245ff8e..91eabfd4f9f 100644
--- a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
+#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
-#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index 88c7f1b5c1e..806808cec78 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerView.h"
-#include "GUI/Items/LayerItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Items/LayerItem.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index ab0c2bd58a8..27ae846cde5 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -13,19 +13,19 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/CommonWidgets/DoubleLineEdit.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
+#include "GUI/Items/ModelPath.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
-#include "GUI/Items/ModelPath.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/CommonWidgets/DoubleLineEdit.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/Project/projectmanager.h"
#include "GUI/utils/LayoutUtils.h"
#include <QGridLayout>
diff --git a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
index 08086e1f2a9..eef4f0c3667 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
@@ -17,8 +17,8 @@
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
+#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
diff --git a/GUI/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
index b5406a7b7bb..89d861bea5f 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MesoCrystalView.h"
-#include "GUI/Items/MesoCrystalItem.h"
-#include "GUI/Items/ParticleItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/MesoCrystalItem.h"
+#include "GUI/Items/ParticleItem.h"
MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/MultiLayerForm.cpp b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
index d068f23ecbf..7e3ada05559 100644
--- a/GUI/Views/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index a04243979f9..1d86b992598 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
-#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Items/SessionGraphicsItem.h"
+#include "GUI/Models/Sample/SampleModel.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/ParticleCompositionForm.cpp b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
index a19daf21eb4..4dcc66b7cdb 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
+#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
index 11127766c48..b5b27ad1ece 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCompositionView.h"
-#include "GUI/Items/ParticleItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/ParticleItem.h"
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index ad84577dd25..e154b03750d 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
index ff9166f5c69..4d254fc6e76 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCoreShellView.h"
-#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/Items/ParticleCoreShellItem.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleForm.cpp b/GUI/Views/SampleDesigner/ParticleForm.cpp
index 250d59bd064..e3630ca9339 100644
--- a/GUI/Views/SampleDesigner/ParticleForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleForm.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleForm.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/ParticleItem.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/FormLayouter.h"
+#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index 31ac623f4d9..59d0acf3172 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Items/SessionItem.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/Items/SessionItem.h"
#include "GUI/Views/SampleDesigner/ParticleView.h"
+#include "GUI/utils/Error.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index 9c717c2a0b8..f3b1fbd1785 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleView.h"
-#include "GUI/utils/Error.h"
+#include "GUI/CommonWidgets/DesignerHelper.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ParticleItem.h"
-#include "GUI/CommonWidgets/DesignerHelper.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
+#include "GUI/utils/Error.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/SampleEditorController.cpp b/GUI/Views/SampleDesigner/SampleEditorController.cpp
index 926275cb001..3fb0df02ac6 100644
--- a/GUI/Views/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/Views/SampleDesigner/SampleEditorController.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
+#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/MultiLayerItem.h"
@@ -21,7 +22,6 @@
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Models/Types/UIntDescriptor.h"
-#include "GUI/CommonWidgets/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index 8e8868ec9bc..49f42e3a971 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -14,12 +14,12 @@
#include "GUI/Views/SampleDesigner/SampleListView.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Sample/GUIExamplesFactory.h"
+#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
#include "GUI/Items/MultiLayerItem.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleListModel.h"
-#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
-#include "GUI/utils/ItemDelegateForHTML.h"
#include "GUI/Project/projectmanager.h"
+#include "GUI/utils/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
#include <QDialogButtonBox>
@@ -143,8 +143,8 @@ void SampleListView::createNewSample()
void SampleListView::createSampleFromLibrary(const QString& classname, const QString& title,
const QString& description)
{
- const QModelIndex newIndex = m_model->createSampleFromExamples(classname, title, description,
- ProjectManager::instance()->document()->materialModel());
+ const QModelIndex newIndex = m_model->createSampleFromExamples(
+ classname, title, description, ProjectManager::instance()->document()->materialModel());
setCurrentIndex(newIndex);
}
diff --git a/GUI/Views/SampleDesigner/SampleToolBar.cpp b/GUI/Views/SampleDesigner/SampleToolBar.cpp
index fdc54d9c0c0..06dfae4635c 100644
--- a/GUI/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBar.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleToolBar.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/Project/projectmanager.h"
#include <QAction>
#include <QButtonGroup>
#include <QComboBox>
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index b03bf6fbc27..b6f52db06a9 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/Sample/GUIExamplesFactory.h"
#include "GUI/Items/ItemCatalog.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Items/TransformationItem.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.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 f88205f8f81..3e79c5d2d87 100644
--- a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
-#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Items/ItemCatalog.h"
+#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/ItemTreeView.h"
#include <QAction>
diff --git a/GUI/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
index 5d778d0cb9f..a78bcd9f34c 100644
--- a/GUI/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
+#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/IView.h"
#include <QModelIndex>
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
index 84328ebc856..9f7691f6867 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/Views/SampleDesigner/ScriptPanel.cpp
@@ -14,13 +14,13 @@
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "Core/Export/ExportToPython.h"
-#include "GUI/Models/Domain/DomainObjectBuilder.h"
-#include "GUI/Items/MultiLayerItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/CommonWidgets/UpdateTimer.h"
-#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/Items/MultiLayerItem.h"
+#include "GUI/Models/Domain/DomainObjectBuilder.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "Sample/Multilayer/MultiLayer.h"
#include <QScrollBar>
diff --git a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
index c8ebbcc7c16..08a866e70d5 100644
--- a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -16,12 +16,12 @@
#include "Core/Export/ExportToPython.h"
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include "GUI/CommonWidgets/DesignerHelper.h"
#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/CommonWidgets/StyledToolBar.h"
-#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
#include "GUI/InfoWidgets/CautionSign.h"
+#include "GUI/InfoWidgets/PythonSyntaxHighlighter.h"
+#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index db4903f7a8d..e8e717b5be6 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -14,9 +14,9 @@
#include "GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
-#include "GUI/Project/projectmanager.h"
#include <qcustomplot.h>
SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
index d1bb3e28229..c66577c16e0 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
@@ -14,12 +14,12 @@
#include "GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h"
#include "GUI/DataLoaders/DataLoaderUtil.h"
-#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
#include "GUI/Items/DataItemUtils.h"
-#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
+#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/mainwindow/mainwindow.h"
#include "ui_SpecularDataImportWidget.h"
#include <QAction>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
index 472c5e46678..e231c1ec932 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
-#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/CommonWidgets/SessionItemWidget.h"
+#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "qcustomplot.h"
#include <memory>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
index f65e3fb396e..3e576cf8504 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SpecularDataWidgets/SpecularPlot.h"
+#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/SpecularDataItem.h"
-#include "GUI/CommonWidgets/UpdateTimer.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
diff --git a/GUI/Views/Toplevel/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
index 46b48f4ca15..26c5a6575bb 100644
--- a/GUI/Views/Toplevel/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -15,10 +15,10 @@
#include "GUI/Views/Toplevel/ImportDataView.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
-#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QAction>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
index 4b09cff2165..5ce18b63e56 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -17,8 +17,8 @@
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Project/projectdocument.h"
+#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/utils/qstringutils.h"
#include "ui_ProjectSettingsView.h"
#include <QDir>
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index b002a8a1649..42e014be61f 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -13,10 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SampleView.h"
+#include "GUI/CommonWidgets/DocksController.h"
+#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Items/MultiLayerItem.h"
-#include "GUI/CommonWidgets/DocksController.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
@@ -28,7 +29,6 @@
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
#include <QBoxLayout>
#include <QDockWidget>
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 92e95c2a4ad..f94c6e33e7a 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -13,17 +13,17 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SessionModelView.h"
+#include "GUI/CommonWidgets/ModelTreeView.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/Data/RealDataModel.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/CommonWidgets/ModelTreeView.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Views/Toplevel/TestView.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
-#include "GUI/Project/projectmanager.h"
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 808dedd6b8f..0354ee0259e 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -13,24 +13,24 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SimulationView.h"
-#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Items/SimulationOptionsItem.h"
+#include "GUI/Mapper/ModelUtils.h"
+#include "GUI/Models/Data/ApplicationModels.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/Sample/SampleModel.h"
#include "GUI/Models/Sample/SampleValidator.h"
-#include "GUI/Items/SimulationOptionsItem.h"
+#include "GUI/Project/projectdocument.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectdocument.h"
-#include "GUI/Project/projectmanager.h"
#include "ui_SimulationView.h"
#include <QButtonGroup>
#include <QMessageBox>
diff --git a/GUI/Views/Toplevel/TestView.cpp b/GUI/Views/Toplevel/TestView.cpp
index 8a7a6124243..2b7314b68fa 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/Items/Data1DViewItem.h"
-#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/MinimizerItem.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/Views/PropertyEditor/TestComponentView.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceWidget.h"
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index d5c7e51489f..f689375c16e 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Project/projectmanager.h"
+#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/utils/LayoutUtils.h"
#include "GUI/utils/qstringutils.h"
#include "ui_WelcomeView.h"
diff --git a/GUI/mainwindow/LinkInstrumentManager.cpp b/GUI/mainwindow/LinkInstrumentManager.cpp
index c63e5cbf547..4f2cf20c6e3 100644
--- a/GUI/mainwindow/LinkInstrumentManager.cpp
+++ b/GUI/mainwindow/LinkInstrumentManager.cpp
@@ -14,9 +14,9 @@
#include "GUI/mainwindow/LinkInstrumentManager.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/mainwindow/mainwindow.h"
#include <QMessageBox>
diff --git a/GUI/mainwindow/OutputDataIOService.cpp b/GUI/mainwindow/OutputDataIOService.cpp
index ece8c58392b..7a892b44e74 100644
--- a/GUI/mainwindow/OutputDataIOService.cpp
+++ b/GUI/mainwindow/OutputDataIOService.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/mainwindow/OutputDataIOService.h"
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/ModelPath.h"
-#include "GUI/utils/SaveLoadInterface.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/MessageService.h"
+#include "GUI/utils/SaveLoadInterface.h"
#include <QFile>
#include <QSet>
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index e724e228b28..3e7d1c24c5e 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -19,14 +19,14 @@
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/Models/Data/GUIObjectBuilder.h"
-#include "GUI/utils/GUIHelpers.h"
#include "GUI/InfoWidgets/ComboSelectorDialog.h"
#include "GUI/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/Models/Data/GUIObjectBuilder.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Project/ProjectUtils.h"
-#include "GUI/mainwindow/mainwindow.h"
#include "GUI/Project/projectmanager.h"
+#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/mainwindow/SaveService.cpp
index 6636d7bcf2d..54219729be7 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/mainwindow/SaveService.cpp
@@ -14,11 +14,11 @@
#include "GUI/mainwindow/SaveService.h"
#include "Base/Utils/Assert.h"
-#include "GUI/utils/Error.h"
-#include "GUI/mainwindow/AutosaveController.h"
#include "GUI/Project/ProjectUtils.h"
-#include "GUI/mainwindow/SaveThread.h"
#include "GUI/Project/projectdocument.h"
+#include "GUI/mainwindow/AutosaveController.h"
+#include "GUI/mainwindow/SaveThread.h"
+#include "GUI/utils/Error.h"
#include <QApplication>
#include <QCoreApplication>
#include <QTime>
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
index 6a7c537d800..22179bf307e 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/mainwindow/actionmanager.cpp
@@ -16,14 +16,14 @@
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/Application.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/utils/mainwindow_constants.h"
#include "GUI/mainwindow/PyImportAssistant.h"
#include "GUI/mainwindow/aboutapplicationdialog.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/Project/projectmanager.h"
#include "GUI/utils/hostosinfo.h"
+#include "GUI/utils/mainwindow_constants.h"
#include "GUI/utils/qstringutils.h"
#include <QDesktopServices>
#include <QDir>
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index 837221a67ef..abc170c6675 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -16,19 +16,19 @@
#include "GUI/Application/Application.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Views/Toplevel/ImportDataView.h"
+#include "GUI/Project/projectmanager.h"
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
#include "GUI/Views/JobWidgets/JobView.h"
+#include "GUI/Views/Toplevel/ImportDataView.h"
#include "GUI/Views/Toplevel/ProjectSettingsView.h"
#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Views/Toplevel/SimulationView.h"
-#include "GUI/utils/mainwindow_constants.h"
#include "GUI/Views/Toplevel/WelcomeView.h"
#include "GUI/mainwindow/actionmanager.h"
-#include "GUI/Project/projectmanager.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
+#include "GUI/utils/mainwindow_constants.h"
#include <QAction>
#include <QBoxLayout>
#include <QButtonGroup>
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 589313aeee0..f6f6daecfaf 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -19,13 +19,13 @@
#include "Device/Data/DataUtils.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Histo/SimulationResult.h"
+#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Domain/DomainSimulationBuilder.h"
-#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
-#include "GUI/Items/InstrumentItems.h"
+#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Material/MaterialModel.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Sample/SampleModel.h"
#include <iostream>
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 843f41e33c7..5a1d795766c 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -2,9 +2,9 @@
#include "Base/Axis/VariableBinAxis.h"
#include "Base/Const/Units.h"
#include "GUI/Items/AxesItems.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/PropertyItem.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
+#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
class TestAxesItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index d64134355a9..6971027667d 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -1,15 +1,15 @@
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Mapper/ComponentProxyModel.h"
-#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/LayerItem.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/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 cfee508bb01..aeb398dc929 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/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 bf72686b270..744463ba495 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -1,12 +1,12 @@
-#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/DataItem.h"
+#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
-#include "GUI/utils/Error.h"
#include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Project/projectdocument.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 9531816ab65..ac141154187 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/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/RectangularDetectorItem.h"
#include "GUI/Items/ResolutionFunctionItems.h"
#include "GUI/Items/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 ddfe77e2a71..fab1c4f4dd7 100644
--- a/Tests/Unit/GUI/TestFitParameterModel.cpp
+++ b/Tests/Unit/GUI/TestFitParameterModel.cpp
@@ -1,6 +1,6 @@
#include "GUI/Items/FitParameterItems.h"
-#include "GUI/Models/Fit/FitParameterProxyModel.h"
#include "GUI/Items/FitSuiteItem.h"
+#include "GUI/Models/Fit/FitParameterProxyModel.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 2179a8dbf02..812ab162d95 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,10 +1,10 @@
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/DistributionItems.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Models/Group/ComboProperty.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 c452bc8a8d1..578f3c480ba 100644
--- a/Tests/Unit/GUI/TestLayerItems.cpp
+++ b/Tests/Unit/GUI/TestLayerItems.cpp
@@ -1,6 +1,6 @@
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MaterialItem.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Material/MaterialModel.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 9dddab7f252..0565bc63107 100644
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/LayerRoughnessItems.h"
#include "GUI/Models/Domain/TransformFromDomain.h"
#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
class TestLayerRoughnessItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 8233cf6e20d..d108156ef68 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,10 +1,10 @@
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/JobItemUtils.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Items/RectangularDetectorItem.h"
+#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Project/projectdocument.h"
#include "GUI/mainwindow/LinkInstrumentManager.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
index 6460808b06d..1ba5d6093b1 100644
--- a/Tests/Unit/GUI/TestMapperCases.cpp
+++ b/Tests/Unit/GUI/TestMapperCases.cpp
@@ -1,13 +1,13 @@
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/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 f8771dbbe0b..59f0b99a5ae 100644
--- a/Tests/Unit/GUI/TestMapperForItem.cpp
+++ b/Tests/Unit/GUI/TestMapperForItem.cpp
@@ -1,10 +1,10 @@
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ProjectionItems.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/Models/Sample/SampleModel.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 ad343475edf..e3caf5c72e1 100644
--- a/Tests/Unit/GUI/TestModelUtils.cpp
+++ b/Tests/Unit/GUI/TestModelUtils.cpp
@@ -1,8 +1,8 @@
#include "GUI/Items/LayerItem.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Mapper/ModelUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QVector>
diff --git a/Tests/Unit/GUI/TestMultiLayerItem.cpp b/Tests/Unit/GUI/TestMultiLayerItem.cpp
index 1e84195ea3d..eab7d468fd5 100644
--- a/Tests/Unit/GUI/TestMultiLayerItem.cpp
+++ b/Tests/Unit/GUI/TestMultiLayerItem.cpp
@@ -1,8 +1,8 @@
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/LayerRoughnessItems.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
class TestMultiLayerItem : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 317a17a7881..1a7909e0894 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,17 +1,17 @@
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Items/DataItem.h"
-#include "GUI/utils/Error.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/JobItemUtils.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/JobModelFunctions.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/mainwindow/OutputDataIOService.h"
+#include "GUI/Models/Job/JobModel.h"
#include "GUI/Project/ProjectUtils.h"
+#include "GUI/mainwindow/OutputDataIOService.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestParaCrystalItems.cpp b/Tests/Unit/GUI/TestParaCrystalItems.cpp
index a43f6ed5ebc..36848f74729 100644
--- a/Tests/Unit/GUI/TestParaCrystalItems.cpp
+++ b/Tests/Unit/GUI/TestParaCrystalItems.cpp
@@ -5,8 +5,8 @@
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
-#include "GUI/Models/Sample/SampleModel.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 f1e4e2726e2..502a4706a46 100644
--- a/Tests/Unit/GUI/TestParticleCoreShell.cpp
+++ b/Tests/Unit/GUI/TestParticleCoreShell.cpp
@@ -1,10 +1,10 @@
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/Unit/GUI/TestParticleItem.cpp b/Tests/Unit/GUI/TestParticleItem.cpp
index 389f3a51c71..866888ea5b9 100644
--- a/Tests/Unit/GUI/TestParticleItem.cpp
+++ b/Tests/Unit/GUI/TestParticleItem.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ParticleCompositionItem.h"
#include "GUI/Items/ParticleItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Models/Types/DoubleDescriptor.h"
#include "Tests/GTestWrapper/google_test.h"
using namespace GUI::Session::ItemUtils;
diff --git a/Tests/Unit/GUI/TestParticleLayoutItem.h b/Tests/Unit/GUI/TestParticleLayoutItem.h
index c5d72a2a66c..8c4b1c909a2 100644
--- a/Tests/Unit/GUI/TestParticleLayoutItem.h
+++ b/Tests/Unit/GUI/TestParticleLayoutItem.h
@@ -5,8 +5,8 @@
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/Lattice2DItems.h"
#include "GUI/Items/ParticleLayoutItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/Models/Sample/SampleModel.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 0912012fd40..980bdaa711d 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,10 +1,10 @@
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItemUtils.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/RealDataModel.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Project/ProjectUtils.h"
#include "GUI/Project/projectdocument.h"
#include "GUI/utils/Helpers.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index 4b7ba6c0d82..19680662b92 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,6 +1,6 @@
-#include "GUI/utils/Error.h"
#include "GUI/Items/ItemFileNameUtils.h"
#include "GUI/Project/ProjectUtils.h"
+#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
#include <QDir>
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index 0dea3e35049..78143c69273 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -1,12 +1,12 @@
-#include "GUI/Mapper/ComponentProxyModel.h"
-#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
-#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/PropertyItem.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ModelUtils.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 63bb0df7ac2..695e73cb417 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/Items/FormFactorItems.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/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 ca07130f531..28eb5bdcfbe 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,15 +1,15 @@
-#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItemUtils.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/mainwindow/AutosaveController.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Project/ProjectUtils.h"
-#include "GUI/mainwindow/SaveService.h"
#include "GUI/Project/projectdocument.h"
+#include "GUI/mainwindow/AutosaveController.h"
+#include "GUI/mainwindow/SaveService.h"
+#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 6bd8ed46b6c..28605f9d08b 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -1,20 +1,20 @@
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Items/DataItem.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/ItemFileNameUtils.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/JobModelFunctions.h"
#include "GUI/Items/PointwiseAxisItem.h"
#include "GUI/Items/SpecularBeamInclinationItem.h"
-#include "GUI/mainwindow/OutputDataIOService.h"
+#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Models/Job/JobModel.h"
#include "GUI/Project/ProjectUtils.h"
+#include "GUI/mainwindow/OutputDataIOService.h"
+#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestSessionItemController.cpp b/Tests/Unit/GUI/TestSessionItemController.cpp
index 248e4286dce..2800db32d7a 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -1,6 +1,6 @@
+#include "GUI/CommonWidgets/SessionItemController.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/CommonWidgets/SessionItemController.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
#include <QObject>
diff --git a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
index 3d77d894f4b..13491b06f9e 100644
--- a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
+++ b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
@@ -1,6 +1,6 @@
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
-#include "GUI/Items/SessionItem.h"
#include "GUI/CommonWidgets/SessionItemController.h"
+#include "GUI/Items/SessionItem.h"
TestListener::TestListener()
: m_onItemDestroyedCount(0), m_onPropertyChangeCount(0), m_onWidgetDestroyed(0)
diff --git a/Tests/Unit/GUI/TestSessionItemTags.cpp b/Tests/Unit/GUI/TestSessionItemTags.cpp
index aea9cd80f90..a9fd63c9685 100644
--- a/Tests/Unit/GUI/TestSessionItemTags.cpp
+++ b/Tests/Unit/GUI/TestSessionItemTags.cpp
@@ -1,7 +1,7 @@
-#include "GUI/utils/Error.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/SessionItemTags.h"
+#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemTags : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index a785819f5a9..5baadfca5bb 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,8 +1,8 @@
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/PropertyItem.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Items/VectorItem.h"
+#include "GUI/Models/Group/ComboProperty.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 4a8a9695ed1..169a93748ed 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,15 +1,15 @@
#include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MaskItems.h"
-#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/PropertyItem.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Items/SessionItemTags.h"
#include "GUI/Items/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 "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
#include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 8001678d5c2..29191e0961f 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -16,10 +16,10 @@
#include "Tests/Unit/GUI/Utils.h"
#include "Device/Data/DataUtils.h"
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/utils/Error.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Project/ProjectUtils.h"
+#include "GUI/utils/Error.h"
#include <QDir>
namespace {
--
GitLab