diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp index 7c8d24bebb014d7e5bea7b89f5e6bc972e5933b5..0bf13734e2ba66990124be696c792a0dc99f3e37 100644 --- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp +++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp @@ -93,7 +93,7 @@ void GUIDomainSampleVisitor::visit(const ParticleLayout* sample) { else layout_item = m_sampleModel->insertNewItem("ParticleLayout"); layout_item->setItemValue(ParticleLayoutItem::P_TOTAL_DENSITY, - sample->totalParticleSurfaceDensity()); + sample->totalParticleSurfaceDensity()); layout_item->setItemValue(ParticleLayoutItem::P_WEIGHT, sample->weight()); m_levelToParentItem[depth()] = layout_item; } @@ -106,12 +106,12 @@ void GUIDomainSampleVisitor::visit(const Layer* sample) { ASSERT(multilayer); size_t layer_index = MultiLayerUtils::IndexOfLayer(*multilayer, sample); const LayerInterface* top_interface = - layer_index==0 ? nullptr : multilayer->layerInterface(layer_index - 1); + layer_index == 0 ? nullptr : multilayer->layerInterface(layer_index - 1); SessionItem* layer_item = m_sampleModel->insertNewItem("Layer", m_sampleModel->indexOfItem(parent)); layer_item->setItemValue(LayerItem::P_MATERIAL, - createMaterialFromDomain(sample->material()).variant()); + createMaterialFromDomain(sample->material()).variant()); TransformFromDomain::setLayerItem(layer_item, sample, top_interface); @@ -121,8 +121,7 @@ void GUIDomainSampleVisitor::visit(const Layer* sample) { void GUIDomainSampleVisitor::visit(const MultiLayer* sample) { SessionItem* multilayer_item = m_sampleModel->insertNewItem("MultiLayer"); multilayer_item->setItemName(sample->getName().c_str()); - multilayer_item->setItemValue(MultiLayerItem::P_CROSS_CORR_LENGTH, - sample->crossCorrLength()); + multilayer_item->setItemValue(MultiLayerItem::P_CROSS_CORR_LENGTH, sample->crossCorrLength()); SetVectorItem(*multilayer_item, MultiLayerItem::P_EXTERNAL_FIELD, sample->externalField()); m_levelToParentItem[depth()] = multilayer_item; m_itemToSample[multilayer_item] = sample; @@ -131,7 +130,7 @@ void GUIDomainSampleVisitor::visit(const MultiLayer* sample) { void GUIDomainSampleVisitor::visit(const Particle* sample) { auto particle_item = InsertIParticle(sample, "Particle"); particle_item->setItemValue(ParticleItem::P_MATERIAL, - createMaterialFromDomain(sample->material()).variant()); + createMaterialFromDomain(sample->material()).variant()); } void GUIDomainSampleVisitor::visit(const ParticleDistribution* sample) { diff --git a/Sample/Processed/ProcessedSample.cpp b/Sample/Processed/ProcessedSample.cpp index 73d00619867a0e22c14c4fc7b086b5ab9fd4f1f4..221d2193788c14c1314a3ab63b30cc8133f45fd8 100644 --- a/Sample/Processed/ProcessedSample.cpp +++ b/Sample/Processed/ProcessedSample.cpp @@ -13,13 +13,13 @@ // ************************************************************************************************ #include "Sample/Processed/ProcessedSample.h" +#include "Sample/Aggregate/ParticleLayout.h" #include "Sample/Fresnel/MatrixFresnelMap.h" #include "Sample/Fresnel/ScalarFresnelMap.h" #include "Sample/Multilayer/Layer.h" #include "Sample/Multilayer/MultiLayerUtils.h" #include "Sample/Particle/HomogeneousRegion.h" #include "Sample/Particle/IParticle.h" -#include "Sample/Aggregate/ParticleLayout.h" #include "Sample/Processed/ProcessedLayout.h" #include "Sample/RT/SimulationOptions.h" #include "Sample/Scattering/LayerFillLimits.h" @@ -83,8 +83,7 @@ std::vector<double> bottomLayerCoordinates(const MultiLayer& multilayer) { } //! Calculate z-regions occupied by particles -std::vector<ZLimits> particleRegions(const MultiLayer& multilayer, - bool use_slicing) { +std::vector<ZLimits> particleRegions(const MultiLayer& multilayer, bool use_slicing) { const std::vector<double> bottom_coords = bottomLayerCoordinates(multilayer); LayerFillLimits layer_fill_limits(bottom_coords); if (use_slicing) {