diff --git a/GUI/Model/FromCore/ItemizeSample.cpp b/GUI/Model/FromCore/ItemizeSample.cpp index 3804ea61607830d5b7335d5155dd6603d464f30a..12e2769343c8fd9c2bb242a3ca4ca83a894f0b35 100644 --- a/GUI/Model/FromCore/ItemizeSample.cpp +++ b/GUI/Model/FromCore/ItemizeSample.cpp @@ -659,7 +659,7 @@ SampleItem* itemizeSample(const MultiLayer& sample, const QString& nodeName) // create particles/particle compositions for (const IParticle* particle : layout->particles()) copyParticle(particle, matItems, - [=](ItemWithParticles* p) { layoutItem->addParticle(p); }); + [=](ItemWithParticles* p) { layoutItem->addParticleItem(p); }); } } diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp index 404aa20dfd80c3d2cd0097b77f83f4d062154faf..87f515d1f1e13c1fdc864dbf291a3133037f31db 100644 --- a/GUI/Model/Sample/ParticleLayoutItem.cpp +++ b/GUI/Model/Sample/ParticleLayoutItem.cpp @@ -77,7 +77,7 @@ QVector<ItemWithParticles*> ParticleLayoutItem::particles() const } SelectionProperty<ItemWithParticlesCatalog>& -ParticleLayoutItem::addParticle(ItemWithParticles* particle) +ParticleLayoutItem::addParticleItem(ItemWithParticles* particle) { SelectionProperty<ItemWithParticlesCatalog> newParticleSelection; newParticleSelection.setCurrentItem(particle); @@ -85,7 +85,7 @@ ParticleLayoutItem::addParticle(ItemWithParticles* particle) return m_particles.back(); } -void ParticleLayoutItem::removeParticle(ItemWithParticles* particle) +void ParticleLayoutItem::removeParticleItem(ItemWithParticles* particle) { for (size_t i = 0; i < m_particles.size(); i++) if (m_particles[i].currentItem() == particle) diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h index d2801afb3e270875e612e1c11d4f75c81bb25609..da7c748f34e955585b71d5bc828bf7f2c0d06f47 100644 --- a/GUI/Model/Sample/ParticleLayoutItem.h +++ b/GUI/Model/Sample/ParticleLayoutItem.h @@ -52,8 +52,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*> particles() const; - SelectionProperty<ItemWithParticlesCatalog>& addParticle(ItemWithParticles* particle); - void removeParticle(ItemWithParticles* particle); + SelectionProperty<ItemWithParticlesCatalog>& addParticleItem(ItemWithParticles* particle); + void removeParticleItem(ItemWithParticles* particle); //! Return full hierarchical contained items with particles. //! diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp index 487b79de2a20095e13db2a59b7427eb6db400fb3..0939e8d41c0bc3573b9c365a0b2ae423f47e5afe 100644 --- a/GUI/View/SampleDesigner/SampleEditorController.cpp +++ b/GUI/View/SampleDesigner/SampleEditorController.cpp @@ -163,7 +163,7 @@ void SampleEditorController::addParticleLayoutItem(ParticleLayoutItem* layoutIte FormFactorItemCatalog::Type formFactorType) { auto* newParticle = createAndInitParticle(formFactorType); - layoutItem->addParticle(newParticle); + layoutItem->addParticleItem(newParticle); emit modified(); @@ -179,7 +179,7 @@ void SampleEditorController::addParticleLayoutItem(ParticleLayoutItem* layoutIte ItemWithParticlesCatalog::Type type) { auto* newItem = createAndInitParticle(type); - layoutItem->addParticle(newItem); + layoutItem->addParticleItem(newItem); emit modified(); @@ -291,7 +291,7 @@ void SampleEditorController::removeParticle(ItemWithParticles* itemToRemove) layoutForm->onAboutToRemoveParticle(itemToRemove); emit aboutToRemoveItem(itemToRemove); - layoutForm->layoutItem()->removeParticle(itemToRemove); + layoutForm->layoutItem()->removeParticleItem(itemToRemove); emit modified(); return; }