From db493c30029f85f083a4cc830149e4bd4476d1de Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 2 Dec 2021 17:23:00 +0100
Subject: [PATCH] rm unused fct
---
Sample/Particle/Particle.cpp | 12 +-----------
Sample/Particle/Particle.h | 4 ----
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/Sample/Particle/Particle.cpp b/Sample/Particle/Particle.cpp
index 6207f51f315..b0cc8d5c069 100644
--- a/Sample/Particle/Particle.cpp
+++ b/Sample/Particle/Particle.cpp
@@ -26,13 +26,11 @@ Particle::~Particle() = default;
Particle::Particle(Material material, const IFormFactor& form_factor)
: m_material(std::move(material)), m_form_factor(form_factor.clone())
{
- initialize();
}
Particle::Particle(Material material, const IFormFactor& form_factor, const IRotation& rotation)
- : m_material(std::move(material)), m_form_factor(form_factor.clone())
+ : Particle(material, form_factor)
{
- initialize();
setRotation(rotation);
}
@@ -65,15 +63,7 @@ SlicedParticle Particle::createSlicedParticle(const ZLimits& limits) const
return {std::move(sliced_ff), {{{volume, transformed_material}}}};
}
-void Particle::setFormFactor(const IFormFactor& form_factor)
-{
- if (&form_factor != m_form_factor.get())
- m_form_factor.reset(form_factor.clone());
-}
-
std::vector<const INode*> Particle::getChildren() const
{
return std::vector<const INode*>() << IParticle::getChildren() << m_form_factor;
}
-
-void Particle::initialize() {}
diff --git a/Sample/Particle/Particle.h b/Sample/Particle/Particle.h
index c3e56ed9344..09be81a0bc1 100644
--- a/Sample/Particle/Particle.h
+++ b/Sample/Particle/Particle.h
@@ -42,10 +42,6 @@ public:
protected:
Material m_material;
std::unique_ptr<IFormFactor> m_form_factor;
-
-private:
- void initialize();
- void setFormFactor(const IFormFactor& form_factor);
};
#endif // BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H
--
GitLab