From 70b418f896b5efa9f88cd0fe6d6c57cd0fb922c7 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 9 Dec 2021 10:26:57 +0100
Subject: [PATCH] sort member fcts
---
Sample/Particle/IParticle.h | 1 +
Sample/Particle/Particle.cpp | 14 +++++++-------
Sample/Particle/Particle.h | 10 ++++------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Sample/Particle/IParticle.h b/Sample/Particle/IParticle.h
index 90a4ce3a00e..1d933f1eb42 100644
--- a/Sample/Particle/IParticle.h
+++ b/Sample/Particle/IParticle.h
@@ -35,6 +35,7 @@ class IRotation;
class IParticle : public ISampleNode {
public:
~IParticle() override;
+
IParticle* clone() const override = 0;
//! Creates a form factor for this particle
diff --git a/Sample/Particle/Particle.cpp b/Sample/Particle/Particle.cpp
index 70c742ffc4e..bfd982bb02e 100644
--- a/Sample/Particle/Particle.cpp
+++ b/Sample/Particle/Particle.cpp
@@ -21,8 +21,6 @@
#include "Sample/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Sample/Scattering/Rotations.h"
-Particle::~Particle() = default;
-
Particle::Particle(Material material, const IFormFactor& form_factor)
: m_material(std::move(material)), m_form_factor(form_factor.clone())
{
@@ -34,6 +32,8 @@ Particle::Particle(Material material, const IFormFactor& form_factor, const IRot
setRotation(rotation);
}
+Particle::~Particle() = default;
+
Particle* Particle::clone() const
{
ASSERT(m_form_factor);
@@ -46,6 +46,11 @@ Particle* Particle::clone() const
return p_result;
}
+std::vector<const INode*> Particle::nodeChildren() const
+{
+ return std::vector<const INode*>() << IParticle::nodeChildren() << m_form_factor;
+}
+
SlicedParticle Particle::createSlicedParticle(const ZLimits& limits) const
{
ASSERT(m_form_factor);
@@ -60,8 +65,3 @@ SlicedParticle Particle::createSlicedParticle(const ZLimits& limits) const
sliced_ff->setMaterial(transformed_material);
return {std::move(sliced_ff), {{{volume, transformed_material}}}};
}
-
-std::vector<const INode*> Particle::nodeChildren() const
-{
- return std::vector<const INode*>() << IParticle::nodeChildren() << m_form_factor;
-}
diff --git a/Sample/Particle/Particle.h b/Sample/Particle/Particle.h
index e817129b645..c5eb190b911 100644
--- a/Sample/Particle/Particle.h
+++ b/Sample/Particle/Particle.h
@@ -23,22 +23,20 @@
class Particle : public IParticle {
public:
- std::string className() const override { return "Particle"; }
-
Particle(Material material, const IFormFactor& form_factor);
Particle(Material material, const IFormFactor& form_factor, const IRotation& rotation);
~Particle() override;
Particle* clone() const override;
-
- SlicedParticle createSlicedParticle(const ZLimits& limits) const override;
+ std::string className() const override { return "Particle"; }
+ std::vector<const INode*> nodeChildren() const override;
const Material* material() const override { return &m_material; }
- std::vector<const INode*> nodeChildren() const override;
-
const IFormFactor* formFactor() const { return m_form_factor.get(); }
+ SlicedParticle createSlicedParticle(const ZLimits& limits) const override;
+
private:
const Material m_material;
std::unique_ptr<const IFormFactor> m_form_factor;
--
GitLab