From cd66854466471ba1e73a9d3882c54611f5dbb4c0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 7 Jun 2021 14:03:33 +0200
Subject: [PATCH] fix some missing 'override' in fit test plan
---
Core/Export/SimulationToPython.cpp | 9 ++--
GUI/Models/AxesItems.cpp | 3 +-
GUI/Models/AxesItems.h | 1 -
GUI/Models/BackgroundItems.cpp | 4 +-
GUI/Models/BeamAngleItems.cpp | 14 +++--
GUI/Models/BeamDistributionItem.cpp | 11 ++--
GUI/Models/BeamDistributionItem.h | 9 ++--
GUI/Models/BeamItems.cpp | 41 ++++++--------
GUI/Models/BeamItems.h | 17 +++---
GUI/Models/BeamWavelengthItem.cpp | 14 ++---
GUI/Models/BeamWavelengthItem.h | 3 +-
GUI/Models/ComponentProxyStrategy.cpp | 3 +-
GUI/Models/ComponentUtils.cpp | 16 +++---
GUI/Models/Data1DViewItem.cpp | 3 +-
GUI/Models/DataItem.h | 3 +-
GUI/Models/DataItemUtils.cpp | 3 +-
GUI/Models/DataPropertyContainer.cpp | 3 +-
GUI/Models/DetectorItems.h | 2 +-
GUI/Models/DistributionItems.cpp | 29 +++++-----
GUI/Models/DomainSimulationBuilder.cpp | 3 +-
GUI/Models/Error.cpp | 4 +-
GUI/Models/Error.h | 2 +-
GUI/Models/FitParameterProxyModel.cpp | 5 +-
GUI/Models/GroupInfoCatalog.cpp | 7 ++-
GUI/Models/InstrumentItems.cpp | 5 +-
GUI/Models/InstrumentItems.h | 13 ++---
GUI/Models/InstrumentModel.cpp | 4 +-
GUI/Models/IntensityDataItem.cpp | 10 ++--
GUI/Models/IntensityDataItem.h | 1 -
GUI/Models/ItemCatalog.cpp | 6 +--
GUI/Models/ItemCatalog.h | 2 +-
GUI/Models/JobItem.cpp | 19 +++----
GUI/Models/JobItem.h | 10 ++--
GUI/Models/JobModel.cpp | 3 +-
GUI/Models/JobQueueData.cpp | 3 +-
GUI/Models/MaterialItem.cpp | 2 +-
GUI/Models/MaterialItemUtils.cpp | 4 +-
GUI/Models/MaterialModelStore.cpp | 38 ++++++-------
GUI/Models/MaterialModelStore.h | 8 +--
GUI/Models/PointwiseAxisItem.h | 2 +-
GUI/Models/RealDataItem.cpp | 9 ++--
GUI/Models/RealLimitsItems.cpp | 23 ++++----
GUI/Models/RealLimitsItems.h | 7 ++-
GUI/Models/RectangularDetectorItem.cpp | 6 +--
GUI/Models/SessionItem.h | 6 +--
GUI/Models/SessionItemTags.cpp | 2 +-
GUI/Models/SessionXML.cpp | 3 +-
GUI/Models/SpecularBeamInclinationItem.cpp | 12 ++---
GUI/Models/SpecularBeamInclinationItem.h | 2 +-
GUI/Models/SpecularDataItem.cpp | 3 +-
GUI/Models/SpecularDataItem.h | 1 -
GUI/Models/SphericalDetectorItem.cpp | 6 +--
GUI/Models/TransformFromDomain.cpp | 11 ++--
GUI/Models/TransformToDomain.cpp | 18 +++----
GUI/Models/TransformToDomain.h | 3 +-
.../FitWidgets/FitComparisonController.cpp | 3 +-
GUI/Views/FitWidgets/FitObjectiveBuilder.cpp | 5 +-
.../ImportDataWidgets/RealDataMaskWidget.cpp | 3 +-
.../ImportDataWidgets/RealDataPresenter.cpp | 3 +-
.../DepthProbeInstrumentEditor.cpp | 3 +-
GUI/Views/IntensityDataWidgets/ColorMap.cpp | 3 +-
.../IntensityDataWidgets/ColorMapUtils.cpp | 3 +-
.../IntensityDataCanvas.cpp | 10 ++--
.../IntensityDataProjectionsWidget.cpp | 3 +-
.../IntensityDataWidgets/ProjectionsPlot.cpp | 3 +-
.../JobWidgets/ParameterTuningWidget.cpp | 2 +-
GUI/Views/MaskWidgets/MaskEditorCanvas.cpp | 2 +-
GUI/Views/MaskWidgets/MaskGraphicsScene.cpp | 3 +-
GUI/Views/RealSpaceWidgets/RealSpaceView.cpp | 2 +-
GUI/Views/SampleDesigner/ILayerView.cpp | 2 +-
.../SimulationSetupWidget.cpp | 2 +-
.../SpecularDataCanvas.cpp | 2 +-
GUI/mainwindow/OutputDataIOHistory.cpp | 6 ++-
GUI/mainwindow/ProjectManagerStore.cpp | 54 +++++++++----------
GUI/mainwindow/ProjectManagerStore.h | 8 +--
GUI/mainwindow/ProjectUtils.cpp | 6 +--
GUI/utils/GUIHelpers.cpp | 5 +-
.../Core/Fitting/AdjustMinimizerPlan.h | 5 +-
Tests/Functional/Core/Fitting/Plan.h | 2 +-
Tests/Functional/Core/Fitting/PlanCases.h | 26 ++++-----
.../GUI/TestMaterialPropertyController.cpp | 2 +-
.../UnitTests/GUI/TestOutputDataIOService.cpp | 5 +-
.../UnitTests/GUI/TestSavingSpecularData.cpp | 12 ++---
83 files changed, 262 insertions(+), 374 deletions(-)
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index e82a9f34b30..3219914e83c 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -200,11 +200,10 @@ std::string defineDetector(const ISimulation* simulation)
if (detector->hasExplicitRegionOfInterest()) {
const auto xBounds = detector->regionOfInterestBounds(0);
const auto yBounds = detector->regionOfInterestBounds(1);
- result << indent() << "detector.setRegionOfInterest("
- << printFunc(detector)(xBounds.first) << ", "
- << printFunc(detector)(yBounds.first) << ", "
- << printFunc(detector)(xBounds.second) << ", "
- << printFunc(detector)(yBounds.second) << ")\n";
+ result << indent() << "detector.setRegionOfInterest(" << printFunc(detector)(xBounds.first)
+ << ", " << printFunc(detector)(yBounds.first) << ", "
+ << printFunc(detector)(xBounds.second) << ", " << printFunc(detector)(yBounds.second)
+ << ")\n";
}
return result.str();
}
diff --git a/GUI/Models/AxesItems.cpp b/GUI/Models/AxesItems.cpp
index 59c8b1614d5..5e7996d2fab 100644
--- a/GUI/Models/AxesItems.cpp
+++ b/GUI/Models/AxesItems.cpp
@@ -26,8 +26,7 @@ const QString BasicAxisItem::M_TYPE = "BasicAxis";
const int max_detector_pixels = 65536;
-BasicAxisItem::BasicAxisItem() : BasicAxisItem(M_TYPE)
-{}
+BasicAxisItem::BasicAxisItem() : BasicAxisItem(M_TYPE) {}
int BasicAxisItem::binCount() const
{
diff --git a/GUI/Models/AxesItems.h b/GUI/Models/AxesItems.h
index ac0b370adce..a3735b78a1d 100644
--- a/GUI/Models/AxesItems.h
+++ b/GUI/Models/AxesItems.h
@@ -74,7 +74,6 @@ private:
static const QString P_LOCK_MIN_MAX;
public:
-
static const QString M_TYPE;
AmplitudeAxisItem();
diff --git a/GUI/Models/BackgroundItems.cpp b/GUI/Models/BackgroundItems.cpp
index ad2e9c0e9f5..4c70461ecb1 100644
--- a/GUI/Models/BackgroundItems.cpp
+++ b/GUI/Models/BackgroundItems.cpp
@@ -63,9 +63,7 @@ void ConstantBackgroundItem::setBackgroundValue(double value)
const QString PoissonNoiseBackgroundItem::M_TYPE = "PoissonNoiseBackground";
-PoissonNoiseBackgroundItem::PoissonNoiseBackgroundItem() : BackgroundItem(M_TYPE)
-{
-}
+PoissonNoiseBackgroundItem::PoissonNoiseBackgroundItem() : BackgroundItem(M_TYPE) {}
std::unique_ptr<IBackground> PoissonNoiseBackgroundItem::createBackground() const
{
diff --git a/GUI/Models/BeamAngleItems.cpp b/GUI/Models/BeamAngleItems.cpp
index 7a8dfabcd24..ae653ef43a5 100644
--- a/GUI/Models/BeamAngleItems.cpp
+++ b/GUI/Models/BeamAngleItems.cpp
@@ -17,13 +17,12 @@
const QString BeamAzimuthalAngleItem::M_TYPE = "BeamAzimuthalAngle";
-BeamAzimuthalAngleItem::BeamAzimuthalAngleItem()
- : BeamDistributionItem(M_TYPE, m_show_mean)
+BeamAzimuthalAngleItem::BeamAzimuthalAngleItem() : BeamDistributionItem(M_TYPE, m_show_mean)
{
register_distribution_group("Distribution extended group");
- SessionItem* valueItem = dynamic_cast<SymmetricDistributionItem*>
- (distributionGroupItem())->meanItem();
+ SessionItem* valueItem =
+ dynamic_cast<SymmetricDistributionItem*>(distributionGroupItem())->meanItem();
valueItem->setLimits(RealLimits::limited(-90.0, 90.0));
valueItem->setDecimals(3);
valueItem->setValue(0.0);
@@ -47,13 +46,12 @@ double BeamAzimuthalAngleItem::scaleFactor() const
const QString BeamInclinationAngleItem::M_TYPE = "BeamInclinationAngle";
-BeamInclinationAngleItem::BeamInclinationAngleItem()
- : BeamDistributionItem(M_TYPE, m_show_mean)
+BeamInclinationAngleItem::BeamInclinationAngleItem() : BeamDistributionItem(M_TYPE, m_show_mean)
{
register_distribution_group("Distribution extended group");
- SessionItem* valueItem = dynamic_cast<SymmetricDistributionItem*>
- (distributionGroupItem())->meanItem();
+ SessionItem* valueItem =
+ dynamic_cast<SymmetricDistributionItem*>(distributionGroupItem())->meanItem();
valueItem->setLimits(RealLimits::limited(0.0, 90.0));
valueItem->setDecimals(3);
valueItem->setValue(0.2);
diff --git a/GUI/Models/BeamDistributionItem.cpp b/GUI/Models/BeamDistributionItem.cpp
index 417ee04582a..bca775c5d16 100644
--- a/GUI/Models/BeamDistributionItem.cpp
+++ b/GUI/Models/BeamDistributionItem.cpp
@@ -85,9 +85,7 @@ void BeamDistributionItem::initDistributionItem(bool show_mean)
distrItem->init_parameters(distributionNone->meanValue(), limits);
if (auto symmetric_distr = dynamic_cast<SymmetricDistributionItem*>(distrItem))
- symmetric_distr->meanItem()
- ->setEditorType(editor_type)
- .setLimits(limits);
+ symmetric_distr->meanItem()->setEditorType(editor_type).setLimits(limits);
// hiding limits from the editor
if (distrItem->hasLimits())
@@ -103,14 +101,13 @@ double BeamDistributionItem::meanValue() const
if (domainDistr)
return domainDistr->getMean() / scaleFactor();
else
- return dynamic_cast<SymmetricDistributionItem*>
- (getGroupItem(P_DISTRIBUTION))->meanValue();
+ return dynamic_cast<SymmetricDistributionItem*>(getGroupItem(P_DISTRIBUTION))->meanValue();
}
void BeamDistributionItem::resetToValue(double value)
{
- DistributionNoneItem* distributionItem = dynamic_cast<DistributionNoneItem*>
- (setGroupProperty(P_DISTRIBUTION, DistributionNoneItem::M_TYPE));
+ DistributionNoneItem* distributionItem = dynamic_cast<DistributionNoneItem*>(
+ setGroupProperty(P_DISTRIBUTION, DistributionNoneItem::M_TYPE));
ASSERT(distributionItem);
distributionItem->setMeanValue(value);
}
diff --git a/GUI/Models/BeamDistributionItem.h b/GUI/Models/BeamDistributionItem.h
index 26d90ea8884..a69d9adefa9 100644
--- a/GUI/Models/BeamDistributionItem.h
+++ b/GUI/Models/BeamDistributionItem.h
@@ -37,8 +37,8 @@ public:
virtual double scaleFactor() const;
SessionItem* distributionGroupItem() const;
- template<typename T> T* setDistributionGroupItem();
- SessionItem* distributionItem() const;
+ template <typename T> T* setDistributionGroupItem();
+ SessionItem* distributionItem() const;
protected:
void register_distribution_group(const QString& group_type);
@@ -47,10 +47,9 @@ protected:
virtual std::unique_ptr<IDistribution1D> createDistribution1D() const;
};
-template<typename T>
-T* BeamDistributionItem::setDistributionGroupItem()
+template <typename T> T* BeamDistributionItem::setDistributionGroupItem()
{
- static_assert(std::is_base_of<DistributionItem,T>::value,
+ static_assert(std::is_base_of<DistributionItem, T>::value,
"Class must be derived from DistributionItem");
return dynamic_cast<T*>(setGroupProperty(P_DISTRIBUTION, T::M_TYPE));
diff --git a/GUI/Models/BeamItems.cpp b/GUI/Models/BeamItems.cpp
index 608866cb37f..df08f3f6af0 100644
--- a/GUI/Models/BeamItems.cpp
+++ b/GUI/Models/BeamItems.cpp
@@ -127,17 +127,17 @@ std::unique_ptr<Beam> BeamItem::createBeam() const
return result;
}
-template<typename T> void BeamItem::initWavelength()
+template <typename T> void BeamItem::initWavelength()
{
- static_assert(std::is_base_of<BeamWavelengthItem,T>::value,
+ static_assert(std::is_base_of<BeamWavelengthItem, T>::value,
"Class must be derived from BeamWavelengthItem");
addProperty<T>(P_WAVELENGTH);
}
-template<typename T> void BeamItem::initInclinationAngle()
+template <typename T> void BeamItem::initInclinationAngle()
{
- static_assert(std::is_base_of<BeamDistributionItem,T>::value,
+ static_assert(std::is_base_of<BeamDistributionItem, T>::value,
"Class must be derived from BeamDistributionItem");
addProperty<T>(P_INCLINATION_ANGLE);
@@ -164,16 +164,14 @@ SpecularBeamItem::SpecularBeamItem() : BeamItem(M_TYPE)
item->setDisplayName(footprint_group_label);
item->setToolTip("Footprint type");
- wavelengthItem()
- ->mapper()
- ->setOnChildPropertyChange(
- [this](SessionItem*, QString property) {
- if (! SymmetricDistributionItem::isMeanPropertyName(property))
- return;
- if (auto axis_item = dynamic_cast<PointwiseAxisItem*>(currentInclinationAxisItem()))
- axis_item->updateIndicators();
- },
- this);
+ wavelengthItem()->mapper()->setOnChildPropertyChange(
+ [this](SessionItem*, QString property) {
+ if (!SymmetricDistributionItem::isMeanPropertyName(property))
+ return;
+ if (auto axis_item = dynamic_cast<PointwiseAxisItem*>(currentInclinationAxisItem()))
+ axis_item->updateIndicators();
+ },
+ this);
inclinationAxisGroup()->mapper()->setOnValueChange([this]() { updateWavelength(); }, this);
}
@@ -194,8 +192,7 @@ void SpecularBeamItem::setInclinationAngle(double value)
SpecularBeamInclinationItem* SpecularBeamItem::inclinationAngleItem() const
{
- return dynamic_cast<SpecularBeamInclinationItem*>
- (BeamItem::inclinationAngleItem());
+ return dynamic_cast<SpecularBeamInclinationItem*>(BeamItem::inclinationAngleItem());
}
GroupItem* SpecularBeamItem::inclinationAxisGroup()
@@ -216,14 +213,12 @@ FootprintItem* SpecularBeamItem::currentFootprintItem() const
void SpecularBeamItem::setGaussianFootprint(double value)
{
- setGroupPropertyType<FootprintGaussianItem>(P_FOOPTPRINT)
- ->setGaussianFootprintValue(value);
+ setGroupPropertyType<FootprintGaussianItem>(P_FOOPTPRINT)->setGaussianFootprintValue(value);
}
void SpecularBeamItem::setSquareFootprint(double value)
{
- setGroupPropertyType<FootprintSquareItem>(P_FOOPTPRINT)
- ->setSquareFootprintValue(value);
+ setGroupPropertyType<FootprintSquareItem>(P_FOOPTPRINT)->setSquareFootprintValue(value);
}
SessionItem* SpecularBeamItem::footprintGroupItem() const
@@ -233,8 +228,7 @@ SessionItem* SpecularBeamItem::footprintGroupItem() const
void SpecularBeamItem::updateFileName(const QString& filename)
{
- dynamic_cast<SpecularBeamInclinationItem*>(inclinationAngleItem())
- ->updateFileName(filename);
+ dynamic_cast<SpecularBeamInclinationItem*>(inclinationAngleItem())->updateFileName(filename);
}
void SpecularBeamItem::updateToData(const IAxis& axis, QString units)
@@ -280,8 +274,7 @@ GISASBeamItem::~GISASBeamItem() = default;
double GISASBeamItem::getInclinationAngle() const
{
- return dynamic_cast<BeamInclinationAngleItem*>(inclinationAngleItem())
- ->inclinationAngle();
+ return dynamic_cast<BeamInclinationAngleItem*>(inclinationAngleItem())->inclinationAngle();
}
namespace {
diff --git a/GUI/Models/BeamItems.h b/GUI/Models/BeamItems.h
index 8494d20a22b..44c9c8f4b69 100644
--- a/GUI/Models/BeamItems.h
+++ b/GUI/Models/BeamItems.h
@@ -45,11 +45,11 @@ public:
double wavelength() const;
void setWavelength(double value);
BeamWavelengthItem* wavelengthItem() const;
-
+
virtual double getInclinationAngle() const = 0;
virtual void setInclinationAngle(double value);
virtual BeamDistributionItem* inclinationAngleItem() const;
-
+
double getAzimuthalAngle() const;
void setAzimuthalAngle(double value);
BeamAzimuthalAngleItem* azimuthalAngleItem() const;
@@ -61,21 +61,19 @@ public:
protected:
explicit BeamItem(const QString& beam_model);
- template<typename T> void initWavelength();
- template<typename T> void initInclinationAngle();
+ template <typename T> void initWavelength();
+ template <typename T> void initInclinationAngle();
};
class BA_CORE_API_ SpecularBeamItem : public BeamItem {
public:
-
static const QString M_TYPE;
private:
static const QString P_FOOPTPRINT;
public:
-
SpecularBeamItem();
~SpecularBeamItem() override;
@@ -84,12 +82,12 @@ public:
SpecularBeamInclinationItem* inclinationAngleItem() const override;
GroupItem* inclinationAxisGroup();
BasicAxisItem* currentInclinationAxisItem();
-
+
FootprintItem* currentFootprintItem() const;
void setGaussianFootprint(double value);
- void setSquareFootprint(double value);
+ void setSquareFootprint(double value);
SessionItem* footprintGroupItem() const;
-
+
void updateFileName(const QString& filename);
void updateToData(const IAxis& axis, QString units);
@@ -99,7 +97,6 @@ private:
class BA_CORE_API_ GISASBeamItem : public BeamItem {
public:
-
static const QString M_TYPE;
GISASBeamItem();
diff --git a/GUI/Models/BeamWavelengthItem.cpp b/GUI/Models/BeamWavelengthItem.cpp
index c21a28406b5..f838db6c06b 100644
--- a/GUI/Models/BeamWavelengthItem.cpp
+++ b/GUI/Models/BeamWavelengthItem.cpp
@@ -20,9 +20,9 @@ const double default_wl = 0.1;
const QString BeamWavelengthItem::M_TYPE = "BeamWavelength";
-BeamWavelengthItem::BeamWavelengthItem()
- : BeamWavelengthItem(M_TYPE, "Distribution extended group")
-{}
+BeamWavelengthItem::BeamWavelengthItem() : BeamWavelengthItem(M_TYPE, "Distribution extended group")
+{
+}
//! Returns wavelength. In the case of distribution applied, returns its mean.
@@ -36,8 +36,8 @@ BeamWavelengthItem::BeamWavelengthItem(const QString& model_type, const QString&
{
register_distribution_group(distribution_group);
- SessionItem* valueItem = dynamic_cast<SymmetricDistributionItem*>
- (distributionGroupItem())->meanItem();
+ SessionItem* valueItem =
+ dynamic_cast<SymmetricDistributionItem*>(distributionGroupItem())->meanItem();
valueItem->setLimits(RealLimits::positive());
valueItem->setDecimals(4);
valueItem->setValue(default_wl);
@@ -57,8 +57,8 @@ SpecularBeamWavelengthItem::SpecularBeamWavelengthItem()
void SpecularBeamWavelengthItem::setToRange(const RealLimits& limits)
{
- SessionItem* valueItem = dynamic_cast<SymmetricDistributionItem*>
- (distributionGroupItem())->meanItem();
+ SessionItem* valueItem =
+ dynamic_cast<SymmetricDistributionItem*>(distributionGroupItem())->meanItem();
if (!limits.isInRange(wavelength())) {
const double new_value =
limits.isLimited() ? (limits.upperLimit() - limits.lowerLimit()) / 2. : default_wl;
diff --git a/GUI/Models/BeamWavelengthItem.h b/GUI/Models/BeamWavelengthItem.h
index 072086aa985..86bfa1f177f 100644
--- a/GUI/Models/BeamWavelengthItem.h
+++ b/GUI/Models/BeamWavelengthItem.h
@@ -25,8 +25,7 @@ public:
double wavelength() const;
protected:
- BeamWavelengthItem(const QString& model_type,
- const QString& distribution_group);
+ BeamWavelengthItem(const QString& model_type, const QString& distribution_group);
private:
static const bool m_show_mean = true;
diff --git a/GUI/Models/ComponentProxyStrategy.cpp b/GUI/Models/ComponentProxyStrategy.cpp
index 9765ee8e43a..2fa74572528 100644
--- a/GUI/Models/ComponentProxyStrategy.cpp
+++ b/GUI/Models/ComponentProxyStrategy.cpp
@@ -60,8 +60,7 @@ bool ComponentProxyStrategy::processSourceIndex(const QModelIndex& index)
bool ComponentProxyStrategy::isPropertyRelated(SessionItem* item)
{
- static const QStringList& propertyRelated =
- ComponentUtils::propertyRelatedTypes();
+ static const QStringList& propertyRelated = ComponentUtils::propertyRelatedTypes();
if (m_sourceRootIndex.isValid() && item->parent()->index() == m_sourceRootIndex
&& item->parent()->modelType() != "GroupProperty")
diff --git a/GUI/Models/ComponentUtils.cpp b/GUI/Models/ComponentUtils.cpp
index c8bb8fdedff..02679011348 100644
--- a/GUI/Models/ComponentUtils.cpp
+++ b/GUI/Models/ComponentUtils.cpp
@@ -23,20 +23,18 @@ QList<const SessionItem*> groupItems(const SessionItem& item);
const QStringList& ComponentUtils::propertyRelatedTypes()
{
- static const QStringList result =
- { "Property",
- "GroupProperty",
- "Vector",
- BasicAxisItem::M_TYPE,
- AmplitudeAxisItem::M_TYPE,
- MaterialRefractiveDataItem::M_TYPE };
+ static const QStringList result = {"Property",
+ "GroupProperty",
+ "Vector",
+ BasicAxisItem::M_TYPE,
+ AmplitudeAxisItem::M_TYPE,
+ MaterialRefractiveDataItem::M_TYPE};
return result;
}
QList<const SessionItem*> ComponentUtils::componentItems(const SessionItem& item)
{
- static const QStringList& propertyRelated =
- ComponentUtils::propertyRelatedTypes();
+ static const QStringList& propertyRelated = ComponentUtils::propertyRelatedTypes();
QList<const SessionItem*> result;
diff --git a/GUI/Models/Data1DViewItem.cpp b/GUI/Models/Data1DViewItem.cpp
index ed67ed299b8..f0e6cb7f15c 100644
--- a/GUI/Models/Data1DViewItem.cpp
+++ b/GUI/Models/Data1DViewItem.cpp
@@ -174,8 +174,7 @@ JobItem* Data1DViewItem::jobItem()
return m_job_item;
}
} while ((item = item->parent()));
- throw Error(
- "Error in DataItem1DView::jobItem: passed item is not owned by any job item");
+ throw Error("Error in DataItem1DView::jobItem: passed item is not owned by any job item");
}
void Data1DViewItem::setLowerX(double value)
diff --git a/GUI/Models/DataItem.h b/GUI/Models/DataItem.h
index 0287f859ade..d3842953cbd 100644
--- a/GUI/Models/DataItem.h
+++ b/GUI/Models/DataItem.h
@@ -36,7 +36,6 @@ private:
static const QString P_AXES_UNITS;
public:
-
OutputData<double>* getOutputData() { return m_data.get(); }
const OutputData<double>* getOutputData() const { return m_data.get(); }
@@ -62,7 +61,7 @@ public:
void setAxesUnits(const ComboProperty& units);
SessionItem* getAxesUnitsItem() const;
static bool isAxesUnitsPropertyName(const QString& name);
-
+
virtual void setXaxisTitle(const QString& title) = 0;
virtual void setYaxisTitle(const QString& title) = 0;
virtual void setAxesRangeToData() = 0;
diff --git a/GUI/Models/DataItemUtils.cpp b/GUI/Models/DataItemUtils.cpp
index f537fac09cb..c6f7eff0c5e 100644
--- a/GUI/Models/DataItemUtils.cpp
+++ b/GUI/Models/DataItemUtils.cpp
@@ -25,8 +25,7 @@ template <class DataItemType> DataItemType* dataItem(SessionItem* parent)
ASSERT(parent && "Assertion failed in DataItemUtils::dataItem: nullptr passed.");
if (parent->modelType() == JobItem::M_TYPE)
- return dynamic_cast<DataItemType*>
- (dynamic_cast<JobItem*>(parent)->dataItem());
+ return dynamic_cast<DataItemType*>(dynamic_cast<JobItem*>(parent)->dataItem());
else if (auto real_data = dynamic_cast<RealDataItem*>(parent))
return dynamic_cast<DataItemType*>(real_data->dataItem());
else if (auto self = dynamic_cast<DataItemType*>(parent))
diff --git a/GUI/Models/DataPropertyContainer.cpp b/GUI/Models/DataPropertyContainer.cpp
index a3daab4d02d..44d70a05130 100644
--- a/GUI/Models/DataPropertyContainer.cpp
+++ b/GUI/Models/DataPropertyContainer.cpp
@@ -55,8 +55,7 @@ DataItem* DataPropertyContainer::basicDataItem()
void DataPropertyContainer::addItem(DataItem* data_item)
{
if (this->model() != data_item->model())
- throw Error(
- "Error in DataPropertyContainer::addItem: hosting models are different");
+ throw Error("Error in DataPropertyContainer::addItem: hosting models are different");
auto property_items = propertyItems();
Data1DProperties* previous_item = nullptr;
diff --git a/GUI/Models/DetectorItems.h b/GUI/Models/DetectorItems.h
index 0888aad6495..f69b3e846ea 100644
--- a/GUI/Models/DetectorItems.h
+++ b/GUI/Models/DetectorItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_DETECTORITEMS_H
#define BORNAGAIN_GUI_MODELS_DETECTORITEMS_H
-#include "GUI/Models/SessionItem.h"
#include "Base/Vector/Vectors3D.h"
+#include "GUI/Models/SessionItem.h"
class MaskContainerItem;
class IDetector2D;
diff --git a/GUI/Models/DistributionItems.cpp b/GUI/Models/DistributionItems.cpp
index b0be4087031..863944e208e 100644
--- a/GUI/Models/DistributionItems.cpp
+++ b/GUI/Models/DistributionItems.cpp
@@ -59,16 +59,16 @@ void DistributionItem::init_limits_group(const RealLimits& limits, double factor
} else if (limits.isNonnegative()) {
setGroupProperty(P_LIMITS, NonnegativeItem::M_TYPE);
} else if (limits.isLowerLimited()) {
- LowerLimitedItem* lim = dynamic_cast<LowerLimitedItem*>
- (setGroupProperty(P_LIMITS, LowerLimitedItem::M_TYPE));
+ LowerLimitedItem* lim =
+ dynamic_cast<LowerLimitedItem*>(setGroupProperty(P_LIMITS, LowerLimitedItem::M_TYPE));
lim->setLowerLimit(limits.lowerLimit() * factor);
} else if (limits.isUpperLimited()) {
- UpperLimitedItem* lim = dynamic_cast<UpperLimitedItem*>
- (setGroupProperty(P_LIMITS, UpperLimitedItem::M_TYPE));
+ UpperLimitedItem* lim =
+ dynamic_cast<UpperLimitedItem*>(setGroupProperty(P_LIMITS, UpperLimitedItem::M_TYPE));
lim->setUpperLimit(limits.upperLimit() * factor);
} else if (limits.isLimited()) {
- LimitedItem* lim = dynamic_cast<LimitedItem*>
- (setGroupProperty(P_LIMITS, LimitedItem::M_TYPE));
+ LimitedItem* lim =
+ dynamic_cast<LimitedItem*>(setGroupProperty(P_LIMITS, LimitedItem::M_TYPE));
lim->setLowerLimit(limits.lowerLimit() * factor);
lim->setUpperLimit(limits.upperLimit() * factor);
}
@@ -99,7 +99,7 @@ size_t DistributionItem::numberOfSamples() const
void DistributionItem::setNumberOfSamples(const size_t number)
{
// legacy representation as 'int'
- setItemValue(P_NUMBER_OF_SAMPLES, static_cast<int>(number));
+ setItemValue(P_NUMBER_OF_SAMPLES, static_cast<int>(number));
}
bool DistributionItem::hasSigmaFactor() const
@@ -171,8 +171,7 @@ bool SymmetricDistributionItem::isMeanPropertyName(const QString& name)
const QString DistributionNoneItem::M_TYPE = "DistributionNone";
-DistributionNoneItem::DistributionNoneItem()
- : SymmetricDistributionItem(M_TYPE, 0.1)
+DistributionNoneItem::DistributionNoneItem() : SymmetricDistributionItem(M_TYPE, 0.1)
{
meanItem()->setDisplayName("Value");
meanItem()->setDecimals(4);
@@ -244,8 +243,7 @@ const QString DistributionLorentzItem::P_HWHM = "HWHM";
const QString DistributionLorentzItem::M_TYPE = "DistributionLorentz";
-DistributionLorentzItem::DistributionLorentzItem()
- : SymmetricDistributionItem(M_TYPE, 1.0)
+DistributionLorentzItem::DistributionLorentzItem() : SymmetricDistributionItem(M_TYPE, 1.0)
{
addProperty(P_HWHM, 1.0);
register_number_of_samples();
@@ -293,8 +291,7 @@ const QString DistributionGaussianItem::P_STD_DEV = "StdDev";
const QString DistributionGaussianItem::M_TYPE = "DistributionGaussian";
-DistributionGaussianItem::DistributionGaussianItem()
- : SymmetricDistributionItem(M_TYPE, 1.0)
+DistributionGaussianItem::DistributionGaussianItem() : SymmetricDistributionItem(M_TYPE, 1.0)
{
addProperty(P_STD_DEV, 1.0);
register_number_of_samples();
@@ -391,8 +388,7 @@ const QString DistributionCosineItem::P_SIGMA = "Sigma";
const QString DistributionCosineItem::M_TYPE = "DistributionCosine";
-DistributionCosineItem::DistributionCosineItem()
- : SymmetricDistributionItem(M_TYPE, 1.0)
+DistributionCosineItem::DistributionCosineItem() : SymmetricDistributionItem(M_TYPE, 1.0)
{
addProperty(P_SIGMA, 1.0);
register_number_of_samples();
@@ -509,8 +505,7 @@ createIRangedDistribution(const SymmetricDistributionItem& distr_item, double sc
RealLimitsItem* limits_item = distr_item.limitsGroupItem();
const RealLimits limits =
- limits_item ? limits_item->createRealLimits(scale)
- : RealLimits::limitless();
+ limits_item ? limits_item->createRealLimits(scale) : RealLimits::limitless();
return std::make_unique<DistrType>(n_samples, n_sig, limits);
}
diff --git a/GUI/Models/DomainSimulationBuilder.cpp b/GUI/Models/DomainSimulationBuilder.cpp
index 8adbc173336..3d97c208490 100644
--- a/GUI/Models/DomainSimulationBuilder.cpp
+++ b/GUI/Models/DomainSimulationBuilder.cpp
@@ -154,6 +154,5 @@ DomainSimulationBuilder::createSimulation(const MultiLayerItem* sampleItem,
else if (auto penetrator = dynamic_cast<const DepthProbeInstrumentItem*>(instrumentItem))
return createDepthProbeSimulation(std::move(P_multilayer), penetrator, optionsItem);
- throw Error(
- "DomainSimulationBuilder::createSimulation() -> Error. Not yet implemented");
+ throw Error("DomainSimulationBuilder::createSimulation() -> Error. Not yet implemented");
}
diff --git a/GUI/Models/Error.cpp b/GUI/Models/Error.cpp
index 27359a2d60d..b6881446d5b 100644
--- a/GUI/Models/Error.cpp
+++ b/GUI/Models/Error.cpp
@@ -14,9 +14,7 @@
#include "GUI/Models/Error.h"
-Error::Error(const QString& message) noexcept
- : m_messageAsLatin1(message.toLatin1())
-{}
+Error::Error(const QString& message) noexcept : m_messageAsLatin1(message.toLatin1()) {}
const char* Error::what() const noexcept
{
diff --git a/GUI/Models/Error.h b/GUI/Models/Error.h
index b13f097e1b2..29ea6035c89 100644
--- a/GUI/Models/Error.h
+++ b/GUI/Models/Error.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_ERROR_H
#define BORNAGAIN_GUI_MODELS_ERROR_H
-#include <QString>
#include <QByteArray>
+#include <QString>
class Error : public std::exception {
public:
diff --git a/GUI/Models/FitParameterProxyModel.cpp b/GUI/Models/FitParameterProxyModel.cpp
index 7ab7a38e7d7..9b591a2c25a 100644
--- a/GUI/Models/FitParameterProxyModel.cpp
+++ b/GUI/Models/FitParameterProxyModel.cpp
@@ -39,9 +39,8 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar
m_root_item->mapper()->setOnItemDestroy(
[this](SessionItem* parentItem) {
if (parentItem != m_root_item) {
- throw Error(
- "FitParameterProxyModel::FitParameterProxyModel() -> Error. "
- "Wrong item reported.");
+ throw Error("FitParameterProxyModel::FitParameterProxyModel() -> Error. "
+ "Wrong item reported.");
}
m_root_item = 0;
},
diff --git a/GUI/Models/GroupInfoCatalog.cpp b/GUI/Models/GroupInfoCatalog.cpp
index bc388ad4c86..76bfa2808b8 100644
--- a/GUI/Models/GroupInfoCatalog.cpp
+++ b/GUI/Models/GroupInfoCatalog.cpp
@@ -214,8 +214,7 @@ GroupInfo GroupInfoCatalog::groupInfo(const QString& groupType) const
if (info.groupType() == groupType)
return info;
- throw Error("GroupInfoCatalog::groupInfo() -> Error. No such group '" + groupType
- + "'");
+ throw Error("GroupInfoCatalog::groupInfo() -> Error. No such group '" + groupType + "'");
}
bool GroupInfoCatalog::containsGroup(const QString& groupType) const
@@ -230,8 +229,8 @@ bool GroupInfoCatalog::containsGroup(const QString& groupType) const
void GroupInfoCatalog::addInfo(const GroupInfo& info)
{
if (containsGroup(info.groupType()))
- throw Error("GroupInfoCatalog::addInfo -> Error. Already exists '"
- + info.groupType() + "'");
+ throw Error("GroupInfoCatalog::addInfo -> Error. Already exists '" + info.groupType()
+ + "'");
m_groups.push_back(info);
}
diff --git a/GUI/Models/InstrumentItems.cpp b/GUI/Models/InstrumentItems.cpp
index 77d137ab503..7ee54e7eb71 100644
--- a/GUI/Models/InstrumentItems.cpp
+++ b/GUI/Models/InstrumentItems.cpp
@@ -136,7 +136,7 @@ template <typename T> void InstrumentItem::addBeam()
template <typename T> T* InstrumentItem::beam() const
{
- return item<T>(P_BEAM);
+ return item<T>(P_BEAM);
}
// ************************************************************************************************
@@ -150,8 +150,7 @@ SpecularInstrumentItem::SpecularInstrumentItem() : InstrumentItem(M_TYPE)
addBeam<SpecularBeamItem>();
initBackgroundGroup();
- beam<SpecularBeamItem>()->updateFileName(
- ItemFileNameUtils::instrumentDataFileName(*this));
+ beam<SpecularBeamItem>()->updateFileName(ItemFileNameUtils::instrumentDataFileName(*this));
}
SpecularBeamItem* SpecularInstrumentItem::beamItem() const
diff --git a/GUI/Models/InstrumentItems.h b/GUI/Models/InstrumentItems.h
index 295fbb87237..5578aef15d9 100644
--- a/GUI/Models/InstrumentItems.h
+++ b/GUI/Models/InstrumentItems.h
@@ -95,13 +95,12 @@ private:
static const QString P_DETECTOR;
public:
-
~Instrument2DItem() override;
DetectorItem* detectorItem() const;
GroupItem* detectorGroup();
- template <typename T> T* setDetectorGroup();
+ template <typename T> T* setDetectorGroup();
void clearMasks() override;
void importMasks(const MaskContainerItem* maskContainer) override;
@@ -171,19 +170,17 @@ public:
SessionItem* zAxis() const;
};
-template <typename T>
-T* InstrumentItem::setBackgroundType()
+template <typename T> T* InstrumentItem::setBackgroundType()
{
- static_assert(std::is_base_of<BackgroundItem,T>::value,
+ static_assert(std::is_base_of<BackgroundItem, T>::value,
"Class must be derived from BackgroundItem");
return setGroupPropertyType<T>(P_BACKGROUND);
}
-template <typename T>
-T* Instrument2DItem::setDetectorGroup()
+template <typename T> T* Instrument2DItem::setDetectorGroup()
{
- static_assert(std::is_base_of<DetectorItem,T>::value,
+ static_assert(std::is_base_of<DetectorItem, T>::value,
"Class must be derived from DetectorItem");
return static_cast<T*>(setGroupProperty(P_DETECTOR, T::M_TYPE));
diff --git a/GUI/Models/InstrumentModel.cpp b/GUI/Models/InstrumentModel.cpp
index d5ed57874cf..7493b699623 100644
--- a/GUI/Models/InstrumentModel.cpp
+++ b/GUI/Models/InstrumentModel.cpp
@@ -41,9 +41,7 @@ QVector<SessionItem*> InstrumentModel::nonXMLItems() const
QVector<SessionItem*> result;
for (auto instrument_item : topItems<SpecularInstrumentItem>()) {
- auto axis_group = instrument_item->beamItem()
- ->inclinationAngleItem()
- ->alphaAxisItem();
+ auto axis_group = instrument_item->beamItem()->inclinationAngleItem()->alphaAxisItem();
if (auto pointwise_axis = axis_group->firstChildOfType<PointwiseAxisItem>())
result.push_back(pointwise_axis);
diff --git a/GUI/Models/IntensityDataItem.cpp b/GUI/Models/IntensityDataItem.cpp
index d7d2169143d..3b0dc90236b 100644
--- a/GUI/Models/IntensityDataItem.cpp
+++ b/GUI/Models/IntensityDataItem.cpp
@@ -88,8 +88,7 @@ void IntensityDataItem::setOutputData(OutputData<double>* data)
{
ASSERT(data && "Assertion failed in IntensityDataItem::setOutputData: nullptr data passed");
if (data->rank() != 2)
- throw Error(
- "Error in IntensityDataItem::setOutputData: cannot handle non-2D data");
+ throw Error("Error in IntensityDataItem::setOutputData: cannot handle non-2D data");
DataItem::setOutputData(data);
updateAxesZoomLevel();
@@ -457,7 +456,7 @@ const MaskContainerItem* IntensityDataItem::maskContainerItem() const
MaskContainerItem* IntensityDataItem::getOrCreateMaskContainerItem()
{
MaskContainerItem* result = maskContainerItem();
- if (! result)
+ if (!result)
result = model()->insertItem<MaskContainerItem>(this, -1, T_MASKS);
return result;
}
@@ -475,9 +474,8 @@ const ProjectionContainerItem* IntensityDataItem::projectionContainerItem() cons
ProjectionContainerItem* IntensityDataItem::getOrCreateProjectionContainerItem()
{
ProjectionContainerItem* result = projectionContainerItem();
- if (! result)
- result = model()->insertItem<ProjectionContainerItem>
- (this, -1, T_PROJECTIONS);
+ if (!result)
+ result = model()->insertItem<ProjectionContainerItem>(this, -1, T_PROJECTIONS);
return result;
}
diff --git a/GUI/Models/IntensityDataItem.h b/GUI/Models/IntensityDataItem.h
index decc47e0e72..22d72ecb113 100644
--- a/GUI/Models/IntensityDataItem.h
+++ b/GUI/Models/IntensityDataItem.h
@@ -35,7 +35,6 @@ private:
static const QString T_PROJECTIONS;
public:
-
static const QString M_TYPE;
IntensityDataItem();
diff --git a/GUI/Models/ItemCatalog.cpp b/GUI/Models/ItemCatalog.cpp
index fa64e9c8d4c..cd6f2b03e95 100644
--- a/GUI/Models/ItemCatalog.cpp
+++ b/GUI/Models/ItemCatalog.cpp
@@ -244,8 +244,7 @@ ItemCatalog::ItemCatalog()
std::unique_ptr<SessionItem> ItemCatalog::createItemPtr(const QString& modelType) const
{
if (!m_data.contains(modelType))
- throw Error("ItemFactory::createItem() -> Error: Model name does not exist: "
- + modelType);
+ throw Error("ItemFactory::createItem() -> Error: Model name does not exist: " + modelType);
return m_data.createItemPtr(modelType);
}
@@ -273,8 +272,7 @@ void ItemCatalog::add(const QString& modelType, std::function<SessionItem*()> f)
m_data.registerItem(modelType, f);
}
-template<typename T>
-void ItemCatalog::addItem()
+template <typename T> void ItemCatalog::addItem()
{
m_data.registerItem(T::M_TYPE, create_new<T>);
}
diff --git a/GUI/Models/ItemCatalog.h b/GUI/Models/ItemCatalog.h
index b995c3ea53c..dd220b5ce64 100644
--- a/GUI/Models/ItemCatalog.h
+++ b/GUI/Models/ItemCatalog.h
@@ -35,7 +35,7 @@ private:
void add(const QString& modelType, std::function<SessionItem*()> f);
template <typename T> void addItem();
-
+
IFactory<QString, SessionItem> m_data;
};
diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 2b60b178fea..047dbd29709 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -74,12 +74,10 @@ JobItem::JobItem() : SessionItem(M_TYPE)
registerTag(T_SAMPLE, 1, 1, QStringList() << "MultiLayer");
registerTag(T_MATERIAL_CONTAINER, 1, 1, QStringList{"MaterialContainer"});
- registerTag(T_INSTRUMENT, 1, 1, { GISASInstrumentItem::M_TYPE,
- OffSpecularInstrumentItem::M_TYPE,
- SpecularInstrumentItem::M_TYPE,
- DepthProbeInstrumentItem::M_TYPE });
- registerTag(T_OUTPUT, 1, 1, { IntensityDataItem::M_TYPE,
- SpecularDataItem::M_TYPE });
+ registerTag(T_INSTRUMENT, 1, 1,
+ {GISASInstrumentItem::M_TYPE, OffSpecularInstrumentItem::M_TYPE,
+ SpecularInstrumentItem::M_TYPE, DepthProbeInstrumentItem::M_TYPE});
+ registerTag(T_OUTPUT, 1, 1, {IntensityDataItem::M_TYPE, SpecularDataItem::M_TYPE});
registerTag(T_REALDATA, 1, 1, QStringList() << "RealData");
registerTag(T_DATAVIEW, 1, 1, QStringList() << "Data1DViewItem");
registerTag(T_PARAMETER_TREE, 0, -1, QStringList() << "Parameter Container");
@@ -288,8 +286,7 @@ FitParameterContainerItem* JobItem::fitParameterContainerItem()
ParameterContainerItem* JobItem::createParameterContainerItem()
{
- return model()->insertItem<ParameterContainerItem>
- (this, -1, T_PARAMETER_TREE);
+ return model()->insertItem<ParameterContainerItem>(this, -1, T_PARAMETER_TREE);
}
RealDataItem* JobItem::realDataItem()
@@ -319,8 +316,7 @@ MaterialItemContainer* JobItem::materialContainerItem() const
MaterialItemContainer* JobItem::createMaterialContainer()
{
- return model()->insertItem<MaterialItemContainer>
- (this, -1, T_MATERIAL_CONTAINER);
+ return model()->insertItem<MaterialItemContainer>(this, -1, T_MATERIAL_CONTAINER);
}
Data1DViewItem* JobItem::dataItemView()
@@ -385,8 +381,7 @@ const SimulationOptionsItem* JobItem::simulationOptionsItem() const
return item<const SimulationOptionsItem>(T_SIMULATION_OPTIONS);
}
-SimulationOptionsItem* JobItem::copySimulationOptionsIntoJob
-(const SimulationOptionsItem* options)
+SimulationOptionsItem* JobItem::copySimulationOptionsIntoJob(const SimulationOptionsItem* options)
{
return model()->copyItem(options, this, T_SIMULATION_OPTIONS);
}
diff --git a/GUI/Models/JobItem.h b/GUI/Models/JobItem.h
index 2f0a309e522..2c9cb2b54a2 100644
--- a/GUI/Models/JobItem.h
+++ b/GUI/Models/JobItem.h
@@ -102,8 +102,7 @@ public:
InstrumentItem* copyInstrumentIntoJob(const InstrumentItem* instrument);
SimulationOptionsItem* simulationOptionsItem();
- SimulationOptionsItem* copySimulationOptionsIntoJob
- (const SimulationOptionsItem* options);
+ SimulationOptionsItem* copySimulationOptionsIntoJob(const SimulationOptionsItem* options);
void setResults(const ISimulation* simulation);
@@ -129,7 +128,7 @@ public:
void setSampleName(const QString& name);
- void setInstrumentName(const QString& name);
+ void setInstrumentName(const QString& name);
const QString presentationType() const;
void setPresentationType(const QString& type);
@@ -141,9 +140,8 @@ private:
template <typename T> T* JobItem::setDataType()
{
- static_assert(std::is_base_of<DataItem,T>::value,
- "Class must be derived from DataItem");
-
+ static_assert(std::is_base_of<DataItem, T>::value, "Class must be derived from DataItem");
+
return model()->insertItem<T>(this, -1, T_OUTPUT);
}
diff --git a/GUI/Models/JobModel.cpp b/GUI/Models/JobModel.cpp
index 817984f3e4e..6571d72da7b 100644
--- a/GUI/Models/JobModel.cpp
+++ b/GUI/Models/JobModel.cpp
@@ -148,8 +148,7 @@ QVector<SessionItem*> JobModel::nonXMLItems() const
result.push_back(native_data);
}
- auto instrument =
- dynamic_cast<SpecularInstrumentItem*>(jobItem->instrumentItem());
+ auto instrument = dynamic_cast<SpecularInstrumentItem*>(jobItem->instrumentItem());
if (instrument) {
auto axis_group = instrument->beamItem()->inclinationAxisGroup();
result.push_back(axis_group->firstChildOfType<PointwiseAxisItem>());
diff --git a/GUI/Models/JobQueueData.cpp b/GUI/Models/JobQueueData.cpp
index cb115d65fdc..2f66cd22ef2 100644
--- a/GUI/Models/JobQueueData.cpp
+++ b/GUI/Models/JobQueueData.cpp
@@ -42,8 +42,7 @@ void JobQueueData::runJob(JobItem* jobItem)
return;
if (getSimulation(identifier))
- throw Error(
- "JobQueueData::runJob() -> Error. ISimulation is already existing.");
+ throw Error("JobQueueData::runJob() -> Error. ISimulation is already existing.");
try {
auto simulation = DomainSimulationBuilder::createSimulation(
diff --git a/GUI/Models/MaterialItem.cpp b/GUI/Models/MaterialItem.cpp
index b75340b9a6c..7f994033019 100644
--- a/GUI/Models/MaterialItem.cpp
+++ b/GUI/Models/MaterialItem.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/MaterialItem.h"
-#include "GUI/Models/MaterialDataItems.h"
#include "GUI/Models/Error.h"
+#include "GUI/Models/MaterialDataItems.h"
#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Models/SessionItemUtils.h"
#include "GUI/Models/VectorItem.h"
diff --git a/GUI/Models/MaterialItemUtils.cpp b/GUI/Models/MaterialItemUtils.cpp
index 90e9d8dd41b..95e17b6f4c9 100644
--- a/GUI/Models/MaterialItemUtils.cpp
+++ b/GUI/Models/MaterialItemUtils.cpp
@@ -100,8 +100,8 @@ MaterialItem* MaterialItemUtils::findMaterial(const ExternalProperty& material_p
throw Error("MaterialItemUtils::findMaterial() -> Error. "
"Attempt to access non-existing material model");
- auto material = MaterialModelStore::materialModel()
- ->materialFromIdentifier(material_property.identifier());
+ auto material =
+ MaterialModelStore::materialModel()->materialFromIdentifier(material_property.identifier());
if (!material)
throw Error("MaterialUtils::findMaterial() -> Error. Can't find "
diff --git a/GUI/Models/MaterialModelStore.cpp b/GUI/Models/MaterialModelStore.cpp
index 4b4be73b0ee..69ef2177783 100644
--- a/GUI/Models/MaterialModelStore.cpp
+++ b/GUI/Models/MaterialModelStore.cpp
@@ -16,31 +16,31 @@
#include "GUI/Models/Error.h"
namespace {
- MaterialModel* theMaterialModel = nullptr;
+MaterialModel* theMaterialModel = nullptr;
}
namespace MaterialModelStore {
- MaterialModel* materialModel()
- {
- return theMaterialModel;
- }
+MaterialModel* materialModel()
+{
+ return theMaterialModel;
+}
- void subscribe(MaterialModel* materialModel)
- {
- if (theMaterialModel != nullptr)
- throw Error("MaterialModelStore::subscribe() -> Error. Attempt to subscribe "
- "MaterialModel twice.");
+void subscribe(MaterialModel* materialModel)
+{
+ if (theMaterialModel != nullptr)
+ throw Error("MaterialModelStore::subscribe() -> Error. Attempt to subscribe "
+ "MaterialModel twice.");
- theMaterialModel = materialModel;
- }
+ theMaterialModel = materialModel;
+}
- void unsubscribe(MaterialModel* materialModel)
- {
- if (theMaterialModel != materialModel)
- throw Error("MaterialModelStore::unsubscribe -> Error. Attempt to unsubscribe "
- "MaterialModel before it was subscribed.");
+void unsubscribe(MaterialModel* materialModel)
+{
+ if (theMaterialModel != materialModel)
+ throw Error("MaterialModelStore::unsubscribe -> Error. Attempt to unsubscribe "
+ "MaterialModel before it was subscribed.");
- theMaterialModel = nullptr;
- }
+ theMaterialModel = nullptr;
}
+} // namespace MaterialModelStore
diff --git a/GUI/Models/MaterialModelStore.h b/GUI/Models/MaterialModelStore.h
index 1e2eb28b38e..83c6fc53044 100644
--- a/GUI/Models/MaterialModelStore.h
+++ b/GUI/Models/MaterialModelStore.h
@@ -21,10 +21,10 @@ class MaterialModel;
namespace MaterialModelStore {
- MaterialModel* materialModel();
- void subscribe(MaterialModel* materialModel);
- void unsubscribe(MaterialModel* materialModel);
+MaterialModel* materialModel();
+void subscribe(MaterialModel* materialModel);
+void unsubscribe(MaterialModel* materialModel);
-}
+} // namespace MaterialModelStore
#endif // BORNAGAIN_GUI_MODELS_MATERIALMODELSTORE_H
diff --git a/GUI/Models/PointwiseAxisItem.h b/GUI/Models/PointwiseAxisItem.h
index 44fca3b54a2..d8fefbe0438 100644
--- a/GUI/Models/PointwiseAxisItem.h
+++ b/GUI/Models/PointwiseAxisItem.h
@@ -39,7 +39,7 @@ public:
const IAxis* axis() const;
const QString getUnitsLabel() const;
void setFileName(const QString& filename);
-
+
// virtual function overloads
bool containsNonXMLData() const override;
QDateTime lastModified() const override;
diff --git a/GUI/Models/RealDataItem.cpp b/GUI/Models/RealDataItem.cpp
index 9e0f17ed26b..5954c05cd80 100644
--- a/GUI/Models/RealDataItem.cpp
+++ b/GUI/Models/RealDataItem.cpp
@@ -45,8 +45,7 @@ RealDataItem::RealDataItem() : SessionItem("RealData")
// Registering this tag even without actual data item to avoid troubles in copying RealDataItem
registerTag(T_INTENSITY_DATA, 1, 1,
- QStringList() << IntensityDataItem::M_TYPE
- << SpecularDataItem::M_TYPE);
+ QStringList() << IntensityDataItem::M_TYPE << SpecularDataItem::M_TYPE);
setDefaultTag(T_INTENSITY_DATA);
addProperty(P_INSTRUMENT_ID, QString());
@@ -54,8 +53,7 @@ RealDataItem::RealDataItem() : SessionItem("RealData")
// checking whether this breaks loading old files
registerTag(T_NATIVE_DATA, 1, 1,
- QStringList() << IntensityDataItem::M_TYPE
- << SpecularDataItem::M_TYPE);
+ QStringList() << IntensityDataItem::M_TYPE << SpecularDataItem::M_TYPE);
addProperty(P_NATIVE_DATA_UNITS, "nbins")->setVisible(false);
mapper()->setOnPropertyChange([this](const QString& name) {
@@ -70,8 +68,7 @@ RealDataItem::RealDataItem() : SessionItem("RealData")
mapper()->setOnChildPropertyChange([this](SessionItem* item, const QString& name) {
auto data_item = dynamic_cast<DataItem*>(item);
- if (!data_item || !linkedInstrument()
- || DataItem::isAxesUnitsPropertyName(name))
+ if (!data_item || !linkedInstrument() || DataItem::isAxesUnitsPropertyName(name))
return;
mapper()->setActive(false);
diff --git a/GUI/Models/RealLimitsItems.cpp b/GUI/Models/RealLimitsItems.cpp
index 6bf5ce37fa6..7d6d43fec5b 100644
--- a/GUI/Models/RealLimitsItems.cpp
+++ b/GUI/Models/RealLimitsItems.cpp
@@ -22,18 +22,19 @@ const QString tooltip_max_value = "Maximum allowed value, value excluded.";
const QString RealLimitsItem::P_XMIN = "Min";
const QString RealLimitsItem::P_XMAX = "Max";
-RealLimitsItem::RealLimitsItem(const QString& name,
- const std::optional<double>& lower,
+RealLimitsItem::RealLimitsItem(const QString& name, const std::optional<double>& lower,
const std::optional<double>& upper)
: SessionItem(name)
{
if (lower)
addProperty(P_XMIN, lower.value())
- ->setToolTip(tooltip_min_value).setLimits(RealLimits::limitless());
-
+ ->setToolTip(tooltip_min_value)
+ .setLimits(RealLimits::limitless());
+
if (upper)
addProperty(P_XMAX, upper.value())
- ->setToolTip(tooltip_max_value).setLimits(RealLimits::limitless());
+ ->setToolTip(tooltip_max_value)
+ .setLimits(RealLimits::limitless());
}
double RealLimitsItem::lowerLimit() const
@@ -93,8 +94,7 @@ RealLimits NonnegativeItem::createRealLimits(double /*scale_factor*/) const
const QString LowerLimitedItem::M_TYPE = "RealLimitsLowerLimited";
-LowerLimitedItem::LowerLimitedItem() : RealLimitsItem(M_TYPE, 0.0)
-{}
+LowerLimitedItem::LowerLimitedItem() : RealLimitsItem(M_TYPE, 0.0) {}
RealLimits LowerLimitedItem::createRealLimits(double scale_factor) const
{
@@ -105,8 +105,7 @@ RealLimits LowerLimitedItem::createRealLimits(double scale_factor) const
const QString UpperLimitedItem::M_TYPE = "RealLimitsUpperLimited";
-UpperLimitedItem::UpperLimitedItem() : RealLimitsItem(M_TYPE, std::nullopt, 1.0)
-{}
+UpperLimitedItem::UpperLimitedItem() : RealLimitsItem(M_TYPE, std::nullopt, 1.0) {}
RealLimits UpperLimitedItem::createRealLimits(double scale_factor) const
{
@@ -117,11 +116,9 @@ RealLimits UpperLimitedItem::createRealLimits(double scale_factor) const
const QString LimitedItem::M_TYPE = "RealLimitsLimited";
-LimitedItem::LimitedItem() : RealLimitsItem(M_TYPE, 0.0, 1.0)
-{}
+LimitedItem::LimitedItem() : RealLimitsItem(M_TYPE, 0.0, 1.0) {}
RealLimits LimitedItem::createRealLimits(double scale_factor) const
{
- return RealLimits::limited(scale_factor * lowerLimit(),
- scale_factor * upperLimit());
+ return RealLimits::limited(scale_factor * lowerLimit(), scale_factor * upperLimit());
}
diff --git a/GUI/Models/RealLimitsItems.h b/GUI/Models/RealLimitsItems.h
index 4cede7b4ad5..4b48e8ecc49 100644
--- a/GUI/Models/RealLimitsItems.h
+++ b/GUI/Models/RealLimitsItems.h
@@ -25,8 +25,7 @@ private:
static const QString P_XMAX;
protected:
- RealLimitsItem(const QString& name,
- const std::optional<double>& lower = std::nullopt,
+ RealLimitsItem(const QString& name, const std::optional<double>& lower = std::nullopt,
const std::optional<double>& upper = std::nullopt);
double lowerLimit() const;
void setLowerLimit(double lower);
@@ -77,7 +76,7 @@ public:
UpperLimitedItem();
RealLimits createRealLimits(double scale_factor = 1.0) const;
- using RealLimitsItem::setUpperLimit;
+ using RealLimitsItem::setUpperLimit;
};
class BA_CORE_API_ LimitedItem : public RealLimitsItem {
@@ -87,7 +86,7 @@ public:
LimitedItem();
RealLimits createRealLimits(double scale_factor = 1.0) const;
using RealLimitsItem::setLowerLimit;
- using RealLimitsItem::setUpperLimit;
+ using RealLimitsItem::setUpperLimit;
};
#endif // BORNAGAIN_GUI_MODELS_REALLIMITSITEMS_H
diff --git a/GUI/Models/RectangularDetectorItem.cpp b/GUI/Models/RectangularDetectorItem.cpp
index 8759fd11fdd..fb527939041 100644
--- a/GUI/Models/RectangularDetectorItem.cpp
+++ b/GUI/Models/RectangularDetectorItem.cpp
@@ -74,8 +74,7 @@ const QString RectangularDetectorItem::P_DISTANCE = "Distance";
const QString RectangularDetectorItem::M_TYPE = "RectangularDetector";
-RectangularDetectorItem::RectangularDetectorItem()
- : DetectorItem(M_TYPE), m_is_constructed(false)
+RectangularDetectorItem::RectangularDetectorItem() : DetectorItem(M_TYPE), m_is_constructed(false)
{
// axes parameters
auto axisItem = addProperty<BasicAxisItem>(P_X_AXIS);
@@ -132,8 +131,7 @@ void RectangularDetectorItem::setDetectorAlignment(const QString& alignment)
getItemValue(RectangularDetectorItem::P_ALIGNMENT).value<ComboProperty>();
if (!combo_property.getValues().contains(alignment))
- throw Error(
- "RectangularDetectorItem::setDetectorAlignment -> Unexpected alignment");
+ throw Error("RectangularDetectorItem::setDetectorAlignment -> Unexpected alignment");
combo_property.setValue(alignment);
setItemValue(RectangularDetectorItem::P_ALIGNMENT, combo_property.variant());
diff --git a/GUI/Models/SessionItem.h b/GUI/Models/SessionItem.h
index e5f423e37bb..73cd272ee1c 100644
--- a/GUI/Models/SessionItem.h
+++ b/GUI/Models/SessionItem.h
@@ -81,8 +81,7 @@ public:
// convenience functions for groups
SessionItem* addGroupProperty(const QString& groupTag, const QString& groupType);
SessionItem* setGroupProperty(const QString& groupTag, const QString& modelType) const;
- template <typename T>
- T* setGroupPropertyType(const QString& groupTag);
+ template <typename T> T* setGroupPropertyType(const QString& groupTag);
SessionItem* getGroupItem(const QString& groupName) const;
template <typename T> T& groupItem(const QString& groupName) const;
@@ -183,8 +182,7 @@ template <typename T> T* SessionItem::addProperty(const QString& tagname)
return property;
}
-template <typename T>
-T* SessionItem::setGroupPropertyType(const QString& groupTag)
+template <typename T> T* SessionItem::setGroupPropertyType(const QString& groupTag)
{
return dynamic_cast<T*>(setGroupProperty(groupTag, T::M_TYPE));
}
diff --git a/GUI/Models/SessionItemTags.cpp b/GUI/Models/SessionItemTags.cpp
index 4d44b8c44ee..8f5312cbaf8 100644
--- a/GUI/Models/SessionItemTags.cpp
+++ b/GUI/Models/SessionItemTags.cpp
@@ -115,7 +115,7 @@ void SessionItemTags::addChild(const QString& tagName)
{
if (maximumReached(tagName))
throw Error("SessionItemTags::addChild() -> Error. Can't exceed maximum"
- "allowed number of children.");
+ "allowed number of children.");
tagInfo(tagName).childCount++;
}
diff --git a/GUI/Models/SessionXML.cpp b/GUI/Models/SessionXML.cpp
index d9492393687..0344cf0cd0b 100644
--- a/GUI/Models/SessionXML.cpp
+++ b/GUI/Models/SessionXML.cpp
@@ -111,8 +111,7 @@ void SessionXML::writeVariant(QXmlStreamWriter* writer, QVariant variant, int ro
writer->writeAttribute(SessionXML::ParameterExtAttribute, combo.stringOfValues());
} else {
- throw Error("SessionXML::writeVariant: Parameter type not supported "
- + type_name);
+ throw Error("SessionXML::writeVariant: Parameter type not supported " + type_name);
}
writer->writeEndElement(); // end ParameterTag
diff --git a/GUI/Models/SpecularBeamInclinationItem.cpp b/GUI/Models/SpecularBeamInclinationItem.cpp
index 3e380f842a7..8de0f2261e3 100644
--- a/GUI/Models/SpecularBeamInclinationItem.cpp
+++ b/GUI/Models/SpecularBeamInclinationItem.cpp
@@ -24,8 +24,7 @@ void setAxisPresentationDefaults(SessionItem* axis_item, const QString& type);
const QString SpecularBeamInclinationItem::P_ALPHA_AXIS = "Alpha axis";
-const QString SpecularBeamInclinationItem::M_TYPE =
- "SpecularBeamInclinationAxis";
+const QString SpecularBeamInclinationItem::M_TYPE = "SpecularBeamInclinationAxis";
SpecularBeamInclinationItem::SpecularBeamInclinationItem()
: BeamDistributionItem(M_TYPE, m_show_mean)
@@ -47,8 +46,7 @@ double SpecularBeamInclinationItem::scaleFactor() const
void SpecularBeamInclinationItem::updateFileName(const QString& filename)
{
auto group_item = item<GroupItem>(P_ALPHA_AXIS);
- PointwiseAxisItem* axis_item =
- group_item->firstChildOfType<PointwiseAxisItem>();
+ PointwiseAxisItem* axis_item = group_item->firstChildOfType<PointwiseAxisItem>();
ASSERT(axis_item);
axis_item->setFileName(filename);
}
@@ -78,8 +76,7 @@ void SpecularBeamInclinationItem::setupAxisGroup()
group_item->setEnabled(false);
group_item->mapper()->setOnValueChange(
[group_item]() {
- if (group_item->currentItem()->modelType()
- == PointwiseAxisItem::M_TYPE)
+ if (group_item->currentItem()->modelType() == PointwiseAxisItem::M_TYPE)
group_item->setEnabled(true);
},
this);
@@ -90,8 +87,7 @@ void setupDistributionMean(SessionItem* distribution)
{
ASSERT(distribution);
- SessionItem* valueItem = dynamic_cast<SymmetricDistributionItem*>
- (distribution)->meanItem();
+ SessionItem* valueItem = dynamic_cast<SymmetricDistributionItem*>(distribution)->meanItem();
ASSERT(valueItem);
valueItem->setLimits(RealLimits::limited(-90.0, 90.0));
diff --git a/GUI/Models/SpecularBeamInclinationItem.h b/GUI/Models/SpecularBeamInclinationItem.h
index 33e4e6317dd..13a5ea170d1 100644
--- a/GUI/Models/SpecularBeamInclinationItem.h
+++ b/GUI/Models/SpecularBeamInclinationItem.h
@@ -30,7 +30,7 @@ private:
public:
static const QString M_TYPE;
-
+
SpecularBeamInclinationItem();
~SpecularBeamInclinationItem() override;
diff --git a/GUI/Models/SpecularDataItem.cpp b/GUI/Models/SpecularDataItem.cpp
index 2914efb418a..778e822c858 100644
--- a/GUI/Models/SpecularDataItem.cpp
+++ b/GUI/Models/SpecularDataItem.cpp
@@ -46,8 +46,7 @@ void SpecularDataItem::setOutputData(OutputData<double>* data)
{
if (data != nullptr) {
if (data->rank() != 1)
- throw Error(
- "Error in SpecularDataItem::setOutputData: cannot handle non-1D data");
+ throw Error("Error in SpecularDataItem::setOutputData: cannot handle non-1D data");
DataItem::setOutputData(data);
updateAxesZoomLevel();
} else {
diff --git a/GUI/Models/SpecularDataItem.h b/GUI/Models/SpecularDataItem.h
index 2739cb15da4..aa9d3af5c24 100644
--- a/GUI/Models/SpecularDataItem.h
+++ b/GUI/Models/SpecularDataItem.h
@@ -32,7 +32,6 @@ private:
static const QString P_YAXIS;
public:
-
static const QString M_TYPE;
SpecularDataItem();
diff --git a/GUI/Models/SphericalDetectorItem.cpp b/GUI/Models/SphericalDetectorItem.cpp
index 5c2ab22ffaf..abae485b6f8 100644
--- a/GUI/Models/SphericalDetectorItem.cpp
+++ b/GUI/Models/SphericalDetectorItem.cpp
@@ -39,10 +39,8 @@ SphericalDetectorItem::SphericalDetectorItem() : DetectorItem(M_TYPE)
alphaAxis->setUpperBound(2.0);
alphaAxis->binsItem()->setToolTip("Number of alpha-axis bins");
- alphaAxis->lowerBoundItem()
- ->setToolTip("Low edge of first alpha-bin (in deg)");
- alphaAxis->upperBoundItem()
- ->setToolTip("Upper edge of last alpha-bin (in deg)");
+ alphaAxis->lowerBoundItem()->setToolTip("Low edge of first alpha-bin (in deg)");
+ alphaAxis->upperBoundItem()->setToolTip("Upper edge of last alpha-bin (in deg)");
register_resolution_function();
}
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 5773f66a4f1..8ffbec9ee26 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -304,8 +304,7 @@ void TransformFromDomain::setDetectorGeometry(Instrument2DItem* instrument_item,
auto item = instrument_item->setDetectorGroup<RectangularDetectorItem>();
setRectangularDetector(item, *det);
} else {
- throw Error(
- "TransformFromDomain::setDetectorGeometry() -> Unknown detector type.");
+ throw Error("TransformFromDomain::setDetectorGeometry() -> Unknown detector type.");
}
}
@@ -422,9 +421,8 @@ void TransformFromDomain::setRectangularDetector(RectangularDetectorItem* detect
detector_item->setDirectBeamV0(detector.getDirectBeamV0());
} else {
- throw Error(
- "TransformFromDomain::setItemFromSample(RectangularDetectorItem* detectorItem "
- "Error. Unknown detector arrangement");
+ throw Error("TransformFromDomain::setItemFromSample(RectangularDetectorItem* detectorItem "
+ "Error. Unknown detector arrangement");
}
}
@@ -745,8 +743,7 @@ void setDistribution(BeamDistributionItem* part_distr_item, ParameterDistributio
if (const DistributionGate* distr = dynamic_cast<const DistributionGate*>(p_distribution)) {
DistributionGateItem* distr_gate_item =
part_distr_item->setDistributionGroupItem<DistributionGateItem>();
- distr_gate_item->setRange(factor * distr->lowerBound(),
- factor * distr->upperBound());
+ distr_gate_item->setRange(factor * distr->lowerBound(), factor * distr->upperBound());
distItem = distr_gate_item;
} else if (const DistributionLorentz* distr =
dynamic_cast<const DistributionLorentz*>(p_distribution)) {
diff --git a/GUI/Models/TransformToDomain.cpp b/GUI/Models/TransformToDomain.cpp
index d4684b5cd36..2d1bc70a169 100644
--- a/GUI/Models/TransformToDomain.cpp
+++ b/GUI/Models/TransformToDomain.cpp
@@ -29,8 +29,8 @@
#include "GUI/Models/Lattice2DItems.h"
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/LayerRoughnessItems.h"
-#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Models/MaskItems.h"
+#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Models/MesoCrystalItem.h"
#include "GUI/Models/MultiLayerItem.h"
#include "GUI/Models/ParticleCompositionItem.h"
@@ -143,18 +143,14 @@ void TransformToDomain::addDistributionParametersToSimulation(const BeamItem& be
}
setParameterDistributionToSimulation<BeamWavelengthItem>(
- ParameterDistribution::BeamWavelength, beam_item.wavelengthItem(),
- simulation);
+ ParameterDistribution::BeamWavelength, beam_item.wavelengthItem(), simulation);
setParameterDistributionToSimulation<BeamInclinationAngleItem>(
- ParameterDistribution::BeamInclinationAngle,
- beam_item.inclinationAngleItem(), simulation);
+ ParameterDistribution::BeamInclinationAngle, beam_item.inclinationAngleItem(), simulation);
setParameterDistributionToSimulation<BeamAzimuthalAngleItem>(
- ParameterDistribution::BeamAzimuthalAngle,
- beam_item.azimuthalAngleItem(), simulation);
+ ParameterDistribution::BeamAzimuthalAngle, beam_item.azimuthalAngleItem(), simulation);
}
-void TransformToDomain::addBeamDivergencesToScan(const BeamItem& beam_item,
- AngularSpecScan& scan)
+void TransformToDomain::addBeamDivergencesToScan(const BeamItem& beam_item, AngularSpecScan& scan)
{
if (beam_item.modelType() != SpecularBeamItem::M_TYPE) {
ASSERT(beam_item.modelType() == SpecularBeamItem::M_TYPE);
@@ -246,8 +242,8 @@ std::unique_ptr<ScanResolution> createScanResolution(const SessionItem* item)
if (!beam_item)
return nullptr;
- auto distr_item = dynamic_cast<const SymmetricDistributionItem*>(
- beam_item->distributionGroupItem());
+ auto distr_item =
+ dynamic_cast<const SymmetricDistributionItem*>(beam_item->distributionGroupItem());
if (!distr_item)
return nullptr;
diff --git a/GUI/Models/TransformToDomain.h b/GUI/Models/TransformToDomain.h
index e78304f90e9..c38e657baf9 100644
--- a/GUI/Models/TransformToDomain.h
+++ b/GUI/Models/TransformToDomain.h
@@ -43,8 +43,7 @@ std::unique_ptr<LayerRoughness> createLayerRoughness(const SessionItem& item);
std::unique_ptr<MultiLayer> createMultiLayer(const SessionItem& item);
std::unique_ptr<ParticleLayout> createParticleLayout(const SessionItem& item);
-void addDistributionParametersToSimulation(const BeamItem& beam_item,
- GISASSimulation& simulation);
+void addDistributionParametersToSimulation(const BeamItem& beam_item, GISASSimulation& simulation);
void addBeamDivergencesToScan(const BeamItem& beam_item, AngularSpecScan& simulation);
void setBeamDistribution(ParameterDistribution::WhichParameter which,
diff --git a/GUI/Views/FitWidgets/FitComparisonController.cpp b/GUI/Views/FitWidgets/FitComparisonController.cpp
index 926df5e4b42..8c98fc0f3ee 100644
--- a/GUI/Views/FitWidgets/FitComparisonController.cpp
+++ b/GUI/Views/FitWidgets/FitComparisonController.cpp
@@ -49,8 +49,7 @@ using DiffItemController = FitComparisonController2D::DiffItemController;
FitComparisonController2D::FitComparisonController2D(QObject* parent)
: QObject(parent)
- , m_diff_item_controller
- (new DiffItemController(IntensityDataItem::M_TYPE, this))
+ , m_diff_item_controller(new DiffItemController(IntensityDataItem::M_TYPE, this))
, m_appearanceRepeater(new PropertyRepeater(this))
, m_xAxisRepeater(new PropertyRepeater(this))
, m_yAxisRepeater(new PropertyRepeater(this))
diff --git a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
index 2daa42bb27c..53673b3d929 100644
--- a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -107,9 +107,8 @@ FitObjectiveBuilder::buildSimulation(const mumufit::Parameters& params) const
std::unique_lock<std::mutex> lock(build_simulation_mutex);
update_fit_parameters(params);
- return DomainSimulationBuilder::createSimulation(m_jobItem->sampleItem(),
- m_jobItem->instrumentItem(),
- m_jobItem->simulationOptionsItem());
+ return DomainSimulationBuilder::createSimulation(
+ m_jobItem->sampleItem(), m_jobItem->instrumentItem(), m_jobItem->simulationOptionsItem());
}
std::unique_ptr<OutputData<double>> FitObjectiveBuilder::createOutputData() const
diff --git a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
index 2dd88bac326..24d087ba906 100644
--- a/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
@@ -67,8 +67,7 @@ IntensityDataItem* RealDataMaskWidget::intensityDataItem()
MaskContainerItem* RealDataMaskWidget::maskContainer(IntensityDataItem* intensityData)
{
- MaskContainerItem* containerItem =
- intensityData->getOrCreateMaskContainerItem();
+ MaskContainerItem* containerItem = intensityData->getOrCreateMaskContainerItem();
ASSERT(containerItem);
return containerItem;
}
diff --git a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
index 05cfa1e3620..f1f0d5335ea 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -51,7 +51,6 @@ QStringList RealDataPresenter::activePresentationList(SessionItem* item)
result << "Reflectometry (Configuration)";
result << "Reflectometry (Graph only)";
} else
- throw Error(
- "Error in RealDataPresenter::activePresentationList: unsupported data type");
+ throw Error("Error in RealDataPresenter::activePresentationList: unsupported data type");
return result;
}
diff --git a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index 1412371f790..0cca4ae1b04 100644
--- a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -59,8 +59,7 @@ void DepthProbeInstrumentEditor::subscribeToItem()
BeamWavelengthItem* wavelengthItem = beam_item->wavelengthItem();
m_wavelengthEditor->setItem(wavelengthItem->distributionItem());
- SpecularBeamInclinationItem* inclinationItem =
- beam_item->inclinationAngleItem();
+ SpecularBeamInclinationItem* inclinationItem = beam_item->inclinationAngleItem();
m_inclinationEditor->setItem(inclinationItem->distributionItem());
m_inclinationEditor->addItem(inclinationItem->alphaAxisItem());
m_depthAxisEditor->setItem(instrumentItem()->zAxis());
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index b0b7cd9811e..c6bf1125a92 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -157,8 +157,7 @@ void ColorMap::onAxisPropertyChanged(const QString& axisName, const QString& pro
replot();
} else if (BasicAxisItem::isVisibilityPropertyName(propertyName)) {
- setColorScaleVisible(intensityItem()
- ->zAxisItem()->visibilityValue());
+ setColorScaleVisible(intensityItem()->zAxisItem()->visibilityValue());
replot();
}
}
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 9f87668cb70..5eab00de649 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -67,8 +67,7 @@ QCPColorGradient ColorMapUtils::getGradient(const QString& gradientName)
auto it = gradient_map.find(gradientName);
if (it == gradient_map.end()) {
- throw Error("ColorMapHelper::getGradient() -> Error. No such gradient"
- + gradientName);
+ throw Error("ColorMapHelper::getGradient() -> Error. No such gradient" + gradientName);
}
return QCPColorGradient(it.value());
}
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 895bed233c2..f8b52e2f29b 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -19,8 +19,8 @@
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
-#include "GUI/mainwindow/projectmanager.h"
#include "GUI/mainwindow/ProjectManagerStore.h"
+#include "GUI/mainwindow/projectmanager.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
@@ -29,7 +29,7 @@
namespace {
const QString SettingsGroup = "IntensityDataCanvas/";
-
+
const QString SettingsKeyGradient = SettingsGroup + "Gradient";
const QString SettingsKeyInterpolation = SettingsGroup + "Interpolation";
@@ -135,12 +135,10 @@ void IntensityDataCanvas::onPropertyChanged(const QString& name)
{
if (IntensityDataItem::isGradientPropertyName(name)) {
QSettings settings;
- settings.setValue(SettingsKeyGradient,
- intensityDataItem()->getGradientValue());
+ settings.setValue(SettingsKeyGradient, intensityDataItem()->getGradientValue());
} else if (IntensityDataItem::isInterpolatedPropertyName(name)) {
QSettings settings;
- settings.setValue(SettingsKeyInterpolation,
- intensityDataItem()->isInterpolated());
+ settings.setValue(SettingsKeyInterpolation, intensityDataItem()->isInterpolated());
}
}
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
index f35127d1bde..3a447fbab75 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
@@ -59,8 +59,7 @@ IntensityDataProjectionsWidget::projectionContainer(IntensityDataItem* intensity
{
ASSERT(intensityItem);
- ProjectionContainerItem* containerItem =
- intensityItem->getOrCreateProjectionContainerItem();
+ ProjectionContainerItem* containerItem = intensityItem->getOrCreateProjectionContainerItem();
ASSERT(containerItem);
return containerItem;
}
diff --git a/GUI/Views/IntensityDataWidgets/ProjectionsPlot.cpp b/GUI/Views/IntensityDataWidgets/ProjectionsPlot.cpp
index 38728e340a3..8651051f0fb 100644
--- a/GUI/Views/IntensityDataWidgets/ProjectionsPlot.cpp
+++ b/GUI/Views/IntensityDataWidgets/ProjectionsPlot.cpp
@@ -131,8 +131,7 @@ IntensityDataItem* ProjectionsPlot::intensityItem()
ProjectionContainerItem* ProjectionsPlot::projectionContainerItem()
{
- ProjectionContainerItem* result =
- intensityItem()->projectionContainerItem();
+ ProjectionContainerItem* result = intensityItem()->projectionContainerItem();
ASSERT(result);
return result;
}
diff --git a/GUI/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/Views/JobWidgets/ParameterTuningWidget.cpp
index 87d6e8d9884..dce24092ef7 100644
--- a/GUI/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -235,6 +235,6 @@ void ParameterTuningWidget::updateJobStatus()
message.append(jobItem()->getComments());
m_warningSign->setWarningMessage(message);
}
-
+
updateDragAndDropSettings();
}
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index dda98d5f27a..87f49263a26 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -21,8 +21,8 @@
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
-#include "GUI/mainwindow/projectmanager.h"
#include "GUI/mainwindow/ProjectManagerStore.h"
+#include "GUI/mainwindow/projectmanager.h"
#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index e504dac4ed1..cbbc8d25b5e 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -77,8 +77,7 @@ void MaskGraphicsScene::setMaskContext(SessionModel* model, const QModelIndex& m
QString containerType = m_maskModel->itemForIndex(maskContainerIndex)->modelType();
if (containerType != "MaskContainer" && containerType != "ProjectionContainer")
- throw Error(
- "MaskGraphicsScene::setMaskContext() -> Error. Not a container");
+ throw Error("MaskGraphicsScene::setMaskContext() -> Error. Not a container");
m_maskContainerIndex = maskContainerIndex;
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceView.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceView.cpp
index 7fd9c62e154..baebc254638 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceView.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
-#include "GUI/ba3d/widget.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
+#include "GUI/ba3d/widget.h"
#include <QVBoxLayout>
RealSpaceView::RealSpaceView(QWidget* parent) : QWidget(parent), m_3dview(new RealSpace::Widget3D)
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index b1ca4d7ec32..7f054958392 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Models/ExternalProperty.h"
#include "GUI/Models/Error.h"
+#include "GUI/Models/ExternalProperty.h"
#include "GUI/Models/LayerItem.h"
#include "GUI/Models/SampleModel.h"
#include "GUI/Views/SampleDesigner/DesignerHelper.h"
diff --git a/GUI/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/Views/SimulationWidgets/SimulationSetupWidget.cpp
index b68c27b5dd9..9f9760de77d 100644
--- a/GUI/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -22,8 +22,8 @@
#include "GUI/Views/SimulationWidgets/SimulationDataSelectorWidget.h"
#include "GUI/Views/SimulationWidgets/SimulationOptionsWidget.h"
#include "GUI/Views/SimulationWidgets/SimulationSetupAssistant.h"
-#include "GUI/mainwindow/projectmanager.h"
#include "GUI/mainwindow/ProjectManagerStore.h"
+#include "GUI/mainwindow/projectmanager.h"
#include <QMessageBox>
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index e49fd63cc65..e7a2eea3105 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -17,8 +17,8 @@
#include "GUI/Views/FitWidgets/plot_constants.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
-#include "GUI/mainwindow/projectmanager.h"
#include "GUI/mainwindow/ProjectManagerStore.h"
+#include "GUI/mainwindow/projectmanager.h"
#include <qcustomplot.h>
SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
diff --git a/GUI/mainwindow/OutputDataIOHistory.cpp b/GUI/mainwindow/OutputDataIOHistory.cpp
index c3c3880d76c..4a00a165756 100644
--- a/GUI/mainwindow/OutputDataIOHistory.cpp
+++ b/GUI/mainwindow/OutputDataIOHistory.cpp
@@ -104,7 +104,8 @@ bool OutputDataIOHistory::wasModifiedSinceLastSave(const QString& dirname,
{
if (!hasHistory(dirname))
throw Error("OutputDataIOHistory::wasModifiedSinceLastSave() -> Error. "
- "No info for directory '" + dirname + "'.");
+ "No info for directory '"
+ + dirname + "'.");
return m_dir_history[dirname].wasModifiedSinceLastSave(item);
}
@@ -121,7 +122,8 @@ QStringList OutputDataIOHistory::savedFileNames(const QString& dirname) const
{
if (!hasHistory(dirname))
throw Error("OutputDataIOHistory::savedFileNames() -> Error. "
- "No info for directory '" + dirname + "'.");
+ "No info for directory '"
+ + dirname + "'.");
return m_dir_history[dirname].savedFileNames();
}
diff --git a/GUI/mainwindow/ProjectManagerStore.cpp b/GUI/mainwindow/ProjectManagerStore.cpp
index 3ff41e4f694..a67a0133190 100644
--- a/GUI/mainwindow/ProjectManagerStore.cpp
+++ b/GUI/mainwindow/ProjectManagerStore.cpp
@@ -16,35 +16,35 @@
#include "GUI/Models/Error.h"
namespace {
- ProjectManager* theProjectManager = nullptr;
+ProjectManager* theProjectManager = nullptr;
}
namespace ProjectManagerStore {
- ProjectManager* projectManager()
- {
- if (!theProjectManager)
- throw Error("ProjectManagerStore::projectManager() -> Error. Attempt to access "
- "non existing ProjectManager.");
-
- return theProjectManager;
- }
-
- void subscribe(ProjectManager* projectManager)
- {
- if (theProjectManager != nullptr)
- throw Error("ProjectManagerStore::subscribe() -> Error. Attempt to subscribe "
- "ProjectManager twice.");
-
- theProjectManager = projectManager;
- }
-
- void unsubscribe(ProjectManager* projectManager)
- {
- if (theProjectManager != projectManager)
- throw Error("ProjectManagerStore::unsubscribe -> Error. Attempt to unsubscribe "
- "ProjectManager before it was subscribed.");
-
- theProjectManager = nullptr;
- }
+ProjectManager* projectManager()
+{
+ if (!theProjectManager)
+ throw Error("ProjectManagerStore::projectManager() -> Error. Attempt to access "
+ "non existing ProjectManager.");
+
+ return theProjectManager;
+}
+
+void subscribe(ProjectManager* projectManager)
+{
+ if (theProjectManager != nullptr)
+ throw Error("ProjectManagerStore::subscribe() -> Error. Attempt to subscribe "
+ "ProjectManager twice.");
+
+ theProjectManager = projectManager;
+}
+
+void unsubscribe(ProjectManager* projectManager)
+{
+ if (theProjectManager != projectManager)
+ throw Error("ProjectManagerStore::unsubscribe -> Error. Attempt to unsubscribe "
+ "ProjectManager before it was subscribed.");
+
+ theProjectManager = nullptr;
}
+} // namespace ProjectManagerStore
diff --git a/GUI/mainwindow/ProjectManagerStore.h b/GUI/mainwindow/ProjectManagerStore.h
index 380ae3bfc80..f256b1d28e7 100644
--- a/GUI/mainwindow/ProjectManagerStore.h
+++ b/GUI/mainwindow/ProjectManagerStore.h
@@ -21,9 +21,9 @@ class ProjectManager;
namespace ProjectManagerStore {
- ProjectManager* projectManager();
- void subscribe(ProjectManager* projectManager);
- void unsubscribe(ProjectManager* projectManager);
-}
+ProjectManager* projectManager();
+void subscribe(ProjectManager* projectManager);
+void unsubscribe(ProjectManager* projectManager);
+} // namespace ProjectManagerStore
#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGERSTORE_H
diff --git a/GUI/mainwindow/ProjectUtils.cpp b/GUI/mainwindow/ProjectUtils.cpp
index e6165332f2d..b44ceee149f 100644
--- a/GUI/mainwindow/ProjectUtils.cpp
+++ b/GUI/mainwindow/ProjectUtils.cpp
@@ -78,7 +78,7 @@ QStringList ProjectUtils::nonXMLDataInDir(const QString& dirname)
if (!dir.exists())
throw Error("ProjectUtils::nonXMLDataInDir() -> Error. Non existing "
- "directory '"
+ "directory '"
+ dirname + "'.");
return dir.entryList(ItemFileNameUtils::nonXMLFileNameFilters());
@@ -136,8 +136,8 @@ QString ProjectUtils::readTextFile(const QString& fileName)
{
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- throw Error("ProjectUtils::readTextFile -> Error. Can't open the file '"
- + fileName + "' for reading.");
+ throw Error("ProjectUtils::readTextFile -> Error. Can't open the file '" + fileName
+ + "' for reading.");
QTextStream in(&file);
return in.readAll();
}
diff --git a/GUI/utils/GUIHelpers.cpp b/GUI/utils/GUIHelpers.cpp
index b2448b0f31a..18b0d417460 100644
--- a/GUI/utils/GUIHelpers.cpp
+++ b/GUI/utils/GUIHelpers.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/utils/GUIHelpers.h"
-#include "GUI/Models/Error.h"
#include "BAVersion.h"
+#include "GUI/Models/Error.h"
#include <QApplication>
#include <QDateTime>
#include <QDir>
@@ -229,8 +229,7 @@ QString readTextFile(const QString& fileName)
{
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- throw Error("PyImportAssistant::readFile() -> Error. Can't read file '"
- + fileName + "'");
+ throw Error("PyImportAssistant::readFile() -> Error. Can't read file '" + fileName + "'");
QTextStream in(&file);
return in.readAll();
}
diff --git a/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.h b/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.h
index 0639b60ea9a..87d9dc48bdb 100644
--- a/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.h
+++ b/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.h
@@ -24,11 +24,10 @@ class AdjustMinimizerPlan : public Plan {
public:
AdjustMinimizerPlan();
- bool checkMinimizer(mumufit::Minimizer& minimizer);
+ bool checkMinimizer(mumufit::Minimizer& minimizer) override;
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_FITTING_ADJUSTMINIMIZERPLAN_H
diff --git a/Tests/Functional/Core/Fitting/Plan.h b/Tests/Functional/Core/Fitting/Plan.h
index 621a1c85dca..c471e284aba 100644
--- a/Tests/Functional/Core/Fitting/Plan.h
+++ b/Tests/Functional/Core/Fitting/Plan.h
@@ -34,7 +34,7 @@ public:
Plan(const std::string& name, bool residual_based = false);
~Plan();
- virtual bool checkMinimizer(mumufit::Minimizer& minimizer);
+ bool checkMinimizer(mumufit::Minimizer& minimizer) override;
void setSimulationName(const std::string& name);
diff --git a/Tests/Functional/Core/Fitting/PlanCases.h b/Tests/Functional/Core/Fitting/PlanCases.h
index c05ab6ba737..edc6256cedf 100644
--- a/Tests/Functional/Core/Fitting/PlanCases.h
+++ b/Tests/Functional/Core/Fitting/PlanCases.h
@@ -24,8 +24,7 @@ public:
CylindersInBAPlan();
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! Two parameter fit: cylinders in BA with mini GISAS simulation.
@@ -36,8 +35,7 @@ public:
CylindersInBAEasyPlan();
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! Two parameter fit: cylinders in BA with mini GISAS simulation.
@@ -48,8 +46,7 @@ public:
CylindersInBAResidualPlan();
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! Two parameter fit: cylinders in BA with mini GISAS simulation.
@@ -61,9 +58,8 @@ public:
~RectDetPlan();
protected:
- std::unique_ptr<ISimulation> createSimulation(const mumufit::Parameters&) const;
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<ISimulation> createSimulation(const mumufit::Parameters&) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! Plan for fitting reflectometry curve on Ti/Ni multilayer
@@ -73,8 +69,7 @@ public:
SpecularPlan();
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! Plan for fitting reflectometry curve on Ti/Ni multilayer (q-defined beam)
@@ -84,8 +79,7 @@ public:
SpecularPlanQ();
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! The same as SpecularPlan, but with two (identical) datasets
@@ -98,8 +92,7 @@ public:
protected:
std::unique_ptr<FitObjective> createFitObjective() const override;
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
//! Fit for off-specular experiment
@@ -110,8 +103,7 @@ public:
~OffSpecularPlan() override = default;
protected:
- virtual std::unique_ptr<MultiLayer>
- createMultiLayer(const mumufit::Parameters& params) const override;
+ std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters& params) const override;
};
#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_FITTING_PLANCASES_H
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
index 54b39f6e78e..b635d133561 100644
--- a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
+++ b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
@@ -1,8 +1,8 @@
#include "GUI/Models/LayerItem.h"
+#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Models/MaterialModel.h"
#include "GUI/Models/MaterialPropertyController.h"
#include "GUI/Models/SampleModel.h"
-#include "GUI/Models/MaterialItemUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
index 9b66456362b..70f7eac636e 100644
--- a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
+++ b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
@@ -1,11 +1,11 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Models/ApplicationModels.h"
#include "GUI/Models/DataItem.h"
+#include "GUI/Models/Error.h"
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobItemUtils.h"
#include "GUI/Models/JobModel.h"
-#include "GUI/Models/Error.h"
#include "GUI/Models/JobModelFunctions.h"
#include "GUI/Models/RealDataItem.h"
#include "GUI/Models/RealDataModel.h"
@@ -77,8 +77,7 @@ TEST_F(TestOutputDataIOService, test_nonXMLData)
// Replacing the data inside RealDataItem with the data of different dimensions
auto data = GuiUnittestUtils::createData(3.0, GuiUnittestUtils::DIM::D1);
- EXPECT_THROW(dynamic_cast<RealDataItem*>(realData)->setOutputData(data.get()),
- Error);
+ EXPECT_THROW(dynamic_cast<RealDataItem*>(realData)->setOutputData(data.get()), Error);
EXPECT_EQ(models.realDataModel()->nonXMLItems().size(), 1);
}
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
index efc2328c6a9..26a1c719e12 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
@@ -197,13 +197,11 @@ TEST_F(TestSavingSpecularData, test_OutputDataIOService)
auto instrument2 = createSpecularInstrument(models);
auto axis_group1 = getAxisGroup(instrument1);
- PointwiseAxisItem* pointwise_axis_item1 =
- axis_group1->firstChildOfType<PointwiseAxisItem>();
+ PointwiseAxisItem* pointwise_axis_item1 = axis_group1->firstChildOfType<PointwiseAxisItem>();
pointwise_axis_item1->init(*m_axis, "Degrees");
auto axis_group2 = getAxisGroup(instrument2);
- PointwiseAxisItem* pointwise_axis_item2 =
- axis_group2->firstChildOfType<PointwiseAxisItem>();
+ PointwiseAxisItem* pointwise_axis_item2 = axis_group2->firstChildOfType<PointwiseAxisItem>();
PointwiseAxis tmp("y", std::vector<double>{1.0, 2.0, 3.0});
pointwise_axis_item2->init(tmp, "Radians");
@@ -255,15 +253,13 @@ TEST_F(TestSavingSpecularData, test_CopyInstrumentToJobItem)
// adding instrument and initializing pointwise axis
auto instrument = createSpecularInstrument(models);
auto axis_group = getAxisGroup(instrument);
- PointwiseAxisItem* pointwise_axis_item =
- axis_group->firstChildOfType<PointwiseAxisItem>();
+ PointwiseAxisItem* pointwise_axis_item = axis_group->firstChildOfType<PointwiseAxisItem>();
pointwise_axis_item->init(*m_axis, "q-space");
// adding JobItem and copying instrument
auto jobItem = models.jobModel()->insertItem<JobItem>();
JobModelFunctions::setupJobItemInstrument(jobItem, instrument);
- auto job_instrument =
- dynamic_cast<SpecularInstrumentItem*>(jobItem->instrumentItem());
+ auto job_instrument = dynamic_cast<SpecularInstrumentItem*>(jobItem->instrumentItem());
PointwiseAxisItem* job_axis_item =
getAxisGroup(job_instrument)->firstChildOfType<PointwiseAxisItem>();
--
GitLab