From 57604202906a6042ee12f899b78e569c3b8f05d7 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Tue, 3 Jan 2023 11:52:01 +0100
Subject: [PATCH] clang-format
---
GUI/Model/Device/InstrumentCollection.h | 3 ++-
GUI/Model/Device/InstrumentLibrary.cpp | 3 ++-
GUI/Model/Device/InstrumentsEditController.cpp | 2 +-
GUI/Model/FromCore/ItemizeSample.cpp | 16 ++++++++++------
GUI/Model/FromCore/ItemizeSimulation.cpp | 9 ++++++---
GUI/Model/Model/JobModel.cpp | 2 +-
GUI/Model/Model/JobModel.h | 2 +-
GUI/Model/Sample/CompoundItem.h | 3 ++-
GUI/Model/Sample/MaterialModel.cpp | 3 ++-
GUI/Model/Sample/ParticleLayoutItem.h | 3 ++-
GUI/View/Instrument/DistributionEditor.cpp | 9 +++++----
GUI/View/Instrument/PolarizationAnalysisEditor.h | 2 +-
GUI/View/Instrument/ResolutionFunctionEditor.cpp | 9 +++++----
GUI/View/Instrument/ResolutionFunctionEditor.h | 2 +-
GUI/View/Instrument/SphericalAxisEditor.h | 2 +-
GUI/View/MaterialEditor/MaterialEditorModel.cpp | 5 +++--
GUI/View/PlotUtil/DataPropertyWidget.cpp | 5 +++--
GUI/View/SampleDesigner/CompoundForm.cpp | 9 +++++----
GUI/View/SampleDesigner/CoreAndShellForm.cpp | 3 ++-
GUI/View/SampleDesigner/LayerForm.cpp | 3 ++-
GUI/View/SampleDesigner/MaterialInplaceForm.h | 2 +-
GUI/View/SampleDesigner/MesocrystalForm.cpp | 4 ++--
GUI/View/SampleDesigner/MesocrystalForm.h | 2 +-
GUI/View/SampleDesigner/MultiLayerForm.h | 2 +-
GUI/View/SampleDesigner/ParticleLayoutForm.cpp | 4 ++--
GUI/View/Toplevel/SimulationView.cpp | 8 ++++----
Tests/Unit/GUI/TestInstrumentItems.cpp | 3 ++-
27 files changed, 70 insertions(+), 50 deletions(-)
diff --git a/GUI/Model/Device/InstrumentCollection.h b/GUI/Model/Device/InstrumentCollection.h
index ab0467a104c..36bcf55650c 100644
--- a/GUI/Model/Device/InstrumentCollection.h
+++ b/GUI/Model/Device/InstrumentCollection.h
@@ -53,7 +53,8 @@ public:
QVector<InstrumentItem*> instrumentItems() const;
QVector<Instrument2DItem*> instrument2DItems() const;
- QVector<InstrumentItem*> instrumentItems(const std::function<bool(const InstrumentItem*)>& accept) const;
+ QVector<InstrumentItem*>
+ instrumentItems(const std::function<bool(const InstrumentItem*)>& accept) const;
InstrumentItem* findInstrumentItemById(const QString& instrumentId) const;
bool instrumentExists(const QString& instrumentId) const;
diff --git a/GUI/Model/Device/InstrumentLibrary.cpp b/GUI/Model/Device/InstrumentLibrary.cpp
index e39689dc75f..47007dad973 100644
--- a/GUI/Model/Device/InstrumentLibrary.cpp
+++ b/GUI/Model/Device/InstrumentLibrary.cpp
@@ -48,7 +48,8 @@ QString InstrumentLibrary::suggestName(const QString& name) const
return m_instrumentItems.suggestInstrumentName(name);
}
-InstrumentItem* InstrumentLibrary::addItemCopy(const QString& name, const InstrumentItem& itemToCopy)
+InstrumentItem* InstrumentLibrary::addItemCopy(const QString& name,
+ const InstrumentItem& itemToCopy)
{
return m_ec.addInstrumentItemCopy(&itemToCopy, name);
}
diff --git a/GUI/Model/Device/InstrumentsEditController.cpp b/GUI/Model/Device/InstrumentsEditController.cpp
index 6da33cdd553..da6fec519d2 100644
--- a/GUI/Model/Device/InstrumentsEditController.cpp
+++ b/GUI/Model/Device/InstrumentsEditController.cpp
@@ -32,7 +32,7 @@ void InstrumentsEditController::removeInstrument(InstrumentItem* instrument)
}
InstrumentItem* InstrumentsEditController::addInstrumentItemCopy(const InstrumentItem* instrument,
- const QString& name)
+ const QString& name)
{
InstrumentItem* copy = m_instruments->insertItemCopy(*instrument);
copy->setInstrumentName(name);
diff --git a/GUI/Model/FromCore/ItemizeSample.cpp b/GUI/Model/FromCore/ItemizeSample.cpp
index 817a0b42bba..a68aacbf737 100644
--- a/GUI/Model/FromCore/ItemizeSample.cpp
+++ b/GUI/Model/FromCore/ItemizeSample.cpp
@@ -314,7 +314,8 @@ void set_LayerItem(LayerItem* parent, const Layer* layer, const LayerInterface*
const LayerRoughness* roughness = top_interface->roughness();
if (isValidBasicRoughness(roughness)) {
parent->setBasicRoughness();
- auto* item = dynamic_cast<BasicRoughnessItem*>(parent->roughnessSelection().currentItem());
+ auto* item =
+ dynamic_cast<BasicRoughnessItem*>(parent->roughnessSelection().currentItem());
ASSERT(item);
set_BasicRoughnessItem(item, *roughness);
}
@@ -543,9 +544,10 @@ MaterialItem* findMaterialItem(MaterialModel& matItems, const ISampleNode* node)
complex_t material_data = material->materialData();
if (material->typeID() == MATERIAL_TYPES::RefractiveMaterial) {
result = matItems.addRefractiveMaterialItem(materialName, material_data.real(),
- material_data.imag());
+ material_data.imag());
} else if (material->typeID() == MATERIAL_TYPES::MaterialBySLD) {
- result = matItems.addSLDMaterialItem(materialName, material_data.real(), material_data.imag());
+ result =
+ matItems.addSLDMaterialItem(materialName, material_data.real(), material_data.imag());
} else
ASSERT(0);
@@ -619,7 +621,8 @@ void copyParticle(const IParticle* iparticle, MaterialModel& matItems,
addToParent(item);
for (const auto* p : particleComposition->particles())
- copyParticle(p, matItems, [=](ItemWithParticles* p) { item->addItemWithParticleSelection(p); });
+ copyParticle(p, matItems,
+ [=](ItemWithParticles* p) { item->addItemWithParticleSelection(p); });
}
}
@@ -658,8 +661,9 @@ SampleItem* itemizeSample(const MultiLayer& sample, const QString& nodeName)
// create particles/particle compositions
for (const IParticle* particle : layout->particles())
- copyParticle(particle, matItems,
- [=](ItemWithParticles* p) { layoutItem->addItemWithParticleSelection(p); });
+ copyParticle(particle, matItems, [=](ItemWithParticles* p) {
+ layoutItem->addItemWithParticleSelection(p);
+ });
}
}
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index af8e49a069b..f81059333dc 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -168,12 +168,14 @@ void setDistribution(BeamDistributionItem* part_distr_item, ParameterDistributio
distr_gate_item->setRange(factor * distr->min(), factor * distr->max());
distItem = distr_gate_item;
} else if (const auto* distr = dynamic_cast<const DistributionLorentz*>(distribution)) {
- auto* distr_lorentz_item = part_distr_item->setDistributionItemType<DistributionLorentzItem>();
+ auto* distr_lorentz_item =
+ part_distr_item->setDistributionItemType<DistributionLorentzItem>();
distr_lorentz_item->setMean(factor * distr->mean());
distr_lorentz_item->setHwhm(factor * distr->hwhm());
distItem = distr_lorentz_item;
} else if (const auto* distr = dynamic_cast<const DistributionGaussian*>(distribution)) {
- auto* distr_gauss_item = part_distr_item->setDistributionItemType<DistributionGaussianItem>();
+ auto* distr_gauss_item =
+ part_distr_item->setDistributionItemType<DistributionGaussianItem>();
distr_gauss_item->setMean(factor * distr->mean());
distr_gauss_item->setStandardDeviation(factor * distr->getStdDev());
distItem = distr_gauss_item;
@@ -189,7 +191,8 @@ void setDistribution(BeamDistributionItem* part_distr_item, ParameterDistributio
distr_cos_item->setSigma(factor * distr->sigma());
distItem = distr_cos_item;
} else if (const auto* distr = dynamic_cast<const DistributionTrapezoid*>(distribution)) {
- auto* distr_trapez_item = part_distr_item->setDistributionItemType<DistributionTrapezoidItem>();
+ auto* distr_trapez_item =
+ part_distr_item->setDistributionItemType<DistributionTrapezoidItem>();
distr_trapez_item->setCenter(factor * distr->mean());
distr_trapez_item->setLeftWidth(factor * distr->getLeftWidth());
distr_trapez_item->setMiddleWidth(factor * distr->getMiddleWidth());
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index eff4e29f011..c78dc917cfd 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -59,7 +59,7 @@ JobItem* JobModel::createJobItem()
//! Main method to add a job
JobItem* JobModel::addJobItem(const SampleItem* sampleItem, const InstrumentItem* instrumentItem,
- const RealItem* realItem, const SimulationOptionsItem& optionItem)
+ const RealItem* realItem, const SimulationOptionsItem& optionItem)
{
ASSERT(sampleItem);
ASSERT(instrumentItem);
diff --git a/GUI/Model/Model/JobModel.h b/GUI/Model/Model/JobModel.h
index 1c8368ab353..d72f9664b60 100644
--- a/GUI/Model/Model/JobModel.h
+++ b/GUI/Model/Model/JobModel.h
@@ -36,7 +36,7 @@ public:
JobItem* createJobItem();
JobItem* addJobItem(const SampleItem* sampleItem, const InstrumentItem* instrumentItem,
- const RealItem* realItem, const SimulationOptionsItem& optionItem);
+ const RealItem* realItem, const SimulationOptionsItem& optionItem);
QVector<JobItem*> jobItems() const;
diff --git a/GUI/Model/Sample/CompoundItem.h b/GUI/Model/Sample/CompoundItem.h
index d86ae2c3e11..e194ccb6252 100644
--- a/GUI/Model/Sample/CompoundItem.h
+++ b/GUI/Model/Sample/CompoundItem.h
@@ -32,7 +32,8 @@ public:
std::unique_ptr<Compound> createCompound() const;
QVector<ItemWithParticles*> itemsWithParticles() const;
- SelectionProperty<ItemWithParticlesCatalog>& addItemWithParticleSelection(ItemWithParticles* particle);
+ SelectionProperty<ItemWithParticlesCatalog>&
+ addItemWithParticleSelection(ItemWithParticles* particle);
void removeItemWithParticle(ItemWithParticles* particle);
QVector<ItemWithParticles*> containedItemsWithParticles() const override;
diff --git a/GUI/Model/Sample/MaterialModel.cpp b/GUI/Model/Sample/MaterialModel.cpp
index 3b93d4bb8c4..5a9b12330a2 100644
--- a/GUI/Model/Sample/MaterialModel.cpp
+++ b/GUI/Model/Sample/MaterialModel.cpp
@@ -85,7 +85,8 @@ MaterialItem* MaterialModel::addMaterialItem(MaterialItem* materialItem, bool si
return materialItem;
}
-MaterialItem* MaterialModel::addRefractiveMaterialItem(const QString& name, double delta, double beta)
+MaterialItem* MaterialModel::addRefractiveMaterialItem(const QString& name, double delta,
+ double beta)
{
auto* materialItem = new MaterialItem();
materialItem->setMatItemName(name);
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index dd1d3a3181c..1fbaee35051 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -51,7 +51,8 @@ public:
//! Note that this is not a hierarchical search! Only the topmost particles are returned, not
//! their contained particles. For a hierarchical search use containedItemsWithParticles
QVector<ItemWithParticles*> itemsWithParticles() const;
- SelectionProperty<ItemWithParticlesCatalog>& addItemWithParticleSelection(ItemWithParticles* particle);
+ SelectionProperty<ItemWithParticlesCatalog>&
+ addItemWithParticleSelection(ItemWithParticles* particle);
void removeItemWithParticle(ItemWithParticles* particle);
//! Return full hierarchical contained items with particles.
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index a27eadeb61b..17c7c34132f 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -44,10 +44,11 @@ DistributionSelector::DistributionSelector(std::optional<MeanConfig> mean_config
m_formLayout = new QFormLayout(this);
m_formLayout->setContentsMargins(0, 0, 0, 0);
- m_distributionCombo = GUI::Util::createComboBoxFromProperty(item->distributionSelection(), [=](int) {
- createDistributionWidgets();
- emit distributionChanged();
- });
+ m_distributionCombo =
+ GUI::Util::createComboBoxFromProperty(item->distributionSelection(), [=](int) {
+ createDistributionWidgets();
+ emit distributionChanged();
+ });
m_formLayout->addRow("Distribution:", m_distributionCombo);
createDistributionWidgets();
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.h b/GUI/View/Instrument/PolarizationAnalysisEditor.h
index 305d0f5b431..908e6152d16 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.h
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_POLARIZATIONANALYSISEDITOR_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_POLARIZATIONANALYSISEDITOR_H
-#include <QGroupBox>
#include <QFormLayout>
+#include <QGroupBox>
class DoubleProperty;
class DoubleSpinBox;
diff --git a/GUI/View/Instrument/ResolutionFunctionEditor.cpp b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
index e23d706e927..b2b9946bfde 100644
--- a/GUI/View/Instrument/ResolutionFunctionEditor.cpp
+++ b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
@@ -31,10 +31,11 @@ ResolutionFunctionEditor::ResolutionFunctionEditor(Unit unit, QWidget* parent, D
m_formLayout = new QFormLayout(this);
m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
- auto* typeCombo = GUI::Util::createComboBoxFromProperty(item->resolutionFunctionSelection(), [=](int) {
- createResolutionWidgets();
- emit dataChanged();
- });
+ auto* typeCombo =
+ GUI::Util::createComboBoxFromProperty(item->resolutionFunctionSelection(), [=](int) {
+ createResolutionWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Type:", typeCombo);
GroupBoxCollapser::installIntoGroupBox(this);
diff --git a/GUI/View/Instrument/ResolutionFunctionEditor.h b/GUI/View/Instrument/ResolutionFunctionEditor.h
index 091a8b2ce04..999684691b8 100644
--- a/GUI/View/Instrument/ResolutionFunctionEditor.h
+++ b/GUI/View/Instrument/ResolutionFunctionEditor.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_RESOLUTIONFUNCTIONEDITOR_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_RESOLUTIONFUNCTIONEDITOR_H
-#include <QGroupBox>
#include <QFormLayout>
+#include <QGroupBox>
class DetectorItem;
diff --git a/GUI/View/Instrument/SphericalAxisEditor.h b/GUI/View/Instrument/SphericalAxisEditor.h
index a015d6d8539..d8654b7f911 100644
--- a/GUI/View/Instrument/SphericalAxisEditor.h
+++ b/GUI/View/Instrument/SphericalAxisEditor.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_SPHERICALAXISEDITOR_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_SPHERICALAXISEDITOR_H
-#include <QWidget>
#include <QDoubleSpinBox>
#include <QFormLayout>
+#include <QWidget>
class BasicAxisItem;
class SafeSpinBox;
diff --git a/GUI/View/MaterialEditor/MaterialEditorModel.cpp b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
index 45bbfdd3e98..34138a5ca9f 100644
--- a/GUI/View/MaterialEditor/MaterialEditorModel.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
@@ -198,7 +198,7 @@ QModelIndex MaterialEditorModel::first() const
}
MaterialItem* MaterialEditorModel::addRefractiveMaterialItem(const QString& name, double delta,
- double beta)
+ double beta)
{
beginInsertRows(QModelIndex(), rowCount(), rowCount());
auto* m = m_model->addRefractiveMaterialItem(name, delta, beta);
@@ -206,7 +206,8 @@ MaterialItem* MaterialEditorModel::addRefractiveMaterialItem(const QString& name
return m;
}
-MaterialItem* MaterialEditorModel::addSLDMaterialItem(const QString& name, double sld, double abs_term)
+MaterialItem* MaterialEditorModel::addSLDMaterialItem(const QString& name, double sld,
+ double abs_term)
{
beginInsertRows(QModelIndex(), rowCount(), rowCount());
auto* m = m_model->addSLDMaterialItem(name, sld, abs_term);
diff --git a/GUI/View/PlotUtil/DataPropertyWidget.cpp b/GUI/View/PlotUtil/DataPropertyWidget.cpp
index 0c1286dcc45..dafe5f7e0c6 100644
--- a/GUI/View/PlotUtil/DataPropertyWidget.cpp
+++ b/GUI/View/PlotUtil/DataPropertyWidget.cpp
@@ -45,8 +45,9 @@ void DataPropertyWidget::updateItemCoords(DataItem* item)
if (jobItem())
instrument = jobItem()->instrumentItem();
else if (realItem()) {
- instrument = gSessionData->projectDocument.value()->collectedItems()->findInstrumentItemById(
- realItem()->instrumentId());
+ instrument =
+ gSessionData->projectDocument.value()->collectedItems()->findInstrumentItemById(
+ realItem()->instrumentId());
} else
ASSERT(0);
diff --git a/GUI/View/SampleDesigner/CompoundForm.cpp b/GUI/View/SampleDesigner/CompoundForm.cpp
index 57552274b69..09a7cab6004 100644
--- a/GUI/View/SampleDesigner/CompoundForm.cpp
+++ b/GUI/View/SampleDesigner/CompoundForm.cpp
@@ -78,8 +78,9 @@ CompoundItem* CompoundForm::compositionItem() const
void CompoundForm::onParticleAdded(ItemWithParticles* p)
{
int index = m_compositionItem->itemsWithParticles().indexOf(p);
- const int rowInLayout =
- m_layout->rowCount() - 1 - (m_compositionItem->itemsWithParticles().size() - 1) + index; // -1: btn
+ const int rowInLayout = m_layout->rowCount() - 1
+ - (m_compositionItem->itemsWithParticles().size() - 1)
+ + index; // -1: btn
m_layout->insertRow(rowInLayout,
LayerEditorUtils::createWidgetForItemWithParticles(this, p, false, m_ec));
@@ -88,8 +89,8 @@ void CompoundForm::onParticleAdded(ItemWithParticles* p)
void CompoundForm::onAboutToRemoveParticle(ItemWithParticles* item)
{
int index = m_compositionItem->itemsWithParticles().indexOf(item);
- const int rowInLayout =
- m_layout->rowCount() - m_compositionItem->itemsWithParticles().size() - 1 + index; // -1: btn
+ const int rowInLayout = m_layout->rowCount() - m_compositionItem->itemsWithParticles().size()
+ - 1 + index; // -1: btn
m_layout->removeRow(rowInLayout);
}
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.cpp b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
index aa136ac6d65..b01ed4bb1bd 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.cpp
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
@@ -71,7 +71,8 @@ CoreAndShellForm::CoreAndShellForm(QWidget* parent, CoreAndShellItem* item,
core.layouter = std::make_unique<FormLayouter>(coreParticleGroup, ec);
core.formfactorCombo = createFormFactorCombo(
- coreParticleGroup, item->coreItem() != nullptr ? item->coreItem()->formFactorItem() : nullptr);
+ coreParticleGroup,
+ item->coreItem() != nullptr ? item->coreItem()->formFactorItem() : nullptr);
connect(core.formfactorCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&CoreAndShellForm::onCoreComboChanged);
core.layouter->addRow("Form factor:", core.formfactorCombo);
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index ba25c79c1cf..e4c5009047b 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -182,7 +182,8 @@ void LayerForm::updateLayerPositionDependentElements()
void LayerForm::onLayoutAdded(ParticleLayoutItem* newLayoutItem)
{
int index = m_layer->layoutItems().indexOf(newLayoutItem);
- const int rowInLayout = m_layouter->layout()->rowCount() - m_layer->layoutItems().size() + index;
+ const int rowInLayout =
+ m_layouter->layout()->rowCount() - m_layer->layoutItems().size() + index;
m_layouter->insertRow(rowInLayout, new ParticleLayoutForm(this, newLayoutItem, m_ec));
}
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.h b/GUI/View/SampleDesigner/MaterialInplaceForm.h
index 8057217c471..068ff3756be 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.h
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
-#include <QWidget>
#include <QGridLayout>
+#include <QWidget>
class ItemWithMaterial;
class SampleEditorController;
diff --git a/GUI/View/SampleDesigner/MesocrystalForm.cpp b/GUI/View/SampleDesigner/MesocrystalForm.cpp
index e73d4a996e3..d0755a2055a 100644
--- a/GUI/View/SampleDesigner/MesocrystalForm.cpp
+++ b/GUI/View/SampleDesigner/MesocrystalForm.cpp
@@ -109,8 +109,8 @@ void MesocrystalForm::createBasisWidgets()
if (!m_item->basisItem())
return;
- m_layout->addRow(LayerEditorUtils::createWidgetForItemWithParticles(
- this, m_item->basisItem(), false, m_ec, false));
+ m_layout->addRow(LayerEditorUtils::createWidgetForItemWithParticles(this, m_item->basisItem(),
+ false, m_ec, false));
}
void MesocrystalForm::enableStructureEditing(bool b)
diff --git a/GUI/View/SampleDesigner/MesocrystalForm.h b/GUI/View/SampleDesigner/MesocrystalForm.h
index c557f4f3315..c5de1f8b52e 100644
--- a/GUI/View/SampleDesigner/MesocrystalForm.h
+++ b/GUI/View/SampleDesigner/MesocrystalForm.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALFORM_H
-#include <QGroupBox>
#include <QComboBox>
#include <QFormLayout>
+#include <QGroupBox>
class MesocrystalItem;
class SampleEditorController;
diff --git a/GUI/View/SampleDesigner/MultiLayerForm.h b/GUI/View/SampleDesigner/MultiLayerForm.h
index 0a8066f0c3e..7bfecda5516 100644
--- a/GUI/View/SampleDesigner/MultiLayerForm.h
+++ b/GUI/View/SampleDesigner/MultiLayerForm.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERFORM_H
-#include <QVBoxLayout>
#include <QPushButton>
+#include <QVBoxLayout>
class SampleItem;
class SampleEditorController;
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
index 43b6feccb94..56e10d477d9 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
@@ -83,8 +83,8 @@ ParticleLayoutItem* ParticleLayoutForm::layoutItem() const
void ParticleLayoutForm::onParticleAdded(ItemWithParticles* p)
{
int index = m_layoutItem->itemsWithParticles().indexOf(p);
- const int rowInLayout =
- m_layout->rowCount() - 1 - (m_layoutItem->itemsWithParticles().size() - 1) + index; // -1: btn
+ const int rowInLayout = m_layout->rowCount() - 1
+ - (m_layoutItem->itemsWithParticles().size() - 1) + index; // -1: btn
m_layout->insertRow(rowInLayout,
LayerEditorUtils::createWidgetForItemWithParticles(this, p, true, m_ec));
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 7c0e1484f60..7e37cd0fb05 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -150,8 +150,8 @@ void SimulationView::simulate()
return;
}
JobModel* jobModel = m_document->jobModel();
- JobItem* jobItem = jobModel->addJobItem(selectedSampleItem(), selectedInstrumentItem(), selectedRealItem(),
- *optionsItem());
+ JobItem* jobItem = jobModel->addJobItem(selectedSampleItem(), selectedInstrumentItem(),
+ selectedRealItem(), *optionsItem());
jobModel->runJob(jobItem);
}
@@ -166,8 +166,8 @@ void SimulationView::exportPythonScript()
auto* pythonWidget = new PythonScriptWidget(GUI::Global::mainWindow);
pythonWidget->show();
pythonWidget->raise();
- pythonWidget->generatePythonScript(selectedSampleItem(), selectedInstrumentItem(), *optionsItem(),
- ProjectManager::instance()->projectDir());
+ pythonWidget->generatePythonScript(selectedSampleItem(), selectedInstrumentItem(),
+ *optionsItem(), ProjectManager::instance()->projectDir());
}
void SimulationView::readOptionsFromUI()
diff --git a/Tests/Unit/GUI/TestInstrumentItems.cpp b/Tests/Unit/GUI/TestInstrumentItems.cpp
index 54ba5802c12..008761f4b62 100644
--- a/Tests/Unit/GUI/TestInstrumentItems.cpp
+++ b/Tests/Unit/GUI/TestInstrumentItems.cpp
@@ -32,7 +32,8 @@ TEST(TestInstrumentCollection, instrumentChanged)
ProjectDocument document;
// populating instrument model
- auto* instrument1 = document.instrumentsEditController()->addInstrumentItem<GISASInstrumentItem>();
+ auto* instrument1 =
+ document.instrumentsEditController()->addInstrumentItem<GISASInstrumentItem>();
auto* instrument2 =
document.instrumentsEditController()->addInstrumentItem<SpecularInstrumentItem>();
--
GitLab