diff --git a/Device/Mask/Polygon.cpp b/Device/Mask/Polygon.cpp
index 822d59a7904e3984c96f7bd312ff336dea56e7e5..099afe16ca82d886eeda3db06242e87e1ce6f786 100644
--- a/Device/Mask/Polygon.cpp
+++ b/Device/Mask/Polygon.cpp
@@ -24,7 +24,7 @@ public:
using point_t = boost::geometry::model::d2::point_xy<double>;
using polygon_t = boost::geometry::model::polygon<point_t>;
PolygonPrivate(const std::vector<double>& x, const std::vector<double>& y);
- PolygonPrivate(const std::vector<std::pair<double,double>>& pts);
+ PolygonPrivate(const std::vector<std::pair<double, double>>& pts);
polygon_t polygon;
void get_points(std::vector<double>& xpos, std::vector<double>& ypos); // TODO const or no-&
};
@@ -39,10 +39,10 @@ PolygonPrivate::PolygonPrivate(const std::vector<double>& x, const std::vector<d
boost::geometry::correct(polygon);
}
-PolygonPrivate::PolygonPrivate(const std::vector<std::pair<double,double>>& pts)
+PolygonPrivate::PolygonPrivate(const std::vector<std::pair<double, double>>& pts)
{
std::vector<point_t> points;
- for (const std::pair<double,double>& p: pts)
+ for (const std::pair<double, double>& p : pts)
points.emplace_back(p.first, p.second);
boost::geometry::assign_points(polygon, points);
boost::geometry::correct(polygon);
@@ -70,7 +70,7 @@ void PolygonPrivate::get_points(std::vector<double>& xpos, std::vector<double>&
//! be closed automatically.
Polygon::Polygon(const std::vector<double> x, const std::vector<double> y)
: IShape2D("Polygon")
- , m_d(new PolygonPrivate(x,y))
+ , m_d(new PolygonPrivate(x, y))
{
}
@@ -79,7 +79,7 @@ Polygon::Polygon(const std::vector<double> x, const std::vector<double> y)
//! If polygon is unclosed (the last point doesn't repeat the first one), it will
//! be closed automatically.
//! @param points Two dimensional vector of (x,y) coordinates of polygon points.
-Polygon::Polygon(const std::vector<std::pair<double,double>> points)
+Polygon::Polygon(const std::vector<std::pair<double, double>> points)
: IShape2D("Polygon")
, m_d(new PolygonPrivate(points))
{
diff --git a/Device/Mask/Polygon.h b/Device/Mask/Polygon.h
index f567b3c21346b44b71d56b6d83eff0730d9ea493..8697ddc295ecfe56e0c87e1b295338732958e5be 100644
--- a/Device/Mask/Polygon.h
+++ b/Device/Mask/Polygon.h
@@ -30,7 +30,7 @@ class PolygonPrivate;
class Polygon : public IShape2D {
public:
Polygon(std::vector<double> x, std::vector<double> y);
- Polygon(std::vector<std::pair<double,double>> points);
+ Polygon(std::vector<std::pair<double, double>> points);
Polygon(const PolygonPrivate* d);
~Polygon() override;
diff --git a/GUI/Model/CatSample/ProfileItemCatalogs.cpp b/GUI/Model/CatSample/ProfileItemCatalogs.cpp
index aa60288d67d49376600f5ac4be4e141930978258..77522208cd9ce0faaee3ba29849c8e4f4fba99c9 100644
--- a/GUI/Model/CatSample/ProfileItemCatalogs.cpp
+++ b/GUI/Model/CatSample/ProfileItemCatalogs.cpp
@@ -66,7 +66,7 @@ Profile1DItemCatalog::Type Profile1DItemCatalog::type(const CatalogedType* item)
ASSERT(item);
#define CHECK(type) \
- if (dynamic_cast<const Profile1D##type##Item*>(item)) \
+ if (dynamic_cast<const Profile1D##type##Item*>(item)) \
return Type::type
CHECK(Cauchy);
diff --git a/GUI/Model/Data/Data1DViewItem.cpp b/GUI/Model/Data/Data1DViewItem.cpp
index 4ccd93f2f7c5d1b3e4a535db5a5dbb016738b3e0..3d80bd45c35afe75ac29e44e9bf9b88d536567c3 100644
--- a/GUI/Model/Data/Data1DViewItem.cpp
+++ b/GUI/Model/Data/Data1DViewItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Model/Data/Data1DViewItem.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Data/DataProperties.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
#include "GUI/Model/Data/DataViewUtils.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index d67d06f69faa356dbbdbbd450df9af14376296b4..05bedd5e160e5b285b5493921b658118bb5b6ed1 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Device/MaskUnitsConverter.h"
-#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Data/IntensityDataItem.h b/GUI/Model/Data/IntensityDataItem.h
index eceefd328306ad00091e36adedd442ccc1d0ecef..7b70943fc2fa9637449effdd9e2d6a73fb384f97 100644
--- a/GUI/Model/Data/IntensityDataItem.h
+++ b/GUI/Model/Data/IntensityDataItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
#define BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
-#include "GUI/Model/Descriptor/SelectionDescriptor.h"
#include "GUI/Model/Data/DataItem.h"
+#include "GUI/Model/Descriptor/SelectionDescriptor.h"
class BasicAxisItem;
class AmplitudeAxisItem;
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealDataItem.cpp
index dee70cc06c2df50449cf93051c3bb746ad1584f0..67ddefc3a7c99fbc77a73c59897b4db9c3804b92 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealDataItem.cpp
@@ -14,15 +14,15 @@
#include "GUI/Model/Data/RealDataItem.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Data/SessionData.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/MaskItems.h"
+#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/SessionData.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/IO/ImportDataInfo.h"
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index 86879790c2d0f10fd700b0f24b8934c4f8e133e2..87429e459b30d6042eca006d93d3914f40b8a007 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp
index 74f41ef8dea705d3fff4905b6a5f8a04d40904a4..d278ebc1af2901f0d5c6751e3219f89d4e183b18 100644
--- a/GUI/Model/Descriptor/DistributionItems.cpp
+++ b/GUI/Model/Descriptor/DistributionItems.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Support/Type/GroupInfo.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/XML/Serializer.h"
+#include "GUI/Support/Type/GroupInfo.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include <cmath>
diff --git a/GUI/Model/Device/BeamDistributionItem.h b/GUI/Model/Device/BeamDistributionItem.h
index 7c4845f3d1cd54988ce14aaa165e129063f4155d..7eeaf808c6e77f0415c68024e496f332ff7bbced 100644
--- a/GUI/Model/Device/BeamDistributionItem.h
+++ b/GUI/Model/Device/BeamDistributionItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_BEAMDISTRIBUTIONITEM_H
#define BORNAGAIN_GUI_MODEL_DEVICE_BEAMDISTRIBUTIONITEM_H
-#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
+#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "Param/Distrib/ParameterDistribution.h"
//! The BeamDistributionItem handles wavelength, inclination and azimuthal parameter
diff --git a/GUI/Model/Device/BeamItems.cpp b/GUI/Model/Device/BeamItems.cpp
index ac261737d884c1ed6bb4dc533adac8b2628e7490..ad131898bd60335ced3b1cdce5583ed7ffdb6b77 100644
--- a/GUI/Model/Device/BeamItems.cpp
+++ b/GUI/Model/Device/BeamItems.cpp
@@ -16,11 +16,11 @@
#include "Base/Axis/IAxis.h"
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
+#include "GUI/Model/CatDevice/FootprintItemCatalog.h"
#include "GUI/Model/Device/BeamAngleItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/FootprintItems.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/CatDevice/FootprintItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include <cmath>
diff --git a/GUI/Model/Device/DetectorItems.cpp b/GUI/Model/Device/DetectorItems.cpp
index d6ddf1ad1420e10ac287c8157df3783fb896a666..c5e4101bbc78f7a8263e36f37c97d11fa7ccf48d 100644
--- a/GUI/Model/Device/DetectorItems.cpp
+++ b/GUI/Model/Device/DetectorItems.cpp
@@ -16,11 +16,11 @@
#include "Device/Detector/IDetector2D.h"
#include "Device/Mask/IShape2D.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Support/Type/GroupInfo.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Device/ResolutionFunctionItems.h"
#include "GUI/Model/Device/SphericalDetectorItem.h"
#include "GUI/Model/Model/SessionModel.h"
+#include "GUI/Support/Type/GroupInfo.h"
DetectorItem::DetectorItem() {}
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 2678c9391ec73ef3ab1611af65ec671248d54d59..a7ab3c849f73dff9e30ed07545c279d20621b0d7 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -21,18 +21,18 @@
#include "Device/Coord/CoordSystem2D.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
+#include "GUI/Model/CatDevice/BackgroundItemCatalog.h"
+#include "GUI/Model/CatDevice/DetectorItemCatalog.h"
+#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/DetectorItems.h"
-#include "GUI/Model/XML/XMLUtil.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/Model/Device/SphericalDetectorItem.h"
-#include "GUI/Model/CatDevice/BackgroundItemCatalog.h"
-#include "GUI/Model/CatDevice/DetectorItemCatalog.h"
-#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
+#include "GUI/Model/XML/XMLUtil.h"
#include "GUI/Util/CoordName.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/String.h"
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index e4bd91a4f0290b6e6393febf5bbb8a0bd704310c..56e7fcca731227818d59818eaccdb458ed456cf5 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -15,13 +15,13 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMS_H
#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTITEMS_H
+#include "GUI/Model/Descriptor/AxisProperty.h"
#include "GUI/Model/Descriptor/SelectionDescriptor.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamItems.h" // inheritance prevents forward declaration
#include "GUI/Model/Device/DetectorItems.h"
-#include "GUI/Model/Descriptor/AxisProperty.h"
-#include "GUI/Model/Descriptor/VectorProperty.h"
#include <functional>
#include <memory>
diff --git a/GUI/Model/Device/MaskItems.cpp b/GUI/Model/Device/MaskItems.cpp
index ccc7766bb04a009e65375c2a7571410a2bba5213..39987e294be9e16e5d6b3f293c871b323e2ee039 100644
--- a/GUI/Model/Device/MaskItems.cpp
+++ b/GUI/Model/Device/MaskItems.cpp
@@ -19,8 +19,8 @@
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
#include "GUI/Model/CatDevice/MaskItemCatalog.h"
-#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/XML/Serializer.h"
MaskContainerItem::MaskContainerItem()
diff --git a/GUI/Model/Device/MaskItems.h b/GUI/Model/Device/MaskItems.h
index dd4166a03c080892e519d1c28dc460b9d5ce4c99..fa02e3d77eda38285ce5f6a7986cc9dee8a93ec7 100644
--- a/GUI/Model/Device/MaskItems.h
+++ b/GUI/Model/Device/MaskItems.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODEL_DEVICE_MASKITEMS_H
#include "GUI/Model/BaseItem/SessionItem.h"
-#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Model/SessionModel.h"
class IShape2D;
class Serializer;
diff --git a/GUI/Model/Device/MaskUnitsConverter.cpp b/GUI/Model/Device/MaskUnitsConverter.cpp
index 193e1ddffbf8cf0859bfd2cfa29dcb15883deaa8..46c075b718f426a83ca9a54016eeec9ad51ceb01 100644
--- a/GUI/Model/Device/MaskUnitsConverter.cpp
+++ b/GUI/Model/Device/MaskUnitsConverter.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Device/MaskUnitsConverter.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/MaskItems.h"
MaskUnitsConverter::MaskUnitsConverter()
: m_data(nullptr)
diff --git a/GUI/Model/Device/RectangularDetectorItem.cpp b/GUI/Model/Device/RectangularDetectorItem.cpp
index f5296f08559b9b4b961c73e18300f0786dcb2e4e..d92593d9728cd0bf5c03a1a51db9252e7609660e 100644
--- a/GUI/Model/Device/RectangularDetectorItem.cpp
+++ b/GUI/Model/Device/RectangularDetectorItem.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "Device/Detector/RectangularDetector.h"
+#include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/ResolutionFunctionItems.h"
-#include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Util/ComboProperty.h"
diff --git a/GUI/Model/Device/RectangularDetectorItem.h b/GUI/Model/Device/RectangularDetectorItem.h
index e5c80fbb7dc78849de6216c401181bdf0c3d69c0..0c8c8fb19ce46bcf476868c384bf63e4c6bd01bb 100644
--- a/GUI/Model/Device/RectangularDetectorItem.h
+++ b/GUI/Model/Device/RectangularDetectorItem.h
@@ -16,10 +16,10 @@
#define BORNAGAIN_GUI_MODEL_DEVICE_RECTANGULARDETECTORITEM_H
#include "Device/Detector/RectangularDetector.h"
-#include "GUI/Model/Device/DetectorItems.h"
#include "GUI/Model/Descriptor/AxisProperty.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
+#include "GUI/Model/Device/DetectorItems.h"
class RectangularDetectorItem : public DetectorItem {
private:
diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
index 4fae57ce3c5d10d55facb48df8fc782bcf6108f0..1f19aa47db0f2c26c26389624732e9016cf2024a 100644
--- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Device/SpecularBeamInclinationItem.h"
#include "Base/Axis/IAxis.h"
#include "Base/Const/Units.h"
-#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
+#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/XML/Serializer.h"
namespace {
diff --git a/GUI/Model/Device/SphericalDetectorItem.h b/GUI/Model/Device/SphericalDetectorItem.h
index 0eb30c698ee44b1a4909334f6b9e3616495daee2..581def6edaf6e1eed0daaf87f36d0d9aa73e8e20 100644
--- a/GUI/Model/Device/SphericalDetectorItem.h
+++ b/GUI/Model/Device/SphericalDetectorItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_DEVICE_SPHERICALDETECTORITEM_H
#define BORNAGAIN_GUI_MODEL_DEVICE_SPHERICALDETECTORITEM_H
-#include "GUI/Model/Device/DetectorItems.h"
#include "GUI/Model/Descriptor/AxisProperty.h"
+#include "GUI/Model/Device/DetectorItems.h"
class SphericalDetectorItem : public DetectorItem {
public:
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index e333f0ae6fafa92916795354cc0ef479e0f9d169..c7eb8301210a7692cf98c9fe618873edab981d40 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -14,15 +14,15 @@
#include "GUI/Model/Job/JobItem.h"
#include "Base/Util/Assert.h"
+#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
#include "GUI/Model/Data/Data1DViewItem.h"
-#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Data/JobItemUtils.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Job/FitSuiteItem.h"
+#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index 6ca4e175d611f656759b38199cd801fa83a51ad5..1ea8e53c5df6403d3684653e05b73a8b022b467e 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -17,11 +17,11 @@
#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/SessionModel.h" // call to model() from templated fct
-#include "GUI/Support/Data/JobStatus.h" // enum cannot be forward declared
+#include "GUI/Model/Sample/MaterialItems.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Support/Data/JobStatus.h" // enum cannot be forward declared
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include <QDateTime>
#include <optional>
diff --git a/GUI/Model/Job/MinimizerItem.h b/GUI/Model/Job/MinimizerItem.h
index 8645cc8745e339efc1906885f39fcf166c2f49c0..0c547f9664d5c57309d273db94743cdebe6f5e1f 100644
--- a/GUI/Model/Job/MinimizerItem.h
+++ b/GUI/Model/Job/MinimizerItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODEL_JOB_MINIMIZERITEM_H
#include "GUI/Model/BaseItem/SessionItem.h"
-#include "GUI/Model/Descriptor/SelectionDescriptor.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Descriptor/SelectionDescriptor.h"
#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include <variant>
diff --git a/GUI/Model/Job/ParameterTreeItems.cpp b/GUI/Model/Job/ParameterTreeItems.cpp
index 19ac807b976f1049875016bb91ade7253ad897b4..7977d82ea836a5e578cd51891e44a18fc4c5c2c0 100644
--- a/GUI/Model/Job/ParameterTreeItems.cpp
+++ b/GUI/Model/Job/ParameterTreeItems.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Job/ParameterTreeItems.h"
+#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Util/DeserializationException.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/MakeItem/ItemCatalog.cpp b/GUI/Model/MakeItem/ItemCatalog.cpp
index e2e6bd82ed06f4ff3aa3e3a0a0fa393b7cb53a0b..acb7c2a40e1d8d20c0eed8565f1b7f184af66d48 100644
--- a/GUI/Model/MakeItem/ItemCatalog.cpp
+++ b/GUI/Model/MakeItem/ItemCatalog.cpp
@@ -18,18 +18,18 @@
#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/Model/Data/DataProperties.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
+#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/MaskItems.h"
+#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitParameterItem.h"
#include "GUI/Model/Job/FitParameterLinkItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Job/MinimizerItem.h"
-#include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
ItemCatalog::ItemCatalog()
{
diff --git a/GUI/Model/Model/JobFunctions.cpp b/GUI/Model/Model/JobFunctions.cpp
index 03ced662c4f5276972a6f02da0c5c12b146d79b6..37543b6c4ccdef2447fdc1dc5c85c5df6024501e 100644
--- a/GUI/Model/Model/JobFunctions.cpp
+++ b/GUI/Model/Model/JobFunctions.cpp
@@ -17,17 +17,17 @@
#include "Device/Instrument/Instrument.h"
#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
-#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Sample/MaterialItem.h"
-#include "GUI/Model/Job/MinimizerItem.h"
-#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/PointwiseAxisItem.h"
+#include "GUI/Model/Job/FitSuiteItem.h"
+#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/Job/MinimizerItem.h"
+#include "GUI/Model/Sample/ItemWithMaterial.h"
+#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index ab1f1bfad028f598c44744c3a0c5ff9e1e5686ca..fe1831de1c5f2e2ce426b3c7822a893644188b5f 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -13,17 +13,17 @@
// ************************************************************************************************
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/Model/JobFunctions.h"
-#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/PointwiseAxisItem.h"
+#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/Model/JobFunctions.h"
#include "GUI/Model/Model/JobQueueData.h"
-#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Model/Model/ParameterTreeUtils.h"
+#include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/Sample/ItemWithMaterial.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
JobModel::JobModel(QObject* parent)
: SessionModel(GUI::Session::XML::JobModelTag, parent)
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index 4f0a6e92758fa574c2cb8e37f591b64f0af771c7..157f7532fe75deca6edafa2d58705aeaa4681a7a 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -13,32 +13,32 @@
// ************************************************************************************************
#include "GUI/Model/Model/ParameterTreeUtils.h"
+#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
+#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/CatSample/InterferenceItemCatalog.h"
+#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/CatSample/Lattice2DItemCatalog.h"
+#include "GUI/Model/CatSample/ProfileItemCatalogs.h"
+#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamAngleItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Sample/InterferenceItems.h"
+#include "GUI/Model/Device/RectangularDetectorItem.h"
+#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "GUI/Model/Device/SphericalDetectorItem.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/Job/ParameterTreeItems.h"
+#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/Model/Device/ResolutionFunctionItems.h"
-#include "GUI/Model/Device/SphericalDetectorItem.h"
-#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/CatSample/InterferenceItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
-#include "GUI/Model/CatSample/Lattice2DItemCatalog.h"
-#include "GUI/Model/CatSample/ProfileItemCatalogs.h"
-#include "GUI/Model/CatSample/RotationItemCatalog.h"
namespace {
diff --git a/GUI/Model/Model/SessionModel.cpp b/GUI/Model/Model/SessionModel.cpp
index a2965905a6a6714397c5cde0f79df6d1afb45515..634f606238612ef81b30ed07a6efba85fa0b5d54 100644
--- a/GUI/Model/Model/SessionModel.cpp
+++ b/GUI/Model/Model/SessionModel.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/BaseItem/SessionItem.h"
-#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/MakeItem/ItemFactory.h"
#include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemTags.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Model/SessionXML.cpp b/GUI/Model/Model/SessionXML.cpp
index 7f53e890fdd67f3254f290a36d373918d32476fd..f8109a78a66c8ad8464a698543b37fad0d2beae6 100644
--- a/GUI/Model/Model/SessionXML.cpp
+++ b/GUI/Model/Model/SessionXML.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Model/BaseItem/GroupItem.h"
-#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Model/SessionModel.h"
+#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemTags.h"
#include "GUI/Support/Data/XML.h"
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index f76880420245ae390fcd364798867b0b4e0b5097..4bba4a9a132dcb22200beb00f1949fc24fa11d5b 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include <QMessageBox>
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index efb70741232dd57f4aaa9a5a2ceda09a8c398f86..e9f1e7f9f222af0661d9155511947fb8206d1bdc 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -14,12 +14,12 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/Sample/MaterialItem.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/OutputDataIOService.h"
+#include "GUI/Model/Sample/ItemWithMaterial.h"
+#include "GUI/Model/Sample/MaterialItem.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Support/Data/XML.h"
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index cd16af36fb075cab82aba08a7bc861a5a6d67304..ca3456d4bfadf88f4079d924a2747751f2123e00 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -16,9 +16,9 @@
#define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
#include "GUI/Model/Model/ApplicationModels.h"
#include "GUI/Model/Sample/MultiLayerItems.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include <QObject>
#include <QVariant>
diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index 32792f18fa85bd0e33781e16faedd957fa8f5e9d..80ef5dcd4535936270d101400398517a34d87d3d 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -14,11 +14,11 @@
#include "GUI/Model/Sample/InterferenceItems.h"
#include "Base/Const/Units.h"
-#include "GUI/Model/Sample/ProfileItems.h"
-#include "GUI/Model/Sample/Lattice2DItems.h"
-#include "GUI/Model/CatSample/ProfileItemCatalogs.h"
#include "GUI/Model/CatSample/Lattice2DItemCatalog.h"
+#include "GUI/Model/CatSample/ProfileItemCatalogs.h"
#include "GUI/Model/Descriptor/UIntDescriptor.h"
+#include "GUI/Model/Sample/Lattice2DItems.h"
+#include "GUI/Model/Sample/ProfileItems.h"
#include "GUI/Model/XML/Serializer.h"
#include "Sample/Aggregate/Interferences.h"
@@ -186,8 +186,7 @@ std::unique_ptr<IInterference> Interference2DParaCrystalItem::createInterference
result->setDampingLength(m_dampingLength);
result->setDomainSizes(m_domainSize1, m_domainSize2);
result->setIntegrationOverXi(xiIntegration());
- result->setProbabilityDistributions(*m_pdf1->createProfile(),
- *m_pdf2->createProfile());
+ result->setProbabilityDistributions(*m_pdf1->createProfile(), *m_pdf2->createProfile());
result->setPositionVariance(positionVariance());
return std::unique_ptr<IInterference>(result.release());
}
@@ -235,8 +234,7 @@ void Interference2DParaCrystalItem::setDomainSize2(const double size)
m_domainSize2.set(size);
}
-SelectionDescriptor<Profile2DItem*>
-Interference2DParaCrystalItem::probabilityDistribution1() const
+SelectionDescriptor<Profile2DItem*> Interference2DParaCrystalItem::probabilityDistribution1() const
{
return m_pdf1;
}
@@ -246,8 +244,7 @@ void Interference2DParaCrystalItem::setPDF1Type(Profile2DItem* p)
m_pdf1.set(p);
}
-SelectionDescriptor<Profile2DItem*>
-Interference2DParaCrystalItem::probabilityDistribution2() const
+SelectionDescriptor<Profile2DItem*> Interference2DParaCrystalItem::probabilityDistribution2() const
{
return m_pdf2;
}
@@ -357,8 +354,7 @@ InterferenceRadialParaCrystalItem::InterferenceRadialParaCrystalItem()
m_kappa.init("SizeSpaceCoupling",
"Size spacing coupling parameter of the Size Spacing Correlation Approximation",
0.0, Unit::unitless, "kappa");
- m_pdf.init<Profile1DItemCatalog>("PDF", "One-dimensional probability distribution",
- "pdf");
+ m_pdf.init<Profile1DItemCatalog>("PDF", "One-dimensional probability distribution", "pdf");
}
std::unique_ptr<IInterference> InterferenceRadialParaCrystalItem::createInterference() const
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index a809bd944c65a929067ddd7d1e322cde516969de..3b03bf2136e115453f66f1d138553e2b3efb10b6 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/Descriptor/SelectionProperty.h"
-#include "GUI/Model/Sample/ProfileItems.h"
-#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
+#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/UIntProperty.h"
+#include "GUI/Model/Sample/Lattice2DItems.h"
+#include "GUI/Model/Sample/ProfileItems.h"
#include <memory>
class IInterference;
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index bbe2bae8b71d0d6c69050d70893a2b54ad7e5990..9458f772b1d9a49ac0823ed05f9b0862f161f0e8 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
-#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
+#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Sample/RotationItems.h"
#include <memory>
diff --git a/GUI/Model/Sample/LayerItem.h b/GUI/Model/Sample/LayerItem.h
index 5717341416b633002f5bb23bf944ee3c23a99533..1a5db112f2810bd39ed1a8bc229ddd949b7c52b6 100644
--- a/GUI/Model/Sample/LayerItem.h
+++ b/GUI/Model/Sample/LayerItem.h
@@ -15,11 +15,11 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
+#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionDescriptor.h"
+#include "GUI/Model/Descriptor/UIntProperty.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/LayerRoughnessItems.h"
-#include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "GUI/Model/Descriptor/UIntProperty.h"
#include <QColor>
#include <QUuid>
#include <QVector>
diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index 98b2b09a6d01562f5201488f50754e9650908cc0..1cf049de21ac76c0439cf153804e2eb6dbbee168 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Model/Sample/MesoCrystalItem.h"
+#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
-#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Crystal.h"
diff --git a/GUI/Model/Sample/MesoCrystalItem.h b/GUI/Model/Sample/MesoCrystalItem.h
index 827092adb213f88510e14857acb76b6713f8a042..e2e877447956ed857ae316b39aca6054c6de8caf 100644
--- a/GUI/Model/Sample/MesoCrystalItem.h
+++ b/GUI/Model/Sample/MesoCrystalItem.h
@@ -16,9 +16,9 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
-#include "GUI/Model/Descriptor/VectorProperty.h"
#include "Sample/Lattice/Lattice3D.h"
#include <memory>
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index c78fd4a24994d4ef442380f8574e865b5d7b0af9..a24539653e374fc82e040dc5c79262386ab51235 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/XML/XMLUtil.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/XML/Serializer.h"
+#include "GUI/Model/XML/XMLUtil.h"
#include <QXmlStreamWriter>
MultiLayerItem::MultiLayerItem()
diff --git a/GUI/Model/Sample/MultiLayerItem.h b/GUI/Model/Sample/MultiLayerItem.h
index 4feb27c10b368fc031ee8d09af16fba5b564ad10..47581ed93046e029253b5c92f3b98c3401afeb3a 100644
--- a/GUI/Model/Sample/MultiLayerItem.h
+++ b/GUI/Model/Sample/MultiLayerItem.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MULTILAYERITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_MULTILAYERITEM_H
-#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
+#include "GUI/Model/Sample/MaterialItems.h"
#include <QString>
#include <QUuid>
#include <QVector>
diff --git a/GUI/Model/Sample/ParticleCompositionItem.cpp b/GUI/Model/Sample/ParticleCompositionItem.cpp
index 23cc93197f86b378e43b1d51192e9781198153c9..b35db7f3590d18c7910bce56f87bfcd0abac71e4 100644
--- a/GUI/Model/Sample/ParticleCompositionItem.cpp
+++ b/GUI/Model/Sample/ParticleCompositionItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleCompositionItem.h"
+#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
-#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Sample/ParticleCoreShellItem.cpp b/GUI/Model/Sample/ParticleCoreShellItem.cpp
index c24a9e3f637912f34f1890b126e10df2b11eaeca..8226b724d0c4b04f2df5730a9d218eb2948c6ec6 100644
--- a/GUI/Model/Sample/ParticleCoreShellItem.cpp
+++ b/GUI/Model/Sample/ParticleCoreShellItem.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
-#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Sample/MaterialItems.h"
+#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Support/Type/VariantUtil.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index 5a1476a87f996f33d3bc7351a9a7bfb90088910d..f6830c20e8c304f7dd9a901ea0c07e0c719eec20 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/CatSample/RotationItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index 162f2a26b0f057fb3db07533c2212c3d4bee7780..33ad491cf07ae7ed289293a51aa9358d956c770f 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/Model/CatSample/InterferenceItemCatalog.h"
+#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/CatSample/InterferenceItemCatalog.h"
-#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
#include "GUI/Model/XML/Serializer.h"
ParticleLayoutItem::ParticleLayoutItem(const MaterialItems* materials)
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index cd02f9ffdaa1e2411495199e88054c89e0ca87e6..0cce64c3339530a004855781dc3609f63a6e2b4e 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/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include "GUI/Model/Sample/InterferenceItems.h"
-#include "GUI/Model/Descriptor/DoubleProperty.h"
#include <QUuid>
#include <memory>
diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp
index bb757a5eb485b65e3929360b2fac4c36bd72e49a..8f83bac2c084ba595276a7549cb155b502d60483 100644
--- a/GUI/Model/Sample/ProfileItems.cpp
+++ b/GUI/Model/Sample/ProfileItems.cpp
@@ -197,8 +197,7 @@ Profile2DVoigtItem::Profile2DVoigtItem()
std::unique_ptr<IProfile2D> Profile2DVoigtItem::createProfile() const
{
- return std::make_unique<Profile2DVoigt>(omegaX(), omegaY(), Units::deg2rad(gamma()),
- m_eta);
+ return std::make_unique<Profile2DVoigt>(omegaX(), omegaY(), Units::deg2rad(gamma()), m_eta);
}
void Profile2DVoigtItem::serialize(Serializer& s)
diff --git a/GUI/Model/To/ToDomain.cpp b/GUI/Model/To/ToDomain.cpp
index 3836ca1aa3a573a8215a987bc6ac953b99361ff8..1fde2138956c0937cd68b5daf049d76e05cd65cd 100644
--- a/GUI/Model/To/ToDomain.cpp
+++ b/GUI/Model/To/ToDomain.cpp
@@ -13,6 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/To/ToDomain.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/LayerRoughnessItems.h"
@@ -23,8 +25,6 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/Util/Error.h"
#include "Sample/Aggregate/IInterference.h"
#include "Sample/Aggregate/ParticleLayout.h"
diff --git a/GUI/Model/XML/Serializer.h b/GUI/Model/XML/Serializer.h
index c10158f23cdbc7cc8a9a3dd3ceaf7bfe131edd8a..28b2fda9ec29ea67f18583ec2e02fd33af373129 100644
--- a/GUI/Model/XML/Serializer.h
+++ b/GUI/Model/XML/Serializer.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_XML_SERIALIZER_H
#define BORNAGAIN_GUI_MODEL_XML_SERIALIZER_H
-#include <QXmlStreamWriter> // used in every including file
#include "GUI/Model/Descriptor/SelectionProperty.h"
+#include <QXmlStreamWriter> // used in every including file
#include <functional>
#include <heinz/Vectors3D.h>
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 6ab1bcc5150908006509338a091fafcc507f9509..09070f4d6e3ccfc28cec9650e86d1e421c7d2c3b 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -19,11 +19,11 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Model/Data/DataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/MinimizerItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Fit/GUIFitObserver.h"
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index d98d80dab61f9ec95a285ed9a429f5b2175670e9..17a1c45f92b657dada5590aab7a94ecc20dada3f 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Fit/FitSessionController.h"
+#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitParameterItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/View/FromDomain/FromDomain.cpp b/GUI/View/FromDomain/FromDomain.cpp
index 58cecb0f5104bfbaec279f3dd8c7e57e6d76adf2..811aa8f5559d524551d0c52120f7bf6b5debd676 100644
--- a/GUI/View/FromDomain/FromDomain.cpp
+++ b/GUI/View/FromDomain/FromDomain.cpp
@@ -37,14 +37,14 @@
#include "GUI/Model/Device/BeamAngleItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Device/MaskItems.h"
-#include "GUI/Model/Sample/MesoCrystalItem.h"
-#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/Model/Device/ResolutionFunctionItems.h"
#include "GUI/Model/Device/SphericalDetectorItem.h"
+#include "GUI/Model/Sample/LayerItem.h"
+#include "GUI/Model/Sample/MesoCrystalItem.h"
+#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Util/Error.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/View/FromDomain/GUISampleBuilder.cpp b/GUI/View/FromDomain/GUISampleBuilder.cpp
index 68b78bcecd213d5c0adbbf6ab5c454331e29657c..5b626c65d703ba45ad6f892f95148e349f8667f3 100644
--- a/GUI/View/FromDomain/GUISampleBuilder.cpp
+++ b/GUI/View/FromDomain/GUISampleBuilder.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/View/FromDomain/GUISampleBuilder.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MaterialItem.h"
+#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index f2f4e8dff6bc70d148b720544e2fdbc7769302af..1b27541657e619340319a3beab3aaf2a71e5bc64 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/View/Mask/MaskEditor.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index e648863ba3446e1c40f5c0e3218565af37cef360..465e2c599eb893716b8c13e5bd2a79117ac6136a 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsEditController.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Import/SpecularDataImportWidget.cpp b/GUI/View/Import/SpecularDataImportWidget.cpp
index 54cd94a63896b890732b67cad74619bab682f67b..6617f7dc079e8e4e79a4539c43b364d34a2ff54c 100644
--- a/GUI/View/Import/SpecularDataImportWidget.cpp
+++ b/GUI/View/Import/SpecularDataImportWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Import/SpecularDataImportWidget.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/IO/AbstractDataLoaderResultModel.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/Instrument/AxisPropertyEditor.cpp b/GUI/View/Instrument/AxisPropertyEditor.cpp
index b7d3f99170a70151fc38fe5481b6e26d0b4a9268..b281f069fe08d3a34a38bd841f99e817b6177a70 100644
--- a/GUI/View/Instrument/AxisPropertyEditor.cpp
+++ b/GUI/View/Instrument/AxisPropertyEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/AxisPropertyEditor.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Descriptor/AxisProperty.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/WidgetUtils.h"
#include <QFormLayout>
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index d21b97f0010163b8f02e3ab09b9d123de6f8807b..06be41e4110d3f91f14058dbbba44302f576801b 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/Instrument/DistributionEditor.h"
-#include "GUI/Model/Device/BeamDistributionItem.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/XML/XMLUtil.h"
#include "GUI/Model/CatDevice/DistributionItemCatalog.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
+#include "GUI/Model/Device/BeamDistributionItem.h"
#include "GUI/Model/XML/Serializer.h"
+#include "GUI/Model/XML/XMLUtil.h"
#include "GUI/View/Instrument/DistributionForms.h"
#include "GUI/View/Instrument/EditDistributionDialog.h"
#include "GUI/View/PropertyEditor/GroupInfoBox.h"
diff --git a/GUI/View/Instrument/GISASBeamEditor.cpp b/GUI/View/Instrument/GISASBeamEditor.cpp
index 844b97024ec7f3935836523490aa070cdb883f1d..33b11b5d93b3501925122b67afb120f6ebaf1dd3 100644
--- a/GUI/View/Instrument/GISASBeamEditor.cpp
+++ b/GUI/View/Instrument/GISASBeamEditor.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Instrument/GISASBeamEditor.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Device/BeamAngleItems.h"
#include "GUI/Model/Device/BeamItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include <QDoubleValidator>
#include <QFormLayout>
diff --git a/GUI/View/Instrument/InstrumentEditController.cpp b/GUI/View/Instrument/InstrumentEditController.cpp
index b19733b0eeec1be4dd60a2c1b8a076f129c57804..eb2e3ec9faba4a26f0b33a34f2783395a8ef9173 100644
--- a/GUI/View/Instrument/InstrumentEditController.cpp
+++ b/GUI/View/Instrument/InstrumentEditController.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Instrument/InstrumentEditController.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Device/InstrumentsEditController.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Device/PointwiseAxisItem.h"
InstrumentEditController::InstrumentEditController(InstrumentsEditController* ec,
InstrumentItem* instrument)
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index 8054dd8b4fbc433e67d6ac66b69bcc674ca48556..4dd7e3b4e39ef783d4b1ad21a2a862cb0c4d7808 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Instrument/InstrumentLibraryEditor.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/SessionData.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Tool/ItemDelegateForHTML.h"
diff --git a/GUI/View/Instrument/InstrumentListView.cpp b/GUI/View/Instrument/InstrumentListView.cpp
index 2bfd31b38fb7fabcad684e81442761b35c2a5f87..646a593dc4590a5d7e282578069349115edd5745 100644
--- a/GUI/View/Instrument/InstrumentListView.cpp
+++ b/GUI/View/Instrument/InstrumentListView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Instrument/InstrumentListView.h"
+#include "GUI/Model/Data/SessionData.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/SessionData.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Instrument/InstrumentLibraryEditor.h"
#include "GUI/View/Instrument/InstrumentListModel.h"
diff --git a/GUI/View/Instrument/OffSpecularBeamEditor.cpp b/GUI/View/Instrument/OffSpecularBeamEditor.cpp
index 060182bf3d86368f9710816a2b19273047d77170..6ea03dbaafb29b563e949ff6573ff1937ed8370a 100644
--- a/GUI/View/Instrument/OffSpecularBeamEditor.cpp
+++ b/GUI/View/Instrument/OffSpecularBeamEditor.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Instrument/OffSpecularBeamEditor.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Device/BeamAngleItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/Instrument/AxisPropertyEditor.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include <QDoubleValidator>
diff --git a/GUI/View/Instrument/SpecularBeamEditor.cpp b/GUI/View/Instrument/SpecularBeamEditor.cpp
index a52afc66c8f05e7c6173ccea495aa8ee83a05028..a70e4f9fb4762d4416639b8de8fdd208672073c2 100644
--- a/GUI/View/Instrument/SpecularBeamEditor.cpp
+++ b/GUI/View/Instrument/SpecularBeamEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Instrument/SpecularBeamEditor.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Device/BeamItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Instrument/FootprintCorrectionEditor.h"
#include "GUI/View/Instrument/InclinationAnglesEditor.h"
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index 33fcd263a7095fb6b5067b186e2aa1dbfb4c8d37..d928badbd320ed708bebcdffaa7bf88d867125bd 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Main/MainWindow.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Data/SessionData.h"
+#include "GUI/Model/Model/JobModel.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Import/ImportDataView.h"
#include "GUI/View/Instrument/InstrumentView.h"
diff --git a/GUI/View/Mask/MaskContainerView.cpp b/GUI/View/Mask/MaskContainerView.cpp
index 52cb112625bf9ff33ba487c838cc150f3ab75e85..e0e350a7ea624e6e75e7c47eb722ecd7f99b9608 100644
--- a/GUI/View/Mask/MaskContainerView.cpp
+++ b/GUI/View/Mask/MaskContainerView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskContainerView.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/View/Mask/ISceneAdaptor.h"
#include <QBrush>
#include <QPainter>
diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp
index 554201b4dc5157c44996d29c3847a909044412ab..9e8a517db89079da1124adc97322b884055badad 100644
--- a/GUI/View/Mask/MaskEditorCanvas.cpp
+++ b/GUI/View/Mask/MaskEditorCanvas.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Mask/MaskEditorCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/SessionData.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/SessionData.h"
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/View/Mask/MaskGraphicsView.h"
#include "GUI/View/Mask/MaskResultsPresenter.h"
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index a2f93b4eb3d14b5fc1aa6345a8145c7bf81ff0a8..0e7561dae5643a413215214f0a85ddf6c25fc324 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/BaseItem/PropertyItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index 5def1abfde3d9908a68d8689b3fd8db886a6185a..4b4e429cfb49167e59dc43704faa8acc22f3431b 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Mask/MaskViewFactory.h"
#include "GUI/Model/BaseItem/SessionItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Mask/EllipseView.h"
#include "GUI/View/Mask/LineViews.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 0e17615a8af681525fe987b18cb180cbc8ca325e..389289bb75e92cf906c7ce8cd22d46dc7d6fb063 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,11 +14,11 @@
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Application/ApplicationSettings.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MaterialItem.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/View/Tool/EditUtil.h"
#include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorModel.cpp b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
index 18a9b746aebc9354d0f71ef7becbc9532f130284..df79c3452546be04be924a59bc72e46c3c5b7723 100644
--- a/GUI/View/MaterialEditor/MaterialEditorModel.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.cpp b/GUI/View/Plot2D/IntensityDataCanvas.cpp
index e814878003aacb8e7a16a32e6e641c5a0cbbbd96..dc2a279ec88f1daac3a186223c4ff420d5f10adf 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.cpp
+++ b/GUI/View/Plot2D/IntensityDataCanvas.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Plot2D/IntensityDataCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Data/SessionData.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Info/MessageBox.h"
diff --git a/GUI/View/PlotComparison/FitComparisonController.cpp b/GUI/View/PlotComparison/FitComparisonController.cpp
index 91cb28f0204e859a4fe9d1b2dd306e7869cd37c9..56aab21d2bed8776ff0a58b85501641906ba4e18 100644
--- a/GUI/View/PlotComparison/FitComparisonController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonController.cpp
@@ -14,11 +14,11 @@
#include "GUI/View/PlotComparison/FitComparisonController.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
+#include "GUI/Model/Job/JobItem.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
namespace {
diff --git a/GUI/View/PlotComparison/FitComparisonViewController.cpp b/GUI/View/PlotComparison/FitComparisonViewController.cpp
index 3edb9ffa29c4a196ec453a03db4955323682903b..e387259db594029c164a8b126e7e24e062858eeb 100644
--- a/GUI/View/PlotComparison/FitComparisonViewController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonViewController.cpp
@@ -14,12 +14,12 @@
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "Device/Data/DataUtils.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
+#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 94f8dc5adcacc2a8294bf1383e497d388d57c052..d700e6a86cc493a10c66b48b19a3d307c615fab9 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/FitComparisonWidget.h"
-#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Job/FitSuiteItem.h"
+#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitComparisonController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 0efff51c4a90062de285fe07c113cb6dc3a19b35..f27491926c334f681ff5ae1fee58ab927fa9cb55 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
#include "GUI/Model/Data/Data1DViewItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/Plot1D.cpp b/GUI/View/PlotComparison/Plot1D.cpp
index 919f0cdc6bccbe74a67b491656594e1c7a3a50ed..49beade4b408ac64f33948c66db1f94fd7f9021f 100644
--- a/GUI/View/PlotComparison/Plot1D.cpp
+++ b/GUI/View/PlotComparison/Plot1D.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/Plot1D.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Data/DataProperties.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
diff --git a/GUI/View/PlotSpecular/SpecularDataCanvas.cpp b/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
index aebe9f4fc289537f8e08f7226ae38f1254cf31a5..e91a370a31cfb78ce7054aa78435ec3c92078a95 100644
--- a/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/PlotSpecular/SpecularDataCanvas.h"
+#include "GUI/Model/Data/SessionData.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/SessionData.h"
#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
#include "GUI/View/PlotUtil/SavePlotAssistant.h"
#include <qcustomplot.h>
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index a222e964154a9469e3ea07731f9ce29c7ae6ac21..c3ffed737a5456027810d57e238256c8a44404f1 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PlotSpecular/SpecularPlot.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
diff --git a/GUI/View/PlotUtil/ColorMap.cpp b/GUI/View/PlotUtil/ColorMap.cpp
index 9e87af796040bebf4e90c563c70618700823fe37..a68db50f91b1c82750d38851e8edecc77fd2b463 100644
--- a/GUI/View/PlotUtil/ColorMap.cpp
+++ b/GUI/View/PlotUtil/ColorMap.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PlotUtil/ColorMap.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
diff --git a/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp b/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp
index a2f49fcc89344d89507315fbc855bbb6e8fb1d0c..925ad3767eca1e5a94995ffdc97279de39baa999 100644
--- a/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PlotUtil/IntensityDataPropertyWidget.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index db0deb1c6865bca910cc317ede15c2b37886cac0..5e5db19911d15d26a4e210d86dd8bcc884a48467 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/Projection/ProjectionsPlot.h"
#include "Device/Histo/Histogram1D.h"
#include "Device/Histo/Histogram2D.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/AxesItems.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
#include <qcustomplot.h>
diff --git a/GUI/View/Projection/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp
index 02b8ee6d5e0189f96d9bcd9fce25fecbd4e80f57..ea59d0d42efba935aff2c1fc63e80865a2630334 100644
--- a/GUI/View/Projection/SaveProjectionsAssistant.cpp
+++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp
@@ -18,10 +18,10 @@
#include "Device/Histo/Histogram2D.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Data/SessionData.h"
+#include "GUI/Model/Device/MaskItems.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Util/Error.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
index 126702b38a7e09191888607842f639d73c63b2b7..7f08279bb9e1b7db865ed3aeaa44531f63dc7810 100644
--- a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp b/GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
index 2b5993bafb55bf26e6edfd382391e89f97c0b6b1..267dfc1258be21fc380e1ddedae52a72a5a03efc 100644
--- a/GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
+++ b/GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
@@ -100,8 +100,8 @@ std::pair<double, double> ComputePositionAlongNegativeLatticeVector(
std::pair<double, double>
ComputeLatticePosition(const size_t index_prev, int i, int j,
- std::vector<std::vector<double>>& lattice_positions,
- const IProfile2D* pdf, double l, double l_xi, double l_alpha)
+ std::vector<std::vector<double>>& lattice_positions, const IProfile2D* pdf,
+ double l, double l_xi, double l_alpha)
{
if (std::sin(l_alpha) == 0) {
if (!(j % 2 == 0)) // along +l1
@@ -157,9 +157,8 @@ void ComputePositionsAlongLatticeVectorAxes(std::vector<std::vector<double>>& la
}
void ComputePositionsInsideLatticeQuadrants(std::vector<std::vector<double>>& lattice_positions,
- const IProfile2D* pdf1,
- const IProfile2D* pdf2, double l1, double l2,
- double l_xi, double l_alpha)
+ const IProfile2D* pdf1, const IProfile2D* pdf2,
+ double l1, double l2, double l_xi, double l_alpha)
{
int n = static_cast<int>((std::sqrt(lattice_positions.size()) - 1) / 2);
diff --git a/GUI/View/Realspace/RealSpaceBuilder.cpp b/GUI/View/Realspace/RealSpaceBuilder.cpp
index 311b1b70dc623f0da89299729ae0a0e069c03b14..5764e56fbe9dc8ca8019f013cecd11e00b2e855a 100644
--- a/GUI/View/Realspace/RealSpaceBuilder.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilder.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Realspace/RealSpaceBuilder.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
@@ -21,7 +22,6 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/Realspace/IPositionBuilder.h"
#include "GUI/View/Realspace/Particle3DContainer.h"
#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
diff --git a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
index 8e74a6c9f053e0bc8c8c0fc1ca78e6b58bac7d31..014d83bde1a40b6f55f3981b3c0d1e9a8ac5a717 100644
--- a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
@@ -15,12 +15,12 @@
#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/Realspace/Particle3DContainer.h"
#include "GUI/View/Realspace/RealSpaceBuilder.h"
#include "GUI/View/Realspace/RealSpaceCanvas.h"
diff --git a/GUI/View/Realspace/RealSpaceCanvas.cpp b/GUI/View/Realspace/RealSpaceCanvas.cpp
index ac230ddec4eb243cb28a211be483811dd1df2e68..cca5f1325afc0c15495ba5719459bcf0c6e4936f 100644
--- a/GUI/View/Realspace/RealSpaceCanvas.cpp
+++ b/GUI/View/Realspace/RealSpaceCanvas.cpp
@@ -14,10 +14,10 @@
#include "GUI/View/Realspace/RealSpaceCanvas.h"
#include "GUI/Application/ApplicationSettings.h"
+#include "GUI/Model/Data/SessionData.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/SessionData.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Realspace/RealSpaceBuilder.h"
#include "GUI/ba3d/model/model.h"
diff --git a/GUI/View/SampleDesigner/InterferenceForm.cpp b/GUI/View/SampleDesigner/InterferenceForm.cpp
index c6b87f88fd69e4e847783461cae1cd42976c2075..b869a3f8a7f0ced34f06e91bf35ae7661c340d36 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/View/SampleDesigner/InterferenceForm.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/InterferenceForm.h"
+#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/LatticeTypeSelectionForm.h"
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 899e80ca797f5b24d365c0e4b768a564c6f367c6..52f595d93cc68f6e44eacc09b964db8d04a3c110 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/Model/Sample/ProfileItems.h"
+#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/LayerRoughnessItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/Descriptor/VectorDescriptor.h"
+#include "GUI/Model/Sample/ProfileItems.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/MesoCrystalForm.h"
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 7c8feaeb6abbb734320306e679a7863dc8cc5c90..4c82604bf3a192299e1ba284b951b0b083f7f900 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/SampleDesigner/LayerForm.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MaterialItem.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 03248449b07104d8f3e59f865d02b71cfb7a1ae8..b01290d49293891c5a6bed0cddea53b025721682 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/SampleDesigner/LayerOrientedSampleEditor.h"
#include "GUI/Application/ApplicationSettings.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 4dcb01683b88b9560e89b034aa3bbc49afab1cbe..604642203e269702925a37eb98a4e778c5f170c2 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -14,13 +14,13 @@
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/Descriptor/VectorDescriptor.h"
+#include "GUI/Model/XML/XMLUtil.h"
#include "GUI/View/Edit/DoubleLineEdit.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/SampleDesigner/MesoCrystalForm.cpp b/GUI/View/SampleDesigner/MesoCrystalForm.cpp
index 9f135d0f6cb2901c7191793ad741dc94b601ac24..3a48353c90620d92b4a0f6147aca4b6366d77922 100644
--- a/GUI/View/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/View/SampleDesigner/MesoCrystalForm.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/MesoCrystalForm.h"
+#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/SampleDesigner/ParticleCompositionForm.cpp b/GUI/View/SampleDesigner/ParticleCompositionForm.cpp
index 820be53d8560b540f255b294a71b2cada484090d..527e9dd6875600b75f869608f8288027c5723bce 100644
--- a/GUI/View/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCompositionForm.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleCompositionForm.h"
-#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Descriptor/VectorDescriptor.h"
+#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
index cc8dd33883d6c3d87b48500995c71656749636df..cc57bfcc2f3a7a55ada9f1d84f59b5af99bdd524 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleCoreShellForm.h"
+#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/Descriptor/VectorDescriptor.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index 90e2d08c372c90f0d89019202c81cc806932d7a4..b1d668ff2809308134973875ed9594746b66f166 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleForm.h"
-#include "GUI/Model/Sample/FormFactorItems.h"
-#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
#include "GUI/Model/Descriptor/VectorDescriptor.h"
+#include "GUI/Model/Sample/FormFactorItems.h"
+#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index 307b5c27d8bd50fcec15cdcf64209a496ed22d34..f68fb57067da5724c34b45ef9e94b780805c19b5 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -13,18 +13,18 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/SampleEditorController.h"
+#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
+#include "GUI/Model/Descriptor/UIntDescriptor.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/LayerItem.h"
+#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
-#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Descriptor/UIntDescriptor.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/SampleDesigner/InterferenceForm.h"
#include "GUI/View/SampleDesigner/LatticeTypeSelectionForm.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h
index 1eb9d1f1c782152798cb46b611e245f95e823888..671610281520a806c0b203b2cda384e3e8565cd2 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.h
+++ b/GUI/View/SampleDesigner/SampleEditorController.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
-#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
+#include "GUI/Model/Sample/SampleItem.h"
#include <QUndoStack>
class MultiLayerItem;
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 82cc4061978958af4a4a9a26fef488fa0ad8d9a5..96813212f063e227261dc4c054ec7a3c274664cc 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/SampleDesigner/SampleListView.h"
#include "Base/Util/SysUtils.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include "GUI/View/FromDomain/GUIExamplesFactory.h"
#include "GUI/View/SampleDesigner/SampleListModel.h"
diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp
index ed5ae11d0c31c285ea71f800cf7c770d1bf263dc..448c27893657dd08a6af7e9c0ce73b92c676be50 100644
--- a/GUI/View/SampleDesigner/SampleView.cpp
+++ b/GUI/View/SampleDesigner/SampleView.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/SampleView.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Common/DocksController.h"
#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Realspace/RealSpaceCanvas.h"
diff --git a/GUI/View/Tool/DataItemUtils.cpp b/GUI/View/Tool/DataItemUtils.cpp
index 2670367e5111ed16b539bf4e15a14f0b4ee954de..f87bd5d72b29ca1fc691f08b4c072fd7397079c9 100644
--- a/GUI/View/Tool/DataItemUtils.cpp
+++ b/GUI/View/Tool/DataItemUtils.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Tool/DataItemUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/Model/Job/JobItem.h"
namespace {
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index 0ccb1558df54f460342a8b46395bdaa30519e874..e7a277496c0c7c53072ac8972eb5172a174527b2 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SessionModelView.h"
-#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Model/RealDataModel.h"
+#include "GUI/Model/Sample/ItemWithMaterial.h"
+#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Project/ProjectManager.h"
#include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 3c5eea5f86d6141237ef8f5173b87377d0c5babc..ba3987c819e30ed34e07629251722a847a7a3012 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SimulationView.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleValidator.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/View/Global/Globals.h"
diff --git a/Sample/Aggregate/Interference2DLattice.cpp b/Sample/Aggregate/Interference2DLattice.cpp
index 1d67ca7a9b31ad5f85fe8691c8bd26e9bf3a3973..52dc62a692449ed3baa797d3559e5f9bd7c68788 100644
--- a/Sample/Aggregate/Interference2DLattice.cpp
+++ b/Sample/Aggregate/Interference2DLattice.cpp
@@ -25,8 +25,7 @@ const int nmax = 20;
// minimum number of neighboring reciprocal lattice points to use
const int min_points = 4;
-std::pair<double, double> transformToRecLatticeCoordinates(double qX, double qY,
- double a, double b,
+std::pair<double, double> transformToRecLatticeCoordinates(double qX, double qY, double a, double b,
double alpha, double gamma)
{
double qa = (a * qX * std::cos(gamma) - a * qY * std::sin(gamma)) / M_TWOPI;
@@ -36,9 +35,8 @@ std::pair<double, double> transformToRecLatticeCoordinates(double qX, double qY,
//! Calculates bounding values of reciprocal lattice coordinates that contain the centered
//! rectangle with a corner defined by qX and qY
-std::pair<double, double>
-boundingReciprocalLatticeCoordinates(double qX, double qY, double a, double b, double alpha,
- double gamma)
+std::pair<double, double> boundingReciprocalLatticeCoordinates(double qX, double qY, double a,
+ double b, double alpha, double gamma)
{
auto q_bounds_1 = transformToRecLatticeCoordinates(qX, qY, a, b, alpha, gamma);
auto q_bounds_2 = transformToRecLatticeCoordinates(qX, -qY, a, b, alpha, gamma);
diff --git a/Sample/Aggregate/Interference2DParaCrystal.h b/Sample/Aggregate/Interference2DParaCrystal.h
index 45d3a83f71948293d8b821fd4492c9da40bd48d5..7ab3d9a84a7ccd3ff343f30e8b9125c1ae096a69 100644
--- a/Sample/Aggregate/Interference2DParaCrystal.h
+++ b/Sample/Aggregate/Interference2DParaCrystal.h
@@ -44,8 +44,7 @@ public:
void setDomainSizes(double size_1, double size_2);
- void setProbabilityDistributions(const IProfile2D& pdf_1,
- const IProfile2D& pdf_2);
+ void setProbabilityDistributions(const IProfile2D& pdf_1, const IProfile2D& pdf_2);
void setDampingLength(double damping_length);
diff --git a/Sample/Correlations/Profiles1D.h b/Sample/Correlations/Profiles1D.h
index 4ad31b31404107702f9ab61a1ff5b38b571c73d8..3a458cc61b4d7fa8929f3a9d263c352fbe9a5ad5 100644
--- a/Sample/Correlations/Profiles1D.h
+++ b/Sample/Correlations/Profiles1D.h
@@ -127,7 +127,8 @@ public:
};
//! Triangle IProfile1D [1-|x|/omega if |x|<omega, and 0 otherwise];
-//! its Fourier transform standardizedFT(q) is a squared sinc function starting at standardizedFT(0)=1.
+//! its Fourier transform standardizedFT(q) is a squared sinc function starting at
+//! standardizedFT(0)=1.
//! @ingroup distributionFT
class Profile1DTriangle : public IProfile1D {
diff --git a/Sample/Correlations/Profiles2D.cpp b/Sample/Correlations/Profiles2D.cpp
index b35b02c58b139f7716efc709741b6be1bef9174c..b78d130582781639e0abf57a91c751425732815e 100644
--- a/Sample/Correlations/Profiles2D.cpp
+++ b/Sample/Correlations/Profiles2D.cpp
@@ -70,8 +70,7 @@ double Profile2DCauchy::standardizedFT2D(double qx, double qy) const
double Profile2DCauchy::decayFT2D(double qx, double qy) const
{
- double sum_sq = qx * qx * m_omega_x * m_omega_x
- + qy * qy * m_omega_y * m_omega_y;
+ double sum_sq = qx * qx * m_omega_x * m_omega_x + qy * qy * m_omega_y * m_omega_y;
return M_TWOPI * m_omega_x * m_omega_y * std::pow(1.0 + sum_sq, -1.5);
}
@@ -107,8 +106,7 @@ double Profile2DGauss::standardizedFT2D(double qx, double qy) const
double Profile2DGauss::decayFT2D(double qx, double qy) const
{
- double sum_sq = qx * qx * m_omega_x * m_omega_x
- + qy * qy * m_omega_y * m_omega_y;
+ double sum_sq = qx * qx * m_omega_x * m_omega_x + qy * qy * m_omega_y * m_omega_y;
return M_TWOPI * m_omega_x * m_omega_y * std::exp(-sum_sq / 2.0);
}
@@ -205,8 +203,7 @@ Profile2DVoigt::Profile2DVoigt(const std::vector<double> P)
checkNodeArgs();
}
-Profile2DVoigt::Profile2DVoigt(double omega_x, double omega_y, double gamma,
- double eta)
+Profile2DVoigt::Profile2DVoigt(double omega_x, double omega_y, double gamma, double eta)
: Profile2DVoigt(std::vector<double>{omega_x, omega_y, gamma, eta})
{
}
@@ -224,8 +221,7 @@ double Profile2DVoigt::standardizedFT2D(double qx, double qy) const
double Profile2DVoigt::decayFT2D(double qx, double qy) const
{
- double sum_sq = qx * qx * m_omega_x * m_omega_x
- + qy * qy * m_omega_y * m_omega_y;
+ double sum_sq = qx * qx * m_omega_x * m_omega_x + qy * qy * m_omega_y * m_omega_y;
return M_TWOPI * m_omega_x * m_omega_y
* (m_eta * std::exp(-sum_sq / 2.0) + (1.0 - m_eta) * std::pow(1.0 + sum_sq, -1.5));
}
diff --git a/Sample/HardParticle/FormFactorHollowSphere.h b/Sample/HardParticle/FormFactorHollowSphere.h
index 67667e5a635ea2178958269469d06e32db373c72..335bcf16f1f2d552efd3eb3071b7f6e5dfc69d22 100644
--- a/Sample/HardParticle/FormFactorHollowSphere.h
+++ b/Sample/HardParticle/FormFactorHollowSphere.h
@@ -46,7 +46,7 @@ private:
bool checkParameters() const;
const double& m_mean; //!< This is the mean radius
const double& m_full_width; //!< This is the full width of the radius distribution
-#endif // USER_API
+#endif // USER_API
};
#endif // BORNAGAIN_SAMPLE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
diff --git a/Sample/HardParticle/FormFactorPlatonicOctahedron.cpp b/Sample/HardParticle/FormFactorPlatonicOctahedron.cpp
index 0d8dae633e6d5ee2f88532fe346064c09d24a764..ecd95b40626997f8a18df2ef8bec6d7c61888bce 100644
--- a/Sample/HardParticle/FormFactorPlatonicOctahedron.cpp
+++ b/Sample/HardParticle/FormFactorPlatonicOctahedron.cpp
@@ -23,7 +23,7 @@ FormFactorPlatonicOctahedron::FormFactorPlatonicOctahedron(const std::vector<dou
{
checkNodeArgs();
- setPolyhedron(ff::platonic::Octahedron::topology(), -m_edge/sqrt(2),
+ setPolyhedron(ff::platonic::Octahedron::topology(), -m_edge / sqrt(2),
ff::platonic::Octahedron::vertices(m_edge));
}
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 59aae0f02a9f370133df2028037b43c114fc1890..79246c9b0b61d7ed434eb524f2e80da20919a89d 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -20,8 +20,8 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Histo/SimulationResult.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/View/FromDomain/GUIObjectBuilder.h"
diff --git a/Tests/Functional/ProStd/MakeSimulations.cpp b/Tests/Functional/ProStd/MakeSimulations.cpp
index eaf8e9aece60189d8aba84ff72c948130e11626b..c66fe0425c61dc0ee027e955e4cfbb9c2b669d8d 100644
--- a/Tests/Functional/ProStd/MakeSimulations.cpp
+++ b/Tests/Functional/ProStd/MakeSimulations.cpp
@@ -146,10 +146,10 @@ std::unique_ptr<GISASSimulation> test::makeSimulation::GISASWithMasks(const Mult
result->addMask(Ellipse(0.0 * deg, 1.0 * deg, 0.5 * deg, 0.5 * deg), false);
result->addMask(Ellipse(0.11 * deg, 1.25 * deg, 0.05 * deg, 0.05 * deg), true);
- std::vector<std::pair<double,double>> points = {{0.0 * deg, 1.0 * deg},
- {0.5 * deg, 1.2 * deg},
- {0.5 * deg, 0.8 * deg},
- {0.0 * deg, 1.0 * deg}};
+ std::vector<std::pair<double, double>> points = {{0.0 * deg, 1.0 * deg},
+ {0.5 * deg, 1.2 * deg},
+ {0.5 * deg, 0.8 * deg},
+ {0.0 * deg, 1.0 * deg}};
result->addMask(Polygon(points), true);
result->addMask(Rectangle(0.45 * deg, 0.95 * deg, 0.55 * deg, 1.05 * deg), false);
diff --git a/Tests/Functional/Std/StandardTests.h b/Tests/Functional/Std/StandardTests.h
index 92afa35086591b9f57867d9f3faf2dab93a11c74..af1d2cb5f689e7ebadfdfb8d5cb9d0cf8df3f6a1 100644
--- a/Tests/Functional/Std/StandardTests.h
+++ b/Tests/Functional/Std/StandardTests.h
@@ -21,8 +21,8 @@
#include "Core/Background/ConstantBackground.h"
#include "Core/Simulation/includeSimulations.h"
-#include "Sample/ComponentBuilder/Profile2DComponents.h"
#include "Sample/ComponentBuilder/FormFactorComponents.h"
+#include "Sample/ComponentBuilder/Profile2DComponents.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/ExemplarySamples.h"
#include "Tests/Functional/ProStd/MakeSimulations.h"
diff --git a/Tests/Unit/Core/PythonFormattingTest.cpp b/Tests/Unit/Core/PythonFormattingTest.cpp
index c8a14b6eb9049ba13623a6cbef36cc47daa580b9..4d887a593b9907038be42abce615003318e6bf3b 100644
--- a/Tests/Unit/Core/PythonFormattingTest.cpp
+++ b/Tests/Unit/Core/PythonFormattingTest.cpp
@@ -108,11 +108,9 @@ TEST_F(PythonFormattingTest, printProfile1D)
EXPECT_EQ(Profile1DCauchy(2.2).pythonConstructor(), "Profile1DCauchy(2.2*nm)");
EXPECT_EQ(Profile1DGauss(2.2).pythonConstructor(), "Profile1DGauss(2.2*nm)");
EXPECT_EQ(Profile1DGate(2.2).pythonConstructor(), "Profile1DGate(2.2*nm)");
- EXPECT_EQ(Profile1DTriangle(2.2).pythonConstructor(),
- "Profile1DTriangle(2.2*nm)");
+ EXPECT_EQ(Profile1DTriangle(2.2).pythonConstructor(), "Profile1DTriangle(2.2*nm)");
EXPECT_EQ(Profile1DCosine(2.2).pythonConstructor(), "Profile1DCosine(2.2*nm)");
- EXPECT_EQ(Profile1DVoigt(2.2, .3).pythonConstructor(),
- "Profile1DVoigt(2.2*nm, 0.3)");
+ EXPECT_EQ(Profile1DVoigt(2.2, .3).pythonConstructor(), "Profile1DVoigt(2.2*nm, 0.3)");
}
TEST_F(PythonFormattingTest, printProfile2D)
diff --git a/Tests/Unit/Device/PolygonTest.cpp b/Tests/Unit/Device/PolygonTest.cpp
index f51d7f56bcd8802695b63dcce28fd633fccddd23..492b78e891fa87551cd866154e1ea2ed2944ffac 100644
--- a/Tests/Unit/Device/PolygonTest.cpp
+++ b/Tests/Unit/Device/PolygonTest.cpp
@@ -95,7 +95,7 @@ TEST_F(PolygonTest, Clone)
TEST_F(PolygonTest, ConstructFrom2DArray)
{
// simple closed rectangle
- std::vector<std::pair<double,double>> points = {
+ std::vector<std::pair<double, double>> points = {
{4.0, 2.0}, {-4.0, 2.0}, {-4.0, -2.0}, {4.0, -2.0}, {4.0, 2.0}};
Polygon polygon(points);
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 1e8903f8d7645d706ed0aefbd0f08a2fe3c78b75..cc6c1c1ecce05f16f05ffe7eb4a5cf0aa6190e9c 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,7 +1,7 @@
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Model/SessionModel.h"
+#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Support/Type/VariantUtil.h"
#include "GUI/Util/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
index 36dcb341951368ad14ab1475478a28532b83efe3..50cea6de2e1655a515307c84201a5060336f2c77 100644
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
@@ -1,6 +1,6 @@
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/LayerRoughnessItems.h"
#include "GUI/Model/To/ToDomain.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 99d3dd04bfef62c390069d278ff41cf72ee270ff..fa32da327ebe20210695ceed062b83cfbf20206f 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/Device/AxesItems.h"
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/JobItemUtils.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
diff --git a/Tests/Unit/GUI/TestMapperForItem.cpp b/Tests/Unit/GUI/TestMapperForItem.cpp
index bd61e5d750cacac697d738b01e4130f264533aea..8848d9a731cbcbd25a2bbbf171185a15952059eb 100644
--- a/Tests/Unit/GUI/TestMapperForItem.cpp
+++ b/Tests/Unit/GUI/TestMapperForItem.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Device/MaskItems.h"
+#include "GUI/Model/Model/JobModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/Unit/GUI/TestMaterialItems.cpp b/Tests/Unit/GUI/TestMaterialItems.cpp
index bbfee3d2347b1705fd4274a691af75e8e5c89376..3ac0a406bf8798241de907e1f6e05a1aec2ab15a 100644
--- a/Tests/Unit/GUI/TestMaterialItems.cpp
+++ b/Tests/Unit/GUI/TestMaterialItems.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/XML/XMLUtil.h"
+#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialItems.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/XML/XMLUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 278b57f185b9153a00e11c709a5b91b8005496b0..e67d3ff3532daba6a14262f02a550c64546884b3 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,10 +1,10 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Model/JobFunctions.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/JobFunctions.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/OutputDataIOService.h"
diff --git a/Tests/Unit/GUI/TestParaCrystalItems.cpp b/Tests/Unit/GUI/TestParaCrystalItems.cpp
index a909af49684e098d20eb303329450db3d97556fb..18901dfa1affa4a13f3bae0ca0c799f96f4d9ae2 100644
--- a/Tests/Unit/GUI/TestParaCrystalItems.cpp
+++ b/Tests/Unit/GUI/TestParaCrystalItems.cpp
@@ -1,10 +1,10 @@
#include "Base/Const/Units.h"
-#include "GUI/Model/Sample/ProfileItems.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/Model/Sample/ProfileItems.h"
#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Aggregate/Interference2DParaCrystal.h"
#include "Tests/GTestWrapper/google_test.h"
@@ -22,9 +22,8 @@ TEST_F(TestParaCrystalItems, Para2DFromToDomain)
domain_size1, domain_size2);
double clength_x(1.0), clength_y(2.0), gamma(3.0);
- orig.setProbabilityDistributions(
- Profile2DCauchy(clength_x, clength_y, gamma * Units::deg),
- Profile2DGauss(clength_x, clength_y, gamma * Units::deg));
+ orig.setProbabilityDistributions(Profile2DCauchy(clength_x, clength_y, gamma * Units::deg),
+ Profile2DGauss(clength_x, clength_y, gamma * Units::deg));
// from domain
Interference2DParaCrystalItem item;
diff --git a/Tests/Unit/GUI/TestParticleLayoutItem.h b/Tests/Unit/GUI/TestParticleLayoutItem.h
index ee34610404f2d82b771f4251ac504984adcb9bea..f2a3063a1dc9fc164f74b49dd2eed0189cbaa80a 100644
--- a/Tests/Unit/GUI/TestParticleLayoutItem.h
+++ b/Tests/Unit/GUI/TestParticleLayoutItem.h
@@ -2,10 +2,10 @@
#define BORNAGAIN_TESTS_UNIT_GUI_TESTPARTICLELAYOUTITEM_H
#include "Base/Math/Constants.h"
+#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Model/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 af8f920b88a357620639dc19bce55583a440b4ed..ceb9092d2291a340aa515dbc74dde26226bc3c33 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestPropertyRepeater.cpp b/Tests/Unit/GUI/TestPropertyRepeater.cpp
index a699a4206d94b29f6ccb84c783e32e6fbe97d5e2..d8c1bceee079dbe281ae53f272ae0d48bffe8dab 100644
--- a/Tests/Unit/GUI/TestPropertyRepeater.cpp
+++ b/Tests/Unit/GUI/TestPropertyRepeater.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
index eab2d4a9036f7ebb8870563547d54ae89307756f..24edb4d72d8a8232e6076fb20aed000d82f1f7e7 100644
--- a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,9 +1,9 @@
+#include "GUI/Model/Model/ApplicationModels.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/MaterialItem.h"
+#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Model/ApplicationModels.h"
-#include "GUI/Model/Sample/MaterialItems.h"
#include "GUI/View/Realspace/Particle3DContainer.h"
#include "GUI/View/Realspace/RealSpaceBuilder.h"
#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 58abd710fea54f16712448c0e8cfbf070793bffc..36b021169115fe60326c576f93dd17a1099a8847 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index daa80a8ca937e51c034f4e8396db4d28c897f56b..a92beea71cda600c424bca2a76c6ef27490e833b 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,10 +1,10 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Sample/LayerItem.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/Support/Data/SessionItemTags.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index 886ba198067fccf9dbefdf4b190d1d42f2957cc3..0e5b92c35ba3f31115cd42b5bdd71353d0bc04cc 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -1,17 +1,17 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
-#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/XML/XMLUtil.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/Device/RectangularDetectorItem.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/Sample/FormFactorItems.h"
+#include "GUI/Model/Sample/LayerItem.h"
+#include "GUI/Model/Sample/MultiLayerItem.h"
+#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/XML/Serializer.h"
+#include "GUI/Model/XML/XMLUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
#include <QXmlStreamWriter>