From da82311fd8558e1343f3d247e0200dc18f2bdb05 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 28 Dec 2021 12:13:25 +0100
Subject: [PATCH] clang-format
---
GUI/Model/Data/ApplicationModels.cpp | 2 +-
GUI/Model/Data/DataProperties.cpp | 2 +-
GUI/Model/Fit/FitParameterModel.cpp | 3 +--
GUI/Model/Fit/ParameterTreeItems.cpp | 2 +-
GUI/Model/Group/ItemCatalog.cpp | 2 +-
GUI/Model/Job/JobItem.h | 4 ++--
GUI/Model/Job/JobItemUtils.cpp | 4 ++--
GUI/Model/Material/MaterialModel.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 4 ++--
GUI/Model/Project/ProjectDocument.h | 2 +-
GUI/Model/S1/Serializer.h | 2 +-
GUI/Model/S3/SessionXML.cpp | 2 +-
GUI/Model/S3/SessionXML.h | 2 +-
GUI/Model/S5/SimulationOptionsItem.cpp | 6 ++++--
GUI/Model/S7/ModelPath.h | 2 +-
GUI/Model/Sample/InterferenceItems.cpp | 2 +-
GUI/Model/Sample/InterferenceItems.h | 2 +-
GUI/Model/Sample/ItemWithParticles.cpp | 2 +-
GUI/Model/Sample/ItemWithParticles.h | 2 +-
GUI/Model/Sample/MesoCrystalItem.cpp | 2 +-
GUI/Model/Sample/MesoCrystalItem.h | 2 +-
GUI/Model/Sample/MultiLayerItem.cpp | 2 +-
GUI/Model/Sample/ParticleCompositionItem.cpp | 2 +-
GUI/Model/Sample/ParticleCoreShellItem.cpp | 2 +-
GUI/Model/Sample/ParticleItem.cpp | 2 +-
GUI/Model/Sample/ParticleItem.h | 2 +-
GUI/Model/Sample/ParticleLayoutItem.cpp | 2 +-
GUI/Model/Sample/ParticleLayoutItem.h | 2 +-
GUI/Model/Sample/SampleModel.cpp | 2 +-
GUI/Model/Session/SessionModel.cpp | 2 +-
GUI/Model/Session/SessionModel.h | 4 ++--
GUI/Model/T0/SessionItem.cpp | 4 ++--
GUI/Model/To/DomainSimulationBuilder.cpp | 2 +-
GUI/Util/VariantUtil.cpp | 3 +--
GUI/View/Import/RealDataPresenter.cpp | 2 +-
GUI/View/Instrument/DistributionForms.cpp | 2 +-
GUI/View/Job/JobResultsPresenter.cpp | 6 +++---
GUI/View/Mask/MaskEditorCanvas.cpp | 6 +++---
GUI/View/Mask/MaskGraphicsProxy.cpp | 2 +-
.../PlotComparison/FitComparisonWidget.cpp | 2 +-
.../PlotComparison/FitComparisonWidget1D.cpp | 2 +-
GUI/View/PlotComparison/Plot1D.cpp | 2 +-
GUI/View/PlotComparison/Plot1DCanvas.cpp | 2 +-
GUI/View/PlotSpecular/SpecularDataCanvas.cpp | 2 +-
GUI/View/PlotSpecular/SpecularDataWidget.cpp | 2 +-
GUI/View/PlotSpecular/SpecularPlot.cpp | 2 +-
GUI/View/PlotSpecular/SpecularPlotCanvas.cpp | 2 +-
GUI/View/PlotUtil/ColorMap.cpp | 2 +-
GUI/View/Projection/ProjectionsEditor.cpp | 2 +-
.../Projection/ProjectionsEditorCanvas.cpp | 4 ++--
GUI/View/Projection/ProjectionsPlot.cpp | 2 +-
GUI/View/PropertyEditor/CustomEditors.cpp | 2 +-
.../PropertyEditor/PropertyEditorFactory.cpp | 2 +-
.../SampleDesigner/MaterialInplaceForm.cpp | 2 +-
.../SampleDesigner/SampleEditorCommands.cpp | 2 +-
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/Toplevel/SessionModelView.cpp | 2 +-
GUI/View/Toplevel/SimulationView.cpp | 2 +-
Tests/Functional/GUI/Check.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 2 +-
Tests/Unit/GUI/TestParticleLayoutItem.h | 16 ++++++++--------
Tests/Unit/GUI/TestSessionItemData.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemTags.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemUtils.cpp | 18 +++++++-----------
Tests/Unit/GUI/TestSessionModel.cpp | 2 +-
Tests/Unit/GUI/TestSessionXML.cpp | 2 +-
66 files changed, 92 insertions(+), 96 deletions(-)
diff --git a/GUI/Model/Data/ApplicationModels.cpp b/GUI/Model/Data/ApplicationModels.cpp
index 656a0c0c08d..592dbac38cb 100644
--- a/GUI/Model/Data/ApplicationModels.cpp
+++ b/GUI/Model/Data/ApplicationModels.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/S5/SimulationOptionsItem.h"
+#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Util/DeserializationException.h"
#include <QXmlStreamWriter>
diff --git a/GUI/Model/Data/DataProperties.cpp b/GUI/Model/Data/DataProperties.cpp
index b4946ec22af..62acdce4a95 100644
--- a/GUI/Model/Data/DataProperties.cpp
+++ b/GUI/Model/Data/DataProperties.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Data/DataProperties.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/Fit/FitParameterModel.cpp b/GUI/Model/Fit/FitParameterModel.cpp
index e37f507e9f7..fab2c405503 100644
--- a/GUI/Model/Fit/FitParameterModel.cpp
+++ b/GUI/Model/Fit/FitParameterModel.cpp
@@ -387,8 +387,7 @@ QModelIndex FitParameterModel::indexOfItem(SessionItem* item) const
else if (item == fitParam->maximumItem())
col = COL_MAX;
if (col)
- return createIndex(
- parent_item->parentRow(), col.value(), item);
+ return createIndex(parent_item->parentRow(), col.value(), item);
} else if (parent_item->hasModelType<FitParameterLinkItem>()) {
QVector<FitParameterLinkItem*> links =
polymorphic_downcast<FitParameterItem*>(parent_item->parent())->linkItems();
diff --git a/GUI/Model/Fit/ParameterTreeItems.cpp b/GUI/Model/Fit/ParameterTreeItems.cpp
index 1d1a607448b..f7c39afb3d3 100644
--- a/GUI/Model/Fit/ParameterTreeItems.cpp
+++ b/GUI/Model/Fit/ParameterTreeItems.cpp
@@ -17,10 +17,10 @@
#include "GUI/Model/Job/JobModelFunctions.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Util/XML.h"
#include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Path.h"
+#include "GUI/Util/XML.h"
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
diff --git a/GUI/Model/Group/ItemCatalog.cpp b/GUI/Model/Group/ItemCatalog.cpp
index 82dc5b05c95..6698bb7b022 100644
--- a/GUI/Model/Group/ItemCatalog.cpp
+++ b/GUI/Model/Group/ItemCatalog.cpp
@@ -40,6 +40,7 @@
#include "GUI/Model/Instrument/SpecularBeamInclinationItem.h"
#include "GUI/Model/Instrument/SphericalDetectorItem.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/S4/RealLimitsItems.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
@@ -47,7 +48,6 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/S4/RealLimitsItems.h"
#include "GUI/Util/Error.h"
ItemCatalog::ItemCatalog()
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index d2c8a63b47f..4b4c5812197 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -18,10 +18,10 @@
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Job/JobStatus.h" // enum cannot be forward declared
#include "GUI/Model/Material/MaterialModel.h"
+#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/T0/SessionItem.h"
#include "GUI/Model/Session/SessionModel.h" // call to model() from templated fct
-#include "GUI/Model/S5/SimulationOptionsItem.h"
+#include "GUI/Model/T0/SessionItem.h"
#include <QDateTime>
#include <optional>
diff --git a/GUI/Model/Job/JobItemUtils.cpp b/GUI/Model/Job/JobItemUtils.cpp
index 4ebf2e934d6..03c1a9ec556 100644
--- a/GUI/Model/Job/JobItemUtils.cpp
+++ b/GUI/Model/Job/JobItemUtils.cpp
@@ -49,8 +49,8 @@ void GUI::Model::JobItemUtils::updateDataAxes(DataItem* intensityItem,
if (!intensityItem->getOutputData())
return;
- Axes::Coords requested_units = GUI::Util::CoordName::coordFromName(
- intensityItem->selectedCoords());
+ Axes::Coords requested_units =
+ GUI::Util::CoordName::coordFromName(intensityItem->selectedCoords());
auto* const converter = instrumentItem->createCoordSystem();
auto newData = converter->createOutputData(requested_units);
diff --git a/GUI/Model/Material/MaterialModel.cpp b/GUI/Model/Material/MaterialModel.cpp
index 53fde071378..039d1e4ff72 100644
--- a/GUI/Model/Material/MaterialModel.cpp
+++ b/GUI/Model/Material/MaterialModel.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Material/MaterialModel.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Util/XML.h"
#include "GUI/Util/DeserializationException.h"
+#include "GUI/Util/XML.h"
#include <QColor>
#include <QUuid>
#include <QXmlStreamWriter>
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 624d49f63f9..6bc7a8de9d3 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -19,11 +19,11 @@
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Project/OutputDataIOService.h"
+#include "GUI/Model/S1/Serializer.h"
+#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Model/S1/Serializer.h"
-#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 0a90d5a4fc9..35d05977b23 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -17,8 +17,8 @@
#include "GUI/Model/Data/ApplicationModels.h"
#include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/S5/SimulationOptionsItem.h"
+#include "GUI/Model/Sample/SampleModel.h"
#include <QObject>
#include <QVariant>
#include <memory>
diff --git a/GUI/Model/S1/Serializer.h b/GUI/Model/S1/Serializer.h
index 3adb8f19c25..e29b39fdd5b 100644
--- a/GUI/Model/S1/Serializer.h
+++ b/GUI/Model/S1/Serializer.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_S1_SERIALIZER_H
#define BORNAGAIN_GUI_MODEL_S1_SERIALIZER_H
-#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Group/SelectionProperty.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
#include <QXmlStreamWriter> // used in every including file
class DoubleProperty;
diff --git a/GUI/Model/S3/SessionXML.cpp b/GUI/Model/S3/SessionXML.cpp
index 7b0443f92a3..24d5020d1c0 100644
--- a/GUI/Model/S3/SessionXML.cpp
+++ b/GUI/Model/S3/SessionXML.cpp
@@ -14,12 +14,12 @@
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Util/SessionItemTags.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
+#include "GUI/Util/SessionItemTags.h"
#include "GUI/Util/XML.h"
#include <QColor>
#include <QUuid>
diff --git a/GUI/Model/S3/SessionXML.h b/GUI/Model/S3/SessionXML.h
index 14e17d49d21..d805288fa7e 100644
--- a/GUI/Model/S3/SessionXML.h
+++ b/GUI/Model/S3/SessionXML.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_S3_SESSIONXML_H
#define BORNAGAIN_GUI_MODEL_S3_SESSIONXML_H
-#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Group/SelectionProperty.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
#include <QVariant>
#include <QXmlStreamWriter> // used in every including file
#include <heinz/Complex.h>
diff --git a/GUI/Model/S5/SimulationOptionsItem.cpp b/GUI/Model/S5/SimulationOptionsItem.cpp
index 84e0fe57be9..d589016f1b2 100644
--- a/GUI/Model/S5/SimulationOptionsItem.cpp
+++ b/GUI/Model/S5/SimulationOptionsItem.cpp
@@ -121,7 +121,8 @@ void SimulationOptionsItem::writeContentTo(QXmlStreamWriter* writer) const
GUI::Session::XML::writeAttribute(writer, Tags::RunImmediately, m_runImmediately);
GUI::Session::XML::writeAttribute(writer, Tags::NumberOfThreads, m_numberOfThreads);
GUI::Session::XML::writeAttribute(writer, Tags::Analytical, m_computationMethodAnalytical);
- GUI::Session::XML::writeAttribute(writer, Tags::NumberOfMonteCarloPoints, m_numberOfMonteCarloPoints);
+ GUI::Session::XML::writeAttribute(writer, Tags::NumberOfMonteCarloPoints,
+ m_numberOfMonteCarloPoints);
GUI::Session::XML::writeAttribute(writer, Tags::UseAverageMaterials, m_useAverageMaterials);
GUI::Session::XML::writeAttribute(writer, Tags::IncludeSpecularPeak, m_includeSpecularPeak);
}
@@ -139,7 +140,8 @@ void SimulationOptionsItem::readContentFrom(QXmlStreamReader* reader)
m_runImmediately = GUI::Session::XML::readBoolAttribute(reader, Tags::RunImmediately);
m_numberOfThreads = GUI::Session::XML::readUIntAttribute(reader, Tags::NumberOfThreads);
m_computationMethodAnalytical = GUI::Session::XML::readBoolAttribute(reader, Tags::Analytical);
- m_numberOfMonteCarloPoints = GUI::Session::XML::readUIntAttribute(reader, Tags::NumberOfMonteCarloPoints);
+ m_numberOfMonteCarloPoints =
+ GUI::Session::XML::readUIntAttribute(reader, Tags::NumberOfMonteCarloPoints);
m_useAverageMaterials = GUI::Session::XML::readBoolAttribute(reader, Tags::UseAverageMaterials);
m_includeSpecularPeak = GUI::Session::XML::readBoolAttribute(reader, Tags::IncludeSpecularPeak);
}
diff --git a/GUI/Model/S7/ModelPath.h b/GUI/Model/S7/ModelPath.h
index f52c4f739b5..8dd9481ee87 100644
--- a/GUI/Model/S7/ModelPath.h
+++ b/GUI/Model/S7/ModelPath.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_S7_MODELPATH_H
#define BORNAGAIN_GUI_MODEL_S7_MODELPATH_H
+#include <QString>
#include <memory>
#include <vector>
-#include <QString>
class QModelIndex;
class SessionItem;
diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index 919799b4c92..3144686f167 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -14,13 +14,13 @@
#include "GUI/Model/Sample/InterferenceItems.h"
#include "Base/Const/Units.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/FTDecayFunctionItemCatalogs.h"
#include "GUI/Model/Sample/FTDecayFunctionItems.h"
#include "GUI/Model/Sample/FTDistributionItemCatalogs.h"
#include "GUI/Model/Sample/FTDistributionItems.h"
#include "GUI/Model/Sample/Lattice2DItemCatalog.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
-#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Types/UIntDescriptor.h"
#include "Sample/Aggregate/Interferences.h"
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index ff6dcd7199b..8fe2b492bd4 100644
--- a/GUI/Model/Sample/InterferenceItems.h
+++ b/GUI/Model/Sample/InterferenceItems.h
@@ -15,11 +15,11 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/FTDecayFunctionItems.h"
#include "GUI/Model/Sample/FTDistributionItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Types/UIntProperty.h"
#include <memory>
diff --git a/GUI/Model/Sample/ItemWithParticles.cpp b/GUI/Model/Sample/ItemWithParticles.cpp
index 436cc67a1d3..c59a0282d80 100644
--- a/GUI/Model/Sample/ItemWithParticles.cpp
+++ b/GUI/Model/Sample/ItemWithParticles.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "Base/Vector/RotMatrix.h"
-#include "GUI/Model/Sample/RotationItemCatalog.h"
#include "GUI/Model/S1/Serializer.h"
+#include "GUI/Model/Sample/RotationItemCatalog.h"
#include "Sample/Particle/IParticle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index 3920ceeabb1..3dd5fa54275 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/RotationItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Types/VectorProperty.h"
#include <memory>
diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index 7a01b913167..1bd719bdb18 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Sample/MesoCrystalItem.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
@@ -20,7 +21,6 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
-#include "GUI/Model/S1/Serializer.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/IBornFF.h"
diff --git a/GUI/Model/Sample/MesoCrystalItem.h b/GUI/Model/Sample/MesoCrystalItem.h
index 77231d7ae95..2273f7beead 100644
--- a/GUI/Model/Sample/MesoCrystalItem.h
+++ b/GUI/Model/Sample/MesoCrystalItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Types/VectorProperty.h"
#include "Sample/Lattice/Lattice3D.h"
#include <memory>
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index d8abc618dde..0187db37033 100644
--- a/GUI/Model/Sample/MultiLayerItem.cpp
+++ b/GUI/Model/Sample/MultiLayerItem.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/S3/SessionXML.h"
+#include "GUI/Model/Sample/LayerItem.h"
#include <QXmlStreamWriter>
MultiLayerItem::MultiLayerItem()
diff --git a/GUI/Model/Sample/ParticleCompositionItem.cpp b/GUI/Model/Sample/ParticleCompositionItem.cpp
index a5389e94ff1..e3f2fefbfa7 100644
--- a/GUI/Model/Sample/ParticleCompositionItem.cpp
+++ b/GUI/Model/Sample/ParticleCompositionItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleCompositionItem.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
-#include "GUI/Model/S1/Serializer.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Model/Sample/ParticleCoreShellItem.cpp b/GUI/Model/Sample/ParticleCoreShellItem.cpp
index 7fd31bbdc1e..90a1227ab25 100644
--- a/GUI/Model/Sample/ParticleCoreShellItem.cpp
+++ b/GUI/Model/Sample/ParticleCoreShellItem.cpp
@@ -15,11 +15,11 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Util/VariantUtil.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Util/Error.h"
+#include "GUI/Util/VariantUtil.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index 40fdb466589..9dd3e15d2f3 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -14,11 +14,11 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Material/MaterialItem.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/RotationItemCatalog.h"
-#include "GUI/Model/S1/Serializer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ParticleItem.h b/GUI/Model/Sample/ParticleItem.h
index a35c84bb71b..f62092de8e0 100644
--- a/GUI/Model/Sample/ParticleItem.h
+++ b/GUI/Model/Sample/ParticleItem.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include <memory>
class GroupItem;
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index 393774e0e0a..eaeca8c1ebd 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/InterferenceItemCatalog.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
@@ -20,7 +21,6 @@
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/S1/Serializer.h"
ParticleLayoutItem::ParticleLayoutItem()
{
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 16f39f07f17..b5789c26345 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
+#include "GUI/Model/Group/SelectionProperty.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Types/DoubleProperty.h"
-#include "GUI/Model/Group/SelectionProperty.h"
#include <QUuid>
#include <memory>
diff --git a/GUI/Model/Sample/SampleModel.cpp b/GUI/Model/Sample/SampleModel.cpp
index 18f39aafcbf..3ab4a631e04 100644
--- a/GUI/Model/Sample/SampleModel.cpp
+++ b/GUI/Model/Sample/SampleModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Sample/SampleModel.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/S1/Serializer.h"
#include <QApplication>
SampleModel::SampleModel() {}
diff --git a/GUI/Model/Session/SessionModel.cpp b/GUI/Model/Session/SessionModel.cpp
index 423805598ea..edea78df320 100644
--- a/GUI/Model/Session/SessionModel.cpp
+++ b/GUI/Model/Session/SessionModel.cpp
@@ -15,9 +15,9 @@
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Group/ItemFactory.h"
#include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Util/SessionItemTags.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
+#include "GUI/Util/SessionItemTags.h"
#include <QColor>
#include <QFile>
#include <QMimeData>
diff --git a/GUI/Model/Session/SessionModel.h b/GUI/Model/Session/SessionModel.h
index 1ff74b3e74f..ee1f48439c9 100644
--- a/GUI/Model/Session/SessionModel.h
+++ b/GUI/Model/Session/SessionModel.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONMODEL_H
#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONMODEL_H
-#include "GUI/Util/SessionFlags.h"
-#include "GUI/Model/T0/SessionItem.h"
#include "GUI/Model/S3/SessionXML.h"
+#include "GUI/Model/T0/SessionItem.h"
+#include "GUI/Util/SessionFlags.h"
#include <QStringList>
//! Base class for a GUI data collection.
diff --git a/GUI/Model/T0/SessionItem.cpp b/GUI/Model/T0/SessionItem.cpp
index 03869c015d6..6ac4046ae3d 100644
--- a/GUI/Model/T0/SessionItem.cpp
+++ b/GUI/Model/T0/SessionItem.cpp
@@ -15,10 +15,10 @@
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Group/ItemFactory.h"
#include "GUI/Model/Group/PropertyItem.h"
+#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/T2/SessionItemData.h"
#include "GUI/Util/SessionItemTags.h"
#include "GUI/Util/VariantUtil.h"
-#include "GUI/Model/Session/SessionModel.h"
//! Constructs new item with given model type. The type must be defined.
SessionItem::SessionItem(const QString& modelType)
@@ -105,7 +105,7 @@ SessionItem* SessionItem::childAt(int row) const
//! Returns row index of given child.
-int SessionItem::rowOfChild(SessionItem* child) const // TODO arg -> const
+int SessionItem::rowOfChild(SessionItem* child) const // TODO arg -> const
{
return m_children.indexOf(child);
}
diff --git a/GUI/Model/To/DomainSimulationBuilder.cpp b/GUI/Model/To/DomainSimulationBuilder.cpp
index e9481a1cab9..1d911a9bf97 100644
--- a/GUI/Model/To/DomainSimulationBuilder.cpp
+++ b/GUI/Model/To/DomainSimulationBuilder.cpp
@@ -27,8 +27,8 @@
#include "GUI/Model/Instrument/BeamWavelengthItem.h"
#include "GUI/Model/Instrument/FootprintItems.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/S5/SimulationOptionsItem.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/To/ToDomain.h"
#include "GUI/Util/Error.h"
#include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/Util/VariantUtil.cpp b/GUI/Util/VariantUtil.cpp
index fba8ceaf857..1783ae5d846 100644
--- a/GUI/Util/VariantUtil.cpp
+++ b/GUI/Util/VariantUtil.cpp
@@ -23,8 +23,7 @@ int GUI::Util::Variant::VariantType(const QVariant& variant)
return result;
}
-bool GUI::Util::Variant::CompatibleVariantTypes(const QVariant& oldValue,
- const QVariant& newValue)
+bool GUI::Util::Variant::CompatibleVariantTypes(const QVariant& oldValue, const QVariant& newValue)
{
// if olfValue is undefined than it is compatible with any value, otherwise newValue
// should have same variant type as oldValue
diff --git a/GUI/View/Import/RealDataPresenter.cpp b/GUI/View/Import/RealDataPresenter.cpp
index dd1913f4782..1e144437589 100644
--- a/GUI/View/Import/RealDataPresenter.cpp
+++ b/GUI/View/Import/RealDataPresenter.cpp
@@ -18,8 +18,8 @@
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/View/Import/SpecularDataImportWidget.h"
#include "GUI/View/Plot2D/IntensityDataWidget.h"
-#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
+#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
#include <QAction>
RealDataPresenter::RealDataPresenter(QWidget* parent) : ItemComboWidget(parent)
diff --git a/GUI/View/Instrument/DistributionForms.cpp b/GUI/View/Instrument/DistributionForms.cpp
index 6c90faaaf87..416a883ce28 100644
--- a/GUI/View/Instrument/DistributionForms.cpp
+++ b/GUI/View/Instrument/DistributionForms.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Instrument/DistributionForms.h"
#include "GUI/Model/Group/DistributionItems.h"
#include "GUI/Model/Instrument/ItemWithDistribution.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
#include "GUI/View/Instrument/DistributionEditor.h"
+#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
#include <QDoubleSpinBox>
#include <QFormLayout>
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index d232b7963f3..29c99f2a544 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -15,12 +15,12 @@
#include "GUI/View/Job/JobResultsPresenter.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/View/Job/JobViewActivities.h"
+#include "GUI/View/Plot2D/IntensityDataWidget.h"
#include "GUI/View/PlotComparison/FitComparisonWidget.h"
#include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
-#include "GUI/View/Plot2D/IntensityDataWidget.h"
-#include "GUI/View/Job/JobViewActivities.h"
-#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
+#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
JobResultsPresenter::JobResultsPresenter(QWidget* parent) : ItemComboWidget(parent)
{
diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp
index caf94c7a675..2b5fca17036 100644
--- a/GUI/View/Mask/MaskEditorCanvas.cpp
+++ b/GUI/View/Mask/MaskEditorCanvas.cpp
@@ -17,12 +17,12 @@
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/View/PlotUtil/ColorMap.h"
-#include "GUI/View/PlotUtil/PlotStatusLabel.h"
-#include "GUI/View/PlotUtil/SavePlotAssistant.h"
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/View/Mask/MaskGraphicsView.h"
#include "GUI/View/Mask/MaskResultsPresenter.h"
+#include "GUI/View/PlotUtil/ColorMap.h"
+#include "GUI/View/PlotUtil/PlotStatusLabel.h"
+#include "GUI/View/PlotUtil/SavePlotAssistant.h"
#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
diff --git a/GUI/View/Mask/MaskGraphicsProxy.cpp b/GUI/View/Mask/MaskGraphicsProxy.cpp
index 4d9b48c462f..dd593b23a10 100644
--- a/GUI/View/Mask/MaskGraphicsProxy.cpp
+++ b/GUI/View/Mask/MaskGraphicsProxy.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Mask/MaskGraphicsProxy.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/View/PlotUtil/ColorMap.h"
#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
+#include "GUI/View/PlotUtil/ColorMap.h"
#include <QGraphicsSceneMouseEvent>
MaskGraphicsProxy::MaskGraphicsProxy()
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index fecbb9555cb..3a9e92167d0 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -22,8 +22,8 @@
#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/PlotUtil/ColorMap.h"
#include "GUI/View/PlotUtil/ColorMapCanvas.h"
-#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include "GUI/View/PlotUtil/IntensityDataPropertyWidget.h"
+#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include <QAction>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index f66fa6371b6..8e2c5dd6a40 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -21,9 +21,9 @@
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/PlotComparison/Plot1D.h"
+#include "GUI/View/PlotComparison/Plot1DCanvas.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
-#include "GUI/View/PlotComparison/Plot1DCanvas.h"
#include <QAction>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/View/PlotComparison/Plot1D.cpp b/GUI/View/PlotComparison/Plot1D.cpp
index e29130698a7..6f06118cd5c 100644
--- a/GUI/View/PlotComparison/Plot1D.cpp
+++ b/GUI/View/PlotComparison/Plot1D.cpp
@@ -18,9 +18,9 @@
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Data/DataProperties.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
+#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/Tool/UpdateTimer.h"
namespace {
diff --git a/GUI/View/PlotComparison/Plot1DCanvas.cpp b/GUI/View/PlotComparison/Plot1DCanvas.cpp
index c60c8ef45ae..7ce9109d876 100644
--- a/GUI/View/PlotComparison/Plot1DCanvas.cpp
+++ b/GUI/View/PlotComparison/Plot1DCanvas.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/Plot1DCanvas.h"
-#include "GUI/View/PlotUtil/FontScalingEvent.h"
#include "GUI/View/PlotComparison/Plot1D.h"
+#include "GUI/View/PlotUtil/FontScalingEvent.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include <QVBoxLayout>
diff --git a/GUI/View/PlotSpecular/SpecularDataCanvas.cpp b/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
index fca224619b7..015b4ff5d5b 100644
--- a/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/View/PlotUtil/SavePlotAssistant.h"
#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
+#include "GUI/View/PlotUtil/SavePlotAssistant.h"
#include <qcustomplot.h>
SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
diff --git a/GUI/View/PlotSpecular/SpecularDataWidget.cpp b/GUI/View/PlotSpecular/SpecularDataWidget.cpp
index d4d3dd86fa1..5ecf16a76d5 100644
--- a/GUI/View/PlotSpecular/SpecularDataWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataWidget.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Data/DataItemUtils.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Util/ActionFactory.h"
-#include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
#include "GUI/View/PlotSpecular/SpecularDataCanvas.h"
+#include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
#include <QBoxLayout>
#include <QMenu>
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index cf3a3188c1a..46be01a2444 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/PlotSpecular/SpecularPlot.h"
#include "GUI/Model/Data/AxesItems.h"
#include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
+#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/Tool/UpdateTimer.h"
namespace {
diff --git a/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp b/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp
index 4bdb82030da..3f2a23843e9 100644
--- a/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/View/PlotSpecular/SpecularPlot.h"
#include "GUI/View/PlotUtil/FontScalingEvent.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
-#include "GUI/View/PlotSpecular/SpecularPlot.h"
#include <QVBoxLayout>
SpecularPlotCanvas::SpecularPlotCanvas(QWidget* parent)
diff --git a/GUI/View/PlotUtil/ColorMap.cpp b/GUI/View/PlotUtil/ColorMap.cpp
index 42bc0f5cdd1..4f122ef9043 100644
--- a/GUI/View/PlotUtil/ColorMap.cpp
+++ b/GUI/View/PlotUtil/ColorMap.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/PlotUtil/ColorMap.h"
#include "GUI/Model/Data/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
+#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/Tool/UpdateTimer.h"
namespace {
diff --git a/GUI/View/Projection/ProjectionsEditor.cpp b/GUI/View/Projection/ProjectionsEditor.cpp
index 7900b7caee9..e71d120ec12 100644
--- a/GUI/View/Projection/ProjectionsEditor.cpp
+++ b/GUI/View/Projection/ProjectionsEditor.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/Projection/ProjectionsEditor.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/View/PlotUtil/IntensityDataPropertyWidget.h"
#include "GUI/View/Projection/ProjectionsEditorActions.h"
#include "GUI/View/Projection/ProjectionsEditorCanvas.h"
#include "GUI/View/Projection/ProjectionsToolBar.h"
#include "GUI/View/Projection/ProjectionsWidget.h"
-#include "GUI/View/PlotUtil/IntensityDataPropertyWidget.h"
#include <QBoxLayout>
#include <QItemSelectionModel>
#include <QSplitter>
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index 2aa8a008b99..9fec5a7c8b4 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -16,11 +16,11 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/View/Mask/MaskGraphicsScene.h"
+#include "GUI/View/Mask/MaskGraphicsView.h"
#include "GUI/View/PlotUtil/ColorMap.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include "GUI/View/PlotUtil/ScientificPlotEvent.h"
-#include "GUI/View/Mask/MaskGraphicsScene.h"
-#include "GUI/View/Mask/MaskGraphicsView.h"
#include <QItemSelectionModel>
#include <QVBoxLayout>
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index c4216b7ccde..66a559f4d1f 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -19,8 +19,8 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
+#include "GUI/View/PlotUtil/RangeUtils.h"
#include <qcustomplot.h>
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/View/PropertyEditor/CustomEditors.cpp b/GUI/View/PropertyEditor/CustomEditors.cpp
index fd706999afc..fedb725516d 100644
--- a/GUI/View/PropertyEditor/CustomEditors.cpp
+++ b/GUI/View/PropertyEditor/CustomEditors.cpp
@@ -16,8 +16,8 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/ComboProperty.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
#include <QBoxLayout>
#include <QComboBox>
#include <cmath>
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
index ca4bdce457e..8da3500da78 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/Model/T0/SessionItem.h"
#include "GUI/Util/ComboProperty.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
#include "GUI/View/PropertyEditor/CustomEditors.h"
+#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
#include <QModelIndex>
#include <QSpinBox>
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 1f61047e012..3bf32fabb46 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/S7/ModelPath.h"
+#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/View/Edit/DoubleLineEdit.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorCommands.cpp b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
index e5c3e729e42..2915ae0a7c2 100644
--- a/GUI/View/SampleDesigner/SampleEditorCommands.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/SampleDesigner/SampleEditorCommands.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/S1/Serializer.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include <utility>
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index b134b7a863c..3ae7e3f22f6 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -16,11 +16,11 @@
#include "Base/Util/SysUtils.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/From/GUIExamplesFactory.h"
-#include "GUI/View/SampleDesigner/SampleListModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Util/OSInfo.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
+#include "GUI/View/SampleDesigner/SampleListModel.h"
#include "GUI/View/Tool/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index cb4d7a6eda1..dd0cf42684f 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -19,10 +19,10 @@
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/View/Toplevel/SessionDecorationModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Project/ProjectManager.h"
#include "GUI/View/Tool/StyleUtils.h"
+#include "GUI/View/Toplevel/SessionDecorationModel.h"
#include <QApplication>
#include <QStyledItemDelegate>
#include <QToolBar>
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index aaf4ee0e276..285421bb580 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -20,10 +20,10 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Sample/SampleValidator.h"
-#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Project/ProjectManager.h"
#include "GUI/View/Script/PythonScriptWidget.h"
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 74f2425d264..9a7192b7c31 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -23,9 +23,9 @@
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Material/MaterialModel.h"
+#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Model/S5/SimulationOptionsItem.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
#include <iostream>
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index d59e4209946..6285735b565 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,10 +1,10 @@
#include "GUI/Model/Group/DistributionItems.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Sample/FormFactorItems.h"
-#include "GUI/Util/VariantUtil.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
+#include "GUI/Util/VariantUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestParticleLayoutItem.h b/Tests/Unit/GUI/TestParticleLayoutItem.h
index 412fbd0772c..0040c3cd8c5 100644
--- a/Tests/Unit/GUI/TestParticleLayoutItem.h
+++ b/Tests/Unit/GUI/TestParticleLayoutItem.h
@@ -55,10 +55,10 @@ TEST_F(TestParticleLayoutItem, densityValue)
SampleModel model;
auto layout = model.insertItem<ParticleLayoutItem*>();
-// empty layout should have TotalDensity 0.01
+ // empty layout should have TotalDensity 0.01
EXPECT_EQ(layout->getItemValue(ParticleLayoutItem::P_TOTAL_DENSITY).toDouble(), 0.01);
-// adding 2d interference with default hexagonal lattice
+ // adding 2d interference with default hexagonal lattice
auto interference =
model.insertNewItem(Interference2DLatticeItem::M_TYPE, model.indexOfItem(layout), -1,
ParticleLayoutItem::T_INTERFERENCE);
@@ -72,14 +72,14 @@ TEST_F(TestParticleLayoutItem, densityValue)
EXPECT_DOUBLE_EQ(layout->getItemValue(ParticleLayoutItem::P_TOTAL_DENSITY).toDouble(),
expectedDensity);
-// changing hexagonal lattice length
+ // changing hexagonal lattice length
length = 100.0;
hexItem.setItemValue(HexagonalLattice2DItem::P_LATTICE_LENGTH, length);
expectedDensity = 1. / (length * length * std::sin(M_TWOPI / 3.0));
EXPECT_DOUBLE_EQ(layout->getItemValue(ParticleLayoutItem::P_TOTAL_DENSITY).toDouble(),
expectedDensity);
-// changing lattice type to square and checking new surface density
+ // changing lattice type to square and checking new surface density
interference->setGroupProperty(Interference2DLatticeItem::P_LATTICE_TYPE,
SquareLattice2DItem::M_TYPE);
auto& squareItem =
@@ -91,16 +91,16 @@ TEST_F(TestParticleLayoutItem, densityValue)
EXPECT_DOUBLE_EQ(layout->getItemValue(ParticleLayoutItem::P_TOTAL_DENSITY).toDouble(),
expectedDensity);
-// changing square lattice length
+ // changing square lattice length
length = 200.0;
squareItem.setItemValue(SquareLattice2DItem::P_LATTICE_LENGTH, length);
expectedDensity = 1. / (length * length);
EXPECT_DOUBLE_EQ(layout->getItemValue(ParticleLayoutItem::P_TOTAL_DENSITY).toDouble(),
expectedDensity);
-// removing interference function, density should remain the same
-// (we could return density of ParticleLayout to initial value 1,
-// but probably it's not necessary)
+ // removing interference function, density should remain the same
+ // (we could return density of ParticleLayout to initial value 1,
+ // but probably it's not necessary)
layout->takeRow(interference->parentRow());
delete interference;
EXPECT_DOUBLE_EQ(layout->getItemValue(ParticleLayoutItem::P_TOTAL_DENSITY).toDouble(),
diff --git a/Tests/Unit/GUI/TestSessionItemData.cpp b/Tests/Unit/GUI/TestSessionItemData.cpp
index 2878f195090..7c0cbdabe96 100644
--- a/Tests/Unit/GUI/TestSessionItemData.cpp
+++ b/Tests/Unit/GUI/TestSessionItemData.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Util/SessionFlags.h"
#include "GUI/Model/T2/SessionItemData.h"
+#include "GUI/Util/SessionFlags.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemData : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionItemTags.cpp b/Tests/Unit/GUI/TestSessionItemTags.cpp
index c9da14966ad..44eb6f462e6 100644
--- a/Tests/Unit/GUI/TestSessionItemTags.cpp
+++ b/Tests/Unit/GUI/TestSessionItemTags.cpp
@@ -1,7 +1,7 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Util/SessionItemTags.h"
#include "GUI/Util/Error.h"
+#include "GUI/Util/SessionItemTags.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 1c7a04bc178..e47f869695a 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,8 +1,8 @@
#include "GUI/Model/Group/PropertyItem.h"
-#include "GUI/Util/VariantUtil.h"
#include "GUI/Model/Session/SessionModel.h"
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Util/ComboProperty.h"
+#include "GUI/Util/VariantUtil.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemUtils : public ::testing::Test {
@@ -20,8 +20,7 @@ TEST_F(TestSessionItemUtils, VariantType)
== GUI::Util::Variant::VariantType(QVariant::fromValue(QString{"a"})));
QVariant v1, v2;
- EXPECT_TRUE(GUI::Util::Variant::VariantType(v1)
- == GUI::Util::Variant::VariantType(v2));
+ EXPECT_TRUE(GUI::Util::Variant::VariantType(v1) == GUI::Util::Variant::VariantType(v2));
EXPECT_FALSE(GUI::Util::Variant::VariantType(v1)
== GUI::Util::Variant::VariantType(QVariant::fromValue(42.0)));
@@ -61,20 +60,17 @@ TEST_F(TestSessionItemUtils, IsTheSameVariant)
EXPECT_TRUE(GUI::Util::Variant::IsTheSame(v1, v2));
// comparing QVariant based on double
- EXPECT_TRUE(
- GUI::Util::Variant::IsTheSame(QVariant::fromValue(1.0), QVariant::fromValue(1.0)));
- EXPECT_FALSE(
- GUI::Util::Variant::IsTheSame(QVariant::fromValue(1.0), QVariant::fromValue(2.0)));
+ EXPECT_TRUE(GUI::Util::Variant::IsTheSame(QVariant::fromValue(1.0), QVariant::fromValue(1.0)));
+ EXPECT_FALSE(GUI::Util::Variant::IsTheSame(QVariant::fromValue(1.0), QVariant::fromValue(2.0)));
// comparing QVariant based on strings
EXPECT_TRUE(GUI::Util::Variant::IsTheSame(QVariant::fromValue(QString{"a"}),
- QVariant::fromValue(QString{"a"})));
+ QVariant::fromValue(QString{"a"})));
EXPECT_FALSE(GUI::Util::Variant::IsTheSame(QVariant::fromValue(QString{"a"}),
- QVariant::fromValue(QString{"b"})));
+ QVariant::fromValue(QString{"b"})));
// comparing variants of different type
- EXPECT_FALSE(
- GUI::Util::Variant::IsTheSame(QVariant::fromValue(1.0), QVariant::fromValue(1)));
+ EXPECT_FALSE(GUI::Util::Variant::IsTheSame(QVariant::fromValue(1.0), QVariant::fromValue(1)));
ComboProperty c1, c2;
EXPECT_FALSE(GUI::Util::Variant::IsTheSame(c1.variant(), c2.variant()));
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 803420a7bb7..aa00013a0f4 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -8,8 +8,8 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Util/SessionItemTags.h"
#include "GUI/Model/Types/VectorItem.h"
+#include "GUI/Util/SessionItemTags.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
#include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index b5e3086b272..d6ae45c4638 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -3,13 +3,13 @@
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Job/JobModel.h"
+#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/Model/S1/Serializer.h"
#include "GUI/Model/Session/SessionModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
--
GitLab