Skip to content
Snippets Groups Projects
Commit 874faa70 authored by Wuttke, Joachim's avatar Wuttke, Joachim Committed by Wuttke, Joachim
Browse files

more explicit fct name ParticleLayoutItem::addParticleItem

parent d3e6f3dd
No related branches found
No related tags found
1 merge request!1203merge exec_spanZ into spanZ; add "Item" to some function names in GUI
......@@ -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); });
}
}
......
......@@ -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)
......
......@@ -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.
//!
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment