From 93533baf8906b3088aba335702e2c9a54e3f31e2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 26 May 2022 13:51:19 +0200
Subject: [PATCH] clang-format
---
GUI/Model/FromCore/FromCore.cpp | 55 ++++++++++++-------------
GUI/Model/FromCore/GUISampleBuilder.cpp | 2 +-
GUI/Model/ToCore/SimulationToCore.cpp | 14 +++----
3 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/GUI/Model/FromCore/FromCore.cpp b/GUI/Model/FromCore/FromCore.cpp
index 840959d0481..37cf3c37bac 100644
--- a/GUI/Model/FromCore/FromCore.cpp
+++ b/GUI/Model/FromCore/FromCore.cpp
@@ -309,7 +309,7 @@ T* addFormFactorItem(std::variant<ParticleItem*, MesoCrystalItem*> parent)
// ************************************************************************************************
void GUI::Transform::FromCore::set1DLatticeItem(Interference1DLatticeItem* item,
- const Interference1DLattice& sample)
+ const Interference1DLattice& sample)
{
item->length().set(sample.length());
item->rotationAngle().set(Units::rad2deg(sample.xi()));
@@ -320,7 +320,7 @@ void GUI::Transform::FromCore::set1DLatticeItem(Interference1DLatticeItem* item,
}
void GUI::Transform::FromCore::set2DLatticeItem(Interference2DLatticeItem* item,
- const Interference2DLattice& sample)
+ const Interference2DLattice& sample)
{
set2DLatticeParameters(item, sample.lattice());
@@ -332,7 +332,7 @@ void GUI::Transform::FromCore::set2DLatticeItem(Interference2DLatticeItem* item,
}
void GUI::Transform::FromCore::set2DParaCrystalItem(Interference2DParaCrystalItem* item,
- const Interference2DParaCrystal& sample)
+ const Interference2DParaCrystal& sample)
{
set2DLatticeParameters(item, sample.lattice());
@@ -352,7 +352,7 @@ void GUI::Transform::FromCore::set2DParaCrystalItem(Interference2DParaCrystalIte
}
void GUI::Transform::FromCore::setFinite2DLatticeItem(InterferenceFinite2DLatticeItem* item,
- const InterferenceFinite2DLattice& sample)
+ const InterferenceFinite2DLattice& sample)
{
set2DLatticeParameters(item, sample.lattice());
@@ -363,15 +363,15 @@ void GUI::Transform::FromCore::setFinite2DLatticeItem(InterferenceFinite2DLattic
}
void GUI::Transform::FromCore::setHardDiskItem(InterferenceHardDiskItem* item,
- const InterferenceHardDisk& sample)
+ const InterferenceHardDisk& sample)
{
item->radius().set(sample.radius());
item->density().set(sample.density());
setPositionVariance(item, sample);
}
-void GUI::Transform::FromCore::setRadialParaCrystalItem(
- InterferenceRadialParaCrystalItem* item, const InterferenceRadialParaCrystal& sample)
+void GUI::Transform::FromCore::setRadialParaCrystalItem(InterferenceRadialParaCrystalItem* item,
+ const InterferenceRadialParaCrystal& sample)
{
item->peakDistance().set(sample.peakDistance());
item->dampingLength().set(sample.dampingLength());
@@ -384,7 +384,7 @@ void GUI::Transform::FromCore::setRadialParaCrystalItem(
}
void GUI::Transform::FromCore::setLayerItem(LayerItem* layerItem, const Layer* layer,
- const LayerInterface* top_interface)
+ const LayerInterface* top_interface)
{
layerItem->thickness().set(layer->thickness());
layerItem->clearRoughness();
@@ -395,13 +395,13 @@ void GUI::Transform::FromCore::setLayerItem(LayerItem* layerItem, const Layer* l
if (GUI::Transform::FromCore::isValidRoughness(roughness)) {
layerItem->setBasicRoughness();
GUI::Transform::FromCore::setRoughnessItem(layerItem->roughness().currentItem(),
- *roughness);
+ *roughness);
}
}
}
void GUI::Transform::FromCore::setRoughnessItem(LayerBasicRoughnessItem* item,
- const LayerRoughness& sample)
+ const LayerRoughness& sample)
{
item->sigma().set(sample.sigma());
item->hurst().set(sample.hurst());
@@ -420,7 +420,7 @@ bool GUI::Transform::FromCore::isValidRoughness(const LayerRoughness* roughness)
}
void GUI::Transform::FromCore::setGISASBeamItem(BeamItem* beam_item,
- const ScatteringSimulation& simulation)
+ const ScatteringSimulation& simulation)
{
ASSERT(beam_item);
const Beam& beam = simulation.beam();
@@ -444,7 +444,7 @@ void GUI::Transform::FromCore::setGISASBeamItem(BeamItem* beam_item,
}
void GUI::Transform::FromCore::setOffspecBeamItem(BeamItem* beam_item,
- const OffspecSimulation& simulation)
+ const OffspecSimulation& simulation)
{
const Beam& beam = simulation.beam();
@@ -456,7 +456,7 @@ void GUI::Transform::FromCore::setOffspecBeamItem(BeamItem* beam_item,
}
void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item,
- const SpecularSimulation& simulation)
+ const SpecularSimulation& simulation)
{
const Beam& beam = simulation.beam();
@@ -466,8 +466,7 @@ void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item,
beam_item->setAzimuthalAngle(0.0); // azimuthal angle is hardcoded
auto* axis_item = beam_item->inclinationAxis();
- GUI::Transform::FromCore::setAxisItem(axis_item, *simulation.coordinateAxis(),
- 1. / Units::deg);
+ GUI::Transform::FromCore::setAxisItem(axis_item, *simulation.coordinateAxis(), 1. / Units::deg);
setFootprintFactor(simulation.footprintFactor(), beam_item);
@@ -492,7 +491,7 @@ void GUI::Transform::FromCore::setSpecularBeamItem(SpecularBeamItem* beam_item,
}
void GUI::Transform::FromCore::updateDetector(Instrument2DItem* instrument_item,
- const ISimulation2D& simulation)
+ const ISimulation2D& simulation)
{
const IDetector& detector = simulation.detector();
setDetectorGeometry(instrument_item, detector);
@@ -505,7 +504,7 @@ void GUI::Transform::FromCore::updateDetector(Instrument2DItem* instrument_item,
}
void GUI::Transform::FromCore::setDetectorGeometry(Instrument2DItem* instrument_item,
- const IDetector& detector)
+ const IDetector& detector)
{
if (const auto* det = dynamic_cast<const SphericalDetector*>(&detector)) {
auto* item = instrument_item->setDetectorType<SphericalDetectorItem>();
@@ -519,7 +518,7 @@ void GUI::Transform::FromCore::setDetectorGeometry(Instrument2DItem* instrument_
}
void GUI::Transform::FromCore::setDetectorResolution(DetectorItem* detector_item,
- const IDetector& detector)
+ const IDetector& detector)
{
const IDetectorResolution* p_resfunc = detector.detectorResolution();
@@ -545,7 +544,7 @@ void GUI::Transform::FromCore::setDetectorResolution(DetectorItem* detector_item
}
void GUI::Transform::FromCore::setPolarizerAnalyzer(Instrument2DItem* instrument_item,
- const ISimulation2D& simulation)
+ const ISimulation2D& simulation)
{
instrument_item->setPolarization(simulation.beam().polVector());
@@ -562,7 +561,7 @@ void GUI::Transform::FromCore::setPolarizerAnalyzer(Instrument2DItem* instrument
}
void GUI::Transform::FromCore::setSphericalDetector(SphericalDetectorItem* detectorItem,
- const SphericalDetector& detector)
+ const SphericalDetector& detector)
{
// Axes
const IAxis& phi_axis = detector.axis(0);
@@ -580,7 +579,7 @@ void GUI::Transform::FromCore::setSphericalDetector(SphericalDetectorItem* detec
}
void GUI::Transform::FromCore::setRectangularDetector(RectangularDetectorItem* detectorItem,
- const RectangularDetector& detector)
+ const RectangularDetector& detector)
{
// Axes
detectorItem->setXSize(detector.getNbinsX());
@@ -628,7 +627,7 @@ void GUI::Transform::FromCore::setRectangularDetector(RectangularDetectorItem* d
}
void GUI::Transform::FromCore::setDetectorMasks(DetectorItem* detector_item,
- const ISimulation& simulation)
+ const ISimulation& simulation)
{
const IDetector& detector = simulation.detector();
if ((detector.detectorMask() && detector.detectorMask()->hasMasks())
@@ -638,8 +637,8 @@ void GUI::Transform::FromCore::setDetectorMasks(DetectorItem* detector_item,
}
}
-void GUI::Transform::FromCore::setMaskContainer(MaskItems* destMaskItems,
- const IDetector& detector, double scale)
+void GUI::Transform::FromCore::setMaskContainer(MaskItems* destMaskItems, const IDetector& detector,
+ double scale)
{
const auto* detectorMask = detector.detectorMask();
for (size_t i_mask = 0; i_mask < detectorMask->numberOfMasks(); ++i_mask) {
@@ -740,7 +739,7 @@ void GUI::Transform::FromCore::setItemFromSample(
}
void GUI::Transform::FromCore::setBackground(InstrumentItem* instrument_item,
- const ISimulation& simulation)
+ const ISimulation& simulation)
{
const auto* p_bg = simulation.background();
if (const auto* p_constant_bg = dynamic_cast<const ConstantBackground*>(p_bg)) {
@@ -752,7 +751,7 @@ void GUI::Transform::FromCore::setBackground(InstrumentItem* instrument_item,
}
void GUI::Transform::FromCore::setFootprintFactor(const IFootprintFactor* footprint,
- SpecularBeamItem* beam_item)
+ SpecularBeamItem* beam_item)
{
if (!footprint)
return;
@@ -799,7 +798,7 @@ void GUI::Transform::FromCore::setRotation(ItemWithParticles* item, const IRotat
}
void GUI::Transform::FromCore::setInterference(ParticleLayoutItem* layoutItem,
- const IInterference* interference)
+ const IInterference* interference)
{
if (!interference)
layoutItem->removeInterference();
@@ -832,7 +831,7 @@ void GUI::Transform::FromCore::setInterference(ParticleLayoutItem* layoutItem,
}
void GUI::Transform::FromCore::setFormFactor(std::variant<ParticleItem*, MesoCrystalItem*> parent,
- const IFormFactor* iFormFactor)
+ const IFormFactor* iFormFactor)
{
if (const auto* formfactor = dynamic_cast<const Pyramid2*>(iFormFactor)) {
auto* formfactorItem = addFormFactorItem<Pyramid2Item>(parent);
diff --git a/GUI/Model/FromCore/GUISampleBuilder.cpp b/GUI/Model/FromCore/GUISampleBuilder.cpp
index 98ec017d7ac..44672eb9900 100644
--- a/GUI/Model/FromCore/GUISampleBuilder.cpp
+++ b/GUI/Model/FromCore/GUISampleBuilder.cpp
@@ -122,7 +122,7 @@ void copyParticle(const IParticle* iparticle, MaterialItems& matItems,
particleCompositionItem->setAbundance(particleComposition->abundance());
particleCompositionItem->setPosition(particleComposition->particlePosition());
GUI::Transform::FromCore::setRotation(particleCompositionItem,
- particleComposition->rotation());
+ particleComposition->rotation());
addToParent(particleCompositionItem);
for (const auto* p : particleComposition->particles())
diff --git a/GUI/Model/ToCore/SimulationToCore.cpp b/GUI/Model/ToCore/SimulationToCore.cpp
index 5c0a8110adc..c4f79780d96 100644
--- a/GUI/Model/ToCore/SimulationToCore.cpp
+++ b/GUI/Model/ToCore/SimulationToCore.cpp
@@ -53,13 +53,12 @@ void setParameterDistributionToSimulation(ParameterDistribution::WhichParameter
}
//! adds DistributionParameters to the ISimulation
-void addDistributionParametersToSimulation(const BeamItem& item,
- ScatteringSimulation& simulation)
+void addDistributionParametersToSimulation(const BeamItem& item, ScatteringSimulation& simulation)
{
ASSERT(dynamic_cast<const GISASBeamItem*>(&item));
- setParameterDistributionToSimulation<BeamWavelengthItem>(
- ParameterDistribution::BeamWavelength, item.wavelengthItem(), simulation);
+ setParameterDistributionToSimulation<BeamWavelengthItem>(ParameterDistribution::BeamWavelength,
+ item.wavelengthItem(), simulation);
setParameterDistributionToSimulation<BeamInclinationAngleItem>(
ParameterDistribution::BeamInclinationAngle, item.inclinationAngleItem(), simulation);
setParameterDistributionToSimulation<BeamAzimuthalAngleItem>(
@@ -78,8 +77,7 @@ std::unique_ptr<ScanResolution> createScanResolution(const BeamDistributionItem*
if (!item)
return nullptr;
- const auto* distr_item =
- dynamic_cast<const SymmetricResolutionItem*>(item->distribution());
+ const auto* distr_item = dynamic_cast<const SymmetricResolutionItem*>(item->distribution());
if (!distr_item)
return nullptr;
@@ -173,8 +171,8 @@ DepthProbeSimulation* createDepthProbeSimulation(std::unique_ptr<MultiLayer> sam
std::unique_ptr<ISimulation>
GUI::Transform::ToCore::itemsToSimulation(const MultiLayerItem* sampleItem,
- const InstrumentItem* instrumentItem,
- const SimulationOptionsItem& optionsItem)
+ const InstrumentItem* instrumentItem,
+ const SimulationOptionsItem& optionsItem)
{
ASSERT(sampleItem);
ASSERT(instrumentItem);
--
GitLab