From f7f73d144e11455093508151713385d2a57e7c02 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Wed, 30 Nov 2022 11:48:45 +0100
Subject: [PATCH] ProfileItems: rm unneeded getters
---
GUI/Model/Sample/ProfileItems.cpp | 27 ++++++++++++++++-----------
GUI/Model/Sample/ProfileItems.h | 7 -------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp
index e86cc95f8f7..7c87cf415d7 100644
--- a/GUI/Model/Sample/ProfileItems.cpp
+++ b/GUI/Model/Sample/ProfileItems.cpp
@@ -48,35 +48,35 @@ DoubleDescriptors Profile1DItem::valueDescriptors() const
std::unique_ptr<IProfile1D> Profile1DCauchyItem::createProfile() const
{
- return std::make_unique<Profile1DCauchy>(omega());
+ return std::make_unique<Profile1DCauchy>(m_omega.get());
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile1D> Profile1DGaussItem::createProfile() const
{
- return std::make_unique<Profile1DGauss>(omega());
+ return std::make_unique<Profile1DGauss>(m_omega.get());
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile1D> Profile1DGateItem::createProfile() const
{
- return std::make_unique<Profile1DGate>(omega());
+ return std::make_unique<Profile1DGate>(m_omega.get());
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile1D> Profile1DTriangleItem::createProfile() const
{
- return std::make_unique<Profile1DTriangle>(omega());
+ return std::make_unique<Profile1DTriangle>(m_omega.get());
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile1D> Profile1DCosineItem::createProfile() const
{
- return std::make_unique<Profile1DCosine>(omega());
+ return std::make_unique<Profile1DCosine>(m_omega.get());
}
// --------------------------------------------------------------------------------------------- //
@@ -89,7 +89,7 @@ Profile1DVoigtItem::Profile1DVoigtItem()
std::unique_ptr<IProfile1D> Profile1DVoigtItem::createProfile() const
{
- return std::make_unique<Profile1DVoigt>(omega(), eta());
+ return std::make_unique<Profile1DVoigt>(m_omega.get(), m_eta.get());
}
void Profile1DVoigtItem::serialize(Streamer& s)
@@ -135,28 +135,32 @@ DoubleDescriptors Profile2DItem::valueDescriptors() const
std::unique_ptr<IProfile2D> Profile2DCauchyItem::createProfile() const
{
- return std::make_unique<Profile2DCauchy>(omegaX(), omegaY(), Units::deg2rad(gamma()));
+ return std::make_unique<Profile2DCauchy>(m_omegaX.get(), m_omegaY.get(),
+ Units::deg2rad(m_gamma.get()));
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile2D> Profile2DGaussItem::createProfile() const
{
- return std::make_unique<Profile2DGauss>(omegaX(), omegaY(), Units::deg2rad(gamma()));
+ return std::make_unique<Profile2DGauss>(m_omegaX.get(), m_omegaY.get(),
+ Units::deg2rad(m_gamma.get()));
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile2D> Profile2DGateItem::createProfile() const
{
- return std::make_unique<Profile2DGate>(omegaX(), omegaY(), Units::deg2rad(gamma()));
+ return std::make_unique<Profile2DGate>(m_omegaX.get(), m_omegaY.get(),
+ Units::deg2rad(m_gamma.get()));
}
// --------------------------------------------------------------------------------------------- //
std::unique_ptr<IProfile2D> Profile2DConeItem::createProfile() const
{
- return std::make_unique<Profile2DCone>(omegaX(), omegaY(), Units::deg2rad(gamma()));
+ return std::make_unique<Profile2DCone>(m_omegaX.get(), m_omegaY.get(),
+ Units::deg2rad(m_gamma.get()));
}
// --------------------------------------------------------------------------------------------- //
@@ -169,7 +173,8 @@ Profile2DVoigtItem::Profile2DVoigtItem()
std::unique_ptr<IProfile2D> Profile2DVoigtItem::createProfile() const
{
- return std::make_unique<Profile2DVoigt>(omegaX(), omegaY(), Units::deg2rad(gamma()), eta());
+ return std::make_unique<Profile2DVoigt>(m_omegaX.get(), m_omegaY.get(),
+ Units::deg2rad(m_gamma.get()), m_eta.get());
}
void Profile2DVoigtItem::serialize(Streamer& s)
diff --git a/GUI/Model/Sample/ProfileItems.h b/GUI/Model/Sample/ProfileItems.h
index db598c78543..648317a1326 100644
--- a/GUI/Model/Sample/ProfileItems.h
+++ b/GUI/Model/Sample/ProfileItems.h
@@ -72,7 +72,6 @@ public:
std::unique_ptr<IProfile1D> createProfile() const override;
void serialize(Streamer& s) override;
- double eta() const { return m_eta.get(); }
void setEta(double v) { m_eta.set(v); }
DoubleDescriptors valueDescriptors() const override;
@@ -89,13 +88,8 @@ public:
virtual std::unique_ptr<IProfile2D> createProfile() const = 0;
virtual void serialize(Streamer& s);
- double omegaX() const { return m_omegaX.get(); }
void setOmegaX(double v) { m_omegaX.set(v); }
-
- double omegaY() const { return m_omegaY.get(); }
void setOmegaY(double v) { m_omegaY.set(v); }
-
- double gamma() const { return m_gamma.get(); }
void setGamma(double v) { m_gamma.set(v); }
virtual DoubleDescriptors valueDescriptors() const;
@@ -134,7 +128,6 @@ public:
std::unique_ptr<IProfile2D> createProfile() const override;
void serialize(Streamer& s) override;
- double eta() const { return m_eta.get(); }
void setEta(double v) { m_eta.set(v); }
DoubleDescriptors valueDescriptors() const override;
--
GitLab