From 42cf5285825ba10316c4a98c1e33053939a11e0c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 6 Dec 2022 12:20:08 +0100
Subject: [PATCH] IParticle: privatize members
---
Sample/Particle/Compound.cpp | 6 +++---
Sample/Particle/CoreAndShell.cpp | 6 +++---
Sample/Particle/IParticle.h | 2 ++
Sample/Particle/Mesocrystal.cpp | 6 +++---
Sample/Particle/Particle.cpp | 6 +++---
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Sample/Particle/Compound.cpp b/Sample/Particle/Compound.cpp
index 78d3cf92126..77ac0307e53 100644
--- a/Sample/Particle/Compound.cpp
+++ b/Sample/Particle/Compound.cpp
@@ -26,9 +26,9 @@ Compound* Compound::clone() const
result->setAbundance(m_abundance);
for (size_t index = 0; index < m_particles.size(); ++index)
result->addParticle(*m_particles[index]);
- if (m_rotation)
- result->setRotation(*m_rotation);
- result->setParticlePosition(m_position);
+ if (rotation())
+ result->setRotation(*rotation());
+ result->setParticlePosition(particlePosition());
return result;
}
diff --git a/Sample/Particle/CoreAndShell.cpp b/Sample/Particle/CoreAndShell.cpp
index 22dabc5d834..2b1ff3fd286 100644
--- a/Sample/Particle/CoreAndShell.cpp
+++ b/Sample/Particle/CoreAndShell.cpp
@@ -32,9 +32,9 @@ CoreAndShell* CoreAndShell::clone() const
{
auto* result = new CoreAndShell(*m_shell, *m_core);
result->setAbundance(m_abundance);
- if (m_rotation)
- result->setRotation(*m_rotation);
- result->setParticlePosition(m_position);
+ if (rotation())
+ result->setRotation(*rotation());
+ result->setParticlePosition(particlePosition());
return result;
}
diff --git a/Sample/Particle/IParticle.h b/Sample/Particle/IParticle.h
index 6c90a8aad6f..725464101c3 100644
--- a/Sample/Particle/IParticle.h
+++ b/Sample/Particle/IParticle.h
@@ -83,6 +83,8 @@ public:
protected:
double m_abundance{1.0};
+
+private:
R3 m_position;
std::unique_ptr<IRotation> m_rotation;
};
diff --git a/Sample/Particle/Mesocrystal.cpp b/Sample/Particle/Mesocrystal.cpp
index 5375a4ba95c..71471ae992e 100644
--- a/Sample/Particle/Mesocrystal.cpp
+++ b/Sample/Particle/Mesocrystal.cpp
@@ -35,9 +35,9 @@ Mesocrystal* Mesocrystal::clone() const
{
auto* result = new Mesocrystal(m_crystal->clone(), m_meso_formfactor->clone());
result->setAbundance(m_abundance);
- if (m_rotation)
- result->setRotation(*m_rotation);
- result->setParticlePosition(m_position);
+ if (rotation())
+ result->setRotation(*rotation());
+ result->setParticlePosition(particlePosition());
return result;
}
diff --git a/Sample/Particle/Particle.cpp b/Sample/Particle/Particle.cpp
index 9a5315fe348..e56ef30ca6b 100644
--- a/Sample/Particle/Particle.cpp
+++ b/Sample/Particle/Particle.cpp
@@ -37,9 +37,9 @@ Particle* Particle::clone() const
ASSERT(m_formfactor);
auto* result = new Particle(m_material, *m_formfactor);
result->setAbundance(m_abundance);
- if (m_rotation)
- result->setRotation(*m_rotation);
- result->setParticlePosition(m_position);
+ if (rotation())
+ result->setRotation(*rotation());
+ result->setParticlePosition(particlePosition());
return result;
}
--
GitLab