From d53a86f8a0efeec4d3a68a5aab3e66c17b4e7966 Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de> Date: Tue, 29 Nov 2022 17:24:00 +0100 Subject: [PATCH] ProfileItems: mv setters/getters to header --- GUI/Model/Sample/ProfileItems.cpp | 50 ------------------------------- GUI/Model/Sample/ProfileItems.h | 20 ++++++------- 2 files changed, 10 insertions(+), 60 deletions(-) diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp index d225196ad43..1323e9225f5 100644 --- a/GUI/Model/Sample/ProfileItems.cpp +++ b/GUI/Model/Sample/ProfileItems.cpp @@ -39,11 +39,6 @@ void Profile1DItem::serialize(Streamer& s) Serialize::rwProperty(s, Tag::Omega, m_omega); } -DoubleDescriptor Profile1DItem::omega() const -{ - return m_omega; -} - DoubleDescriptors Profile1DItem::valueDescriptors() const { return {omega()}; @@ -104,11 +99,6 @@ void Profile1DVoigtItem::serialize(Streamer& s) Serialize::rwProperty(s, Tag::Eta, m_eta); } -DoubleDescriptor Profile1DVoigtItem::eta() const -{ - return m_eta; -} - DoubleDescriptors Profile1DVoigtItem::valueDescriptors() const { return Profile1DItem::valueDescriptors() + DoubleDescriptors{eta()}; @@ -136,36 +126,6 @@ void Profile2DItem::serialize(Streamer& s) Serialize::rwProperty(s, Tag::Gamma, m_gamma); } -DoubleDescriptor Profile2DItem::omegaX() const -{ - return m_omegaX; -} - -void Profile2DItem::setOmegaX(const double omega_x) -{ - m_omegaX.set(omega_x); -} - -DoubleDescriptor Profile2DItem::omegaY() const -{ - return m_omegaY; -} - -void Profile2DItem::setOmegaY(const double omega_y) -{ - m_omegaY.set(omega_y); -} - -DoubleDescriptor Profile2DItem::gamma() const -{ - return m_gamma; -} - -void Profile2DItem::setGamma(const double gamma) -{ - m_gamma.set(gamma); -} - DoubleDescriptors Profile2DItem::valueDescriptors() const { return {omegaX(), omegaY(), gamma()}; @@ -221,16 +181,6 @@ void Profile2DVoigtItem::serialize(Streamer& s) Serialize::rwProperty(s, Tag::Eta, m_eta); } -DoubleDescriptor Profile2DVoigtItem::eta() const -{ - return m_eta; -} - -void Profile2DVoigtItem::setEta(double eta) -{ - m_eta.set(eta); -} - DoubleDescriptors Profile2DVoigtItem::valueDescriptors() const { return {omegaX(), omegaY(), eta(), gamma()}; diff --git a/GUI/Model/Sample/ProfileItems.h b/GUI/Model/Sample/ProfileItems.h index 92234776a07..cb66892233f 100644 --- a/GUI/Model/Sample/ProfileItems.h +++ b/GUI/Model/Sample/ProfileItems.h @@ -32,7 +32,7 @@ public: virtual ~Profile1DItem() = default; virtual void serialize(Streamer& s); - DoubleDescriptor omega() const; + DoubleDescriptor omega() const { return m_omega; } virtual DoubleDescriptors valueDescriptors() const; @@ -73,7 +73,7 @@ public: std::unique_ptr<IProfile1D> createProfile() const override; void serialize(Streamer& s) override; - DoubleDescriptor eta() const; + DoubleDescriptor eta() const { return m_eta; } DoubleDescriptors valueDescriptors() const override; private: @@ -88,13 +88,13 @@ public: virtual std::unique_ptr<IProfile2D> createProfile() const = 0; virtual void serialize(Streamer& s); - DoubleDescriptor omegaX() const; - void setOmegaX(double omega_x); - DoubleDescriptor omegaY() const; - void setOmegaY(double omega_y); + DoubleDescriptor omegaX() const { return m_omegaX; } + void setOmegaX(double omega_x) { m_omegaX.set(omega_x); } + DoubleDescriptor omegaY() const { return m_omegaY; } + void setOmegaY(double omega_y) { m_omegaY.set(omega_y); } - DoubleDescriptor gamma() const; - void setGamma(double gamma); + DoubleDescriptor gamma() const { return m_gamma; } + void setGamma(double gamma) { m_gamma.set(gamma); } virtual DoubleDescriptors valueDescriptors() const; @@ -132,8 +132,8 @@ public: std::unique_ptr<IProfile2D> createProfile() const override; void serialize(Streamer& s) override; - DoubleDescriptor eta() const; - void setEta(double eta); + DoubleDescriptor eta() const { return m_eta; } + void setEta(double eta) { m_eta.set(eta); } DoubleDescriptors valueDescriptors() const override; -- GitLab