IParticle: privatize members

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;
 }
 

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;
 }
 

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;
 };

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;
 }
 

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;
 }