diff --git a/GUI/Model/Sample/SampleValidator.cpp b/GUI/Model/Sample/SampleValidator.cpp index b0edc12fa3a070f6def4ba58384b0df614b71ca2..2e4c18d263e098d4ac0c9f998eb5c8e0592c8bce 100644 --- a/GUI/Model/Sample/SampleValidator.cpp +++ b/GUI/Model/Sample/SampleValidator.cpp @@ -39,14 +39,14 @@ QString SampleValidator::isValidSample(const SampleItem* sample) if (layout->itemsWithParticles().isEmpty()) append("Particle layout doesn't contain any particles."); for (const auto* particle : layout->containedItemsWithParticles()) { - if (const auto* p = dynamic_cast<const CoreAndShellItem*>(particle)) { - if (!p->coreItem()) - append("Sim/shell particle doesn't have core defined."); - if (!p->shellItem()) - append("Sim/shell particle doesn't have shell defined."); - } else if (const auto* p = dynamic_cast<const CompoundItem*>(particle)) - if (p->itemsWithParticles().isEmpty()) - append("Particle composition doesn't have any particles."); + if (const auto* p = dynamic_cast<const CoreAndShellItem*>(particle)) { + if (!p->coreItem()) + append("Sim/shell particle doesn't have core defined."); + if (!p->shellItem()) + append("Sim/shell particle doesn't have shell defined."); + } else if (const auto* p = dynamic_cast<const CompoundItem*>(particle)) + if (p->itemsWithParticles().isEmpty()) + append("Particle composition doesn't have any particles."); } } } diff --git a/GUI/Model/Sample/SampleValidator.h b/GUI/Model/Sample/SampleValidator.h index 88bdf9ad71019265f617fdb195308214d34c706b..5e801b26a85ede7cb6e1fad11418993d07fb44cb 100644 --- a/GUI/Model/Sample/SampleValidator.h +++ b/GUI/Model/Sample/SampleValidator.h @@ -21,7 +21,7 @@ class SampleItem; namespace SampleValidator { - QString isValidSample(const SampleItem* sample); +QString isValidSample(const SampleItem* sample); } diff --git a/GUI/View/Project/SimulationView.cpp b/GUI/View/Project/SimulationView.cpp index 4c011fe1e26e80e1a6bf96e4eacfdca6c1e05c42..f30105efe9d599413dc491b2cb3fd17acf8d7826 100644 --- a/GUI/View/Project/SimulationView.cpp +++ b/GUI/View/Project/SimulationView.cpp @@ -230,8 +230,8 @@ QString SimulationView::validateSimulationSetup(bool validateRealData) const append("No sample selected"); else { QString m = SampleValidator::isValidSample(selectedSampleItem()); - if (!m.isEmpty()) - append(m); + if (!m.isEmpty()) + append(m); } if (!selectedInstrumentItem())