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

disambiguate fct name addParticle in Img3D

parent cec3f0da
No related branches found
No related tags found
1 merge request!1203merge exec_spanZ into spanZ; add "Item" to some function names in GUI
......@@ -148,7 +148,7 @@ Particle3DContainer Img3D::BuilderUtils::singleParticle3DContainer(const Particl
applyParticleColor(*P_clone, *particle3D);
Particle3DContainer result;
result.addParticle(particle3D.release());
result.addParticle3D(particle3D.release());
result.setCumulativeAbundance(P_clone->abundance() / total_abundance);
return result;
......@@ -179,8 +179,8 @@ Img3D::BuilderUtils::particleCoreShell3DContainer(const CoreAndShell& particleCo
Particle3DContainer result;
result.addParticle(outCore.release()); // index 0
result.addParticle(outShell.release()); // index 1
result.addParticle3D(outCore.release()); // index 0
result.addParticle3D(outShell.release()); // index 1
result.setCumulativeAbundance(PCS_clone->abundance() / total_abundance);
return result;
......@@ -211,7 +211,7 @@ Img3D::BuilderUtils::particleComposition3DContainer(const Compound& particleComp
// keep result flat
for (size_t i = 0; i < particle3DContainer.containerSize(); ++i) {
result.addParticle(particle3DContainer.createParticle(i).release());
result.addParticle3D(particle3DContainer.createParticle(i).release());
}
}
......@@ -275,7 +275,7 @@ Particle3DContainer Img3D::BuilderUtils::mesocrystal3DContainer(Mesocrystal* con
particle3D->addTranslation(Img3D::F3fromR3(mesocrystal_translation));
result.addParticle(particle3D.release());
result.addParticle3D(particle3D.release());
}
}
}
......@@ -291,7 +291,7 @@ Particle3DContainer Img3D::BuilderUtils::mesocrystal3DContainer(Mesocrystal* con
QColor color = {};
color.setAlphaF(0.3);
outerShape3D->setColor(color);
result.addParticle(outerShape3D.release());
result.addParticle3D(outerShape3D.release());
// set the correct abundance for the Mesocrystal
result.setCumulativeAbundance(M_clone->abundance() / total_abundance);
......
......@@ -24,7 +24,7 @@ void Particle3DContainer::clearContainer()
m_containerParticles.clear();
}
void Particle3DContainer::addParticle(Img3D::PlotParticle* particle3D)
void Particle3DContainer::addParticle3D(Img3D::PlotParticle* particle3D)
{
m_containerParticles.emplace_back(particle3D);
}
......
......@@ -41,7 +41,7 @@ public:
size_t containerSize() const { return m_containerParticles.size(); }
double cumulativeAbundance() const { return m_cumulativeAbundance; }
void addParticle(Img3D::PlotParticle* particle3D);
void addParticle3D(Img3D::PlotParticle* particle3D);
void setCumulativeAbundance(double cumulativeAbundance);
std::unique_ptr<Img3D::PlotParticle> createParticle(const size_t& index) const;
......
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