From 674b5ae30e5d9cb8fa7f7dabcb4c0ebead501bd4 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Tue, 29 Nov 2022 15:22:23 +0100
Subject: [PATCH] clang-format
---
GUI/Model/Descriptor/DoubleProperty.cpp | 2 +-
GUI/Model/Descriptor/DoubleProperty.h | 15 ++++++------
GUI/Model/Descriptor/VectorProperty.cpp | 17 ++++++-------
GUI/Model/Descriptor/VectorProperty.h | 24 ++++++++++++-------
GUI/Model/Device/RectangularDetectorItem.cpp | 3 ++-
GUI/Model/Model/ParameterTreeUtils.cpp | 3 ++-
GUI/Model/Sample/MaterialItem.cpp | 1 -
GUI/Model/Sample/MaterialItem.h | 5 +---
GUI/Model/Sample/MesocrystalItem.cpp | 7 +-----
GUI/Model/Sample/MesocrystalItem.h | 15 +++---------
GUI/Model/Sample/MultiLayerItem.h | 5 +---
GUI/Model/Sample/ParticleItem.cpp | 2 +-
GUI/Model/Sample/ParticleLayoutItem.cpp | 3 ++-
.../Instrument/PolarizationAnalysisEditor.h | 2 +-
GUI/View/SampleDesigner/FormLayouter.h | 2 +-
GUI/View/SampleDesigner/LayerEditorUtils.cpp | 5 ++--
GUI/View/SampleDesigner/LayerEditorUtils.h | 2 +-
17 files changed, 52 insertions(+), 61 deletions(-)
diff --git a/GUI/Model/Descriptor/DoubleProperty.cpp b/GUI/Model/Descriptor/DoubleProperty.cpp
index eab1d312a49..a50af0d8389 100644
--- a/GUI/Model/Descriptor/DoubleProperty.cpp
+++ b/GUI/Model/Descriptor/DoubleProperty.cpp
@@ -44,7 +44,7 @@ void DoubleProperty::init(const QString& label, const QString& tooltip, double v
m_step = step;
m_limits = limits;
- if(uidPrefix.size()>0)
+ if (uidPrefix.size() > 0)
m_uid = uidPrefix + "/" + QUuid::createUuid().toString();
else
m_uid = QUuid::createUuid().toString();
diff --git a/GUI/Model/Descriptor/DoubleProperty.h b/GUI/Model/Descriptor/DoubleProperty.h
index 8228c28bd9b..16a1bfa3d1b 100644
--- a/GUI/Model/Descriptor/DoubleProperty.h
+++ b/GUI/Model/Descriptor/DoubleProperty.h
@@ -49,8 +49,8 @@ public:
const std::variant<QString, Unit>& unit, uint decimals, const RealLimits& limits,
const QString& uidPrefix);
void init(const QString& label, const QString& tooltip, double value,
- const std::variant<QString, Unit>& unit, uint decimals, double step, const RealLimits& limits,
- const QString& uidPrefix);
+ const std::variant<QString, Unit>& unit, uint decimals, double step,
+ const RealLimits& limits, const QString& uidPrefix);
//! Return a descriptor (information provider) for this double property.
DoubleDescriptor descriptor() const { return m_descriptor; }
@@ -69,18 +69,18 @@ public:
double step() const { return m_step; }
- QString label() const {return m_label;}
+ QString label() const { return m_label; }
uint decimals() { return m_decimals; }
void setDecimals(uint decimals) { m_decimals = decimals; }
- QString tooltip() const {return m_tooltip;}
+ QString tooltip() const { return m_tooltip; }
void setTooltip(const QString& tooltip);
- std::variant<QString, Unit> unit() const {return m_unit;}
+ std::variant<QString, Unit> unit() const { return m_unit; }
void setUnit(const std::variant<QString, Unit>& unit);
- RealLimits limits() {return m_limits;}
+ RealLimits limits() { return m_limits; }
void setLimits(const RealLimits& limits);
//! True if one of the init methods has been called (checks for a valid uid).
@@ -96,7 +96,8 @@ private:
uint m_decimals = 3; //!< numbers of decimals to be shown in an edit control
double m_step = 0.01; //!< numbers of decimals to be shown in an edit control
RealLimits m_limits; //!< Limits of the value.
- std::variant<QString, Unit> m_unit = Unit::unitless; //!< Unit of the value (internal unit only!)
+ std::variant<QString, Unit> m_unit =
+ Unit::unitless; //!< Unit of the value (internal unit only!)
// temporary
DoubleDescriptor m_descriptor; //!< descriptor, holding more attributes like label, tooltip etc.
diff --git a/GUI/Model/Descriptor/VectorProperty.cpp b/GUI/Model/Descriptor/VectorProperty.cpp
index ddeb8777057..3d03dfd1e13 100644
--- a/GUI/Model/Descriptor/VectorProperty.cpp
+++ b/GUI/Model/Descriptor/VectorProperty.cpp
@@ -22,26 +22,27 @@ using std::variant;
void VectorProperty::init(const QString& label, const QString& tooltip,
const variant<QString, Unit>& unit, const QString& uidPrefix)
{
- init(label, tooltip, R3(0.0, 0.0, 0.0), unit, 3 /*decimals*/, 0.01 /*step*/, RealLimits::limitless(), uidPrefix);
+ init(label, tooltip, R3(0.0, 0.0, 0.0), unit, 3 /*decimals*/, 0.01 /*step*/,
+ RealLimits::limitless(), uidPrefix);
}
-void VectorProperty::init(const QString &label, const QString &tooltip, const R3 &value,
- const std::variant<QString, Unit> &unit, uint decimals, double step,
- const RealLimits &limits, const QString &uidPrefix)
+void VectorProperty::init(const QString& label, const QString& tooltip, const R3& value,
+ const std::variant<QString, Unit>& unit, uint decimals, double step,
+ const RealLimits& limits, const QString& uidPrefix)
{
m_x.init(label, tooltip, value.x(), unit, decimals, step, limits, uidPrefix);
m_y.init(label, tooltip, value.y(), unit, decimals, step, limits, uidPrefix);
m_z.init(label, tooltip, value.z(), unit, decimals, step, limits, uidPrefix);
- if(uidPrefix.size()>0)
+ if (uidPrefix.size() > 0)
m_uid = uidPrefix + "/" + QUuid::createUuid().toString();
else
m_uid = QUuid::createUuid().toString();
- m_x.setUid(m_uid+"/x");
- m_y.setUid(m_uid+"/y");
- m_z.setUid(m_uid+"/z");
+ m_x.setUid(m_uid + "/x");
+ m_y.setUid(m_uid + "/y");
+ m_z.setUid(m_uid + "/z");
}
bool VectorProperty::operator==(const VectorProperty& other) const
diff --git a/GUI/Model/Descriptor/VectorProperty.h b/GUI/Model/Descriptor/VectorProperty.h
index 94d861bea0f..14ce2b95b6d 100644
--- a/GUI/Model/Descriptor/VectorProperty.h
+++ b/GUI/Model/Descriptor/VectorProperty.h
@@ -33,8 +33,9 @@ class VectorProperty {
public:
void init(const QString& label, const QString& tooltip, const std::variant<QString, Unit>& unit,
const QString& uidPrefix);
- void init(const QString& label, const QString& tooltip, const R3& value, const std::variant<QString, Unit>& unit,
- uint decimals, double step, const RealLimits& limits, const QString& uidPrefix);
+ void init(const QString& label, const QString& tooltip, const R3& value,
+ const std::variant<QString, Unit>& unit, uint decimals, double step,
+ const RealLimits& limits, const QString& uidPrefix);
operator R3() const { return R3(m_x.get(), m_y.get(), m_z.get()); }
bool operator==(const VectorProperty& other) const;
@@ -42,21 +43,26 @@ public:
void setX(double _x) { m_x.set(_x); }
void setY(double _y) { m_y.set(_y); }
void setZ(double _z) { m_z.set(_z); }
- void set(const R3& d) { setX(d.x()); setY(d.y()); setZ(d.z());}
+ void set(const R3& d)
+ {
+ setX(d.x());
+ setY(d.y());
+ setZ(d.z());
+ }
R3 r3() const { return *this; }
QString uid() const { return m_uid; }
- QString label() const {return m_x.label();}
+ QString label() const { return m_x.label(); }
- void rwProperty(Streamer &s, const QString &tag);
+ void rwProperty(Streamer& s, const QString& tag);
- DoubleDescriptor x() const {return m_x;}
- DoubleDescriptor y() const {return m_y;}
- DoubleDescriptor z() const {return m_z;}
+ DoubleDescriptor x() const { return m_x; }
+ DoubleDescriptor y() const { return m_y; }
+ DoubleDescriptor z() const { return m_z; }
private:
- QString m_uid; //!< Unique id of this vector property.
+ QString m_uid; //!< Unique id of this vector property.
DoubleProperty m_x;
DoubleProperty m_y;
diff --git a/GUI/Model/Device/RectangularDetectorItem.cpp b/GUI/Model/Device/RectangularDetectorItem.cpp
index 14d72052f0f..c60589abe22 100644
--- a/GUI/Model/Device/RectangularDetectorItem.cpp
+++ b/GUI/Model/Device/RectangularDetectorItem.cpp
@@ -187,7 +187,8 @@ RectangularDetectorItem::detectorAlignmentSelection() const
return d;
}
-QVector<std::variant<VectorProperty, DoubleDescriptor> > RectangularDetectorItem::alignmentPropertiesForUI() const
+QVector<std::variant<VectorProperty, DoubleDescriptor>>
+RectangularDetectorItem::alignmentPropertiesForUI() const
{
if (m_detectorAlignment == RectangularDetector::GENERIC)
return {normalVector(), directionVector(), u0(), v0()};
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index e492bb50c28..9a0845a700a 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -158,7 +158,8 @@ void ParameterTreeBuilder::addParameterItem(ParameterLabelItem* parent, const Ve
addParameterItem(label, d.z());
}
-void ParameterTreeBuilder::addParameterItem(ParameterLabelItem* parent, const std::variant<VectorProperty, DoubleDescriptor> &v)
+void ParameterTreeBuilder::addParameterItem(ParameterLabelItem* parent,
+ const std::variant<VectorProperty, DoubleDescriptor>& v)
{
std::visit([=](auto const& e) { addParameterItem(parent, e); }, v);
}
diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp
index def9996aae6..80852cbe3f7 100644
--- a/GUI/Model/Sample/MaterialItem.cpp
+++ b/GUI/Model/Sample/MaterialItem.cpp
@@ -120,7 +120,6 @@ DoubleDescriptor MaterialItem::sldIm()
}
-
bool MaterialItem::hasRefractiveIndex() const
{
return m_useRefractiveIndex;
diff --git a/GUI/Model/Sample/MaterialItem.h b/GUI/Model/Sample/MaterialItem.h
index 79067312306..63d8e1a4c40 100644
--- a/GUI/Model/Sample/MaterialItem.h
+++ b/GUI/Model/Sample/MaterialItem.h
@@ -56,10 +56,7 @@ public:
DoubleDescriptor beta();
DoubleDescriptor sldRe();
DoubleDescriptor sldIm();
- VectorProperty magnetizationVector()
- {
- return m_magnetization;
- }
+ VectorProperty magnetizationVector() { return m_magnetization; }
/// \return true if refractive index was given, otherwise SLD was given
bool hasRefractiveIndex() const;
diff --git a/GUI/Model/Sample/MesocrystalItem.cpp b/GUI/Model/Sample/MesocrystalItem.cpp
index c10958b2f75..f8de23536ca 100644
--- a/GUI/Model/Sample/MesocrystalItem.cpp
+++ b/GUI/Model/Sample/MesocrystalItem.cpp
@@ -39,7 +39,7 @@ const QString VectorA("VectorA");
const QString VectorB("VectorB");
const QString VectorC("VectorC");
-}
+} // namespace Tag
const QString abundance_tooltip = "Proportion of this type of mesocrystal normalized to the \n"
"total number of particles in the layout";
@@ -165,11 +165,6 @@ void MesocrystalItem::setRawDataVectorC(const R3& v)
}
-
-
-
-
-
QVector<ItemWithParticles*> MesocrystalItem::containedItemsWithParticles() const
{
QVector<ItemWithParticles*> result;
diff --git a/GUI/Model/Sample/MesocrystalItem.h b/GUI/Model/Sample/MesocrystalItem.h
index 50433af608f..d79cd790337 100644
--- a/GUI/Model/Sample/MesocrystalItem.h
+++ b/GUI/Model/Sample/MesocrystalItem.h
@@ -51,18 +51,9 @@ public:
void setRawDataVectorB(const R3& vector_b);
void setRawDataVectorC(const R3& vector_c);
- VectorProperty vectorA() const
- {
- return m_vectorA;
- }
- VectorProperty vectorB() const
- {
- return m_vectorB;
- }
- VectorProperty vectorC() const
- {
- return m_vectorC;
- }
+ VectorProperty vectorA() const { return m_vectorA; }
+ VectorProperty vectorB() const { return m_vectorB; }
+ VectorProperty vectorC() const { return m_vectorC; }
QVector<ItemWithParticles*> containedItemsWithParticles() const override;
diff --git a/GUI/Model/Sample/MultiLayerItem.h b/GUI/Model/Sample/MultiLayerItem.h
index ee143268cd6..07db5baaf86 100644
--- a/GUI/Model/Sample/MultiLayerItem.h
+++ b/GUI/Model/Sample/MultiLayerItem.h
@@ -49,10 +49,7 @@ public:
R3 externalField() const;
void setExternalField(const R3& externalField);
- VectorProperty externalFieldVector() const
- {
- return m_externalField;
- }
+ VectorProperty externalFieldVector() const { return m_externalField; }
QVector<LayerItem*> layers() const;
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index e1a8eb540a2..c86565deaad 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -30,7 +30,7 @@ namespace Tag {
const QString Abundance("Abundance");
const QString Position("Position");
-}
+} // namespace Tag
const QString abundance_tooltip = "Proportion of this type of particles normalized to the \n"
"total number of particles in the layout";
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index a92f0cdaef6..ec52cb49cc5 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -37,7 +37,8 @@ ParticleLayoutItem::ParticleLayoutItem(const MaterialItems* materials)
m_ownDensity.init("Total particle density",
"Number of particles per area (particle surface density).\n "
"Should be defined for disordered and 1d-ordered particle collections.",
- 0.0005, Unit::nanometerMinus2, 10, 0.0001, RealLimits::nonnegative(), "density");
+ 0.0005, Unit::nanometerMinus2, 10, 0.0001, RealLimits::nonnegative(),
+ "density");
m_interference.init<InterferenceItemCatalog>("Interference function", "", "interference");
}
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.h b/GUI/View/Instrument/PolarizationAnalysisEditor.h
index 7f3265a5e73..a32adb20e3a 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.h
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.h
@@ -37,7 +37,7 @@ signals:
private:
DoubleSpinBox* createSpinBox(const DoubleDescriptor& d);
- void addVector(QFormLayout* parentLayout, const VectorProperty &d);
+ void addVector(QFormLayout* parentLayout, const VectorProperty& d);
InstrumentItem* m_instrument;
};
diff --git a/GUI/View/SampleDesigner/FormLayouter.h b/GUI/View/SampleDesigner/FormLayouter.h
index 6b3d59bf028..0ea7d56d75b 100644
--- a/GUI/View/SampleDesigner/FormLayouter.h
+++ b/GUI/View/SampleDesigner/FormLayouter.h
@@ -133,7 +133,7 @@ public:
//! In addition, the caller can define whether the labels are above the values
//! (vertically=true), or whether labels and values are all placed in one row
//! (vertically=false).
- int addVector(const VectorProperty &d, bool vertically = true);
+ int addVector(const VectorProperty& d, bool vertically = true);
//! Shows or hides the widgets in a row.
void setRowVisible(int row, bool visible);
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 0984f2b28a2..14cc40f90ab 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -122,10 +122,11 @@ void LayerEditorUtils::addMultiPropertyToGrid(QGridLayout* m_gridLayout, int fir
}
void LayerEditorUtils::addVectorToGrid(QGridLayout* m_gridLayout, int firstCol,
- const VectorProperty &v, SampleEditorController* ec,
+ const VectorProperty& v, SampleEditorController* ec,
bool vertically, bool addSpacer)
{
- addMultiPropertyToGrid(m_gridLayout, firstCol, {v.x(), v.y(), v.z()}, ec, vertically, addSpacer);
+ addMultiPropertyToGrid(m_gridLayout, firstCol, {v.x(), v.y(), v.z()}, ec, vertically,
+ addSpacer);
}
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.h b/GUI/View/SampleDesigner/LayerEditorUtils.h
index b8d50527b6e..25854f96b22 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.h
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.h
@@ -66,7 +66,7 @@ void addVectorToGrid(QGridLayout* m_gridLayout, int firstCol, const VectorProper
SampleEditorController* ec, bool vertically, bool addSpacer);
//! Create DoubleSpinBoxes for the DoubeDescriptors and connect them to the given setNewValue()
-void addVectorToGrid(QGridLayout* m_gridLayout, int firstCol, const VectorProperty &v,
+void addVectorToGrid(QGridLayout* m_gridLayout, int firstCol, const VectorProperty& v,
std::function<void(double, DoubleDescriptor)> setNewValue, bool vertically,
bool addSpacer);
--
GitLab