diff --git a/GUI/Model/Descriptor/DoubleProperty.h b/GUI/Model/Descriptor/DoubleProperty.h index 16a1bfa3d1bb59948d1ecb672f870dc70bbdc26f..2168c053c3bc7445e24d703f0a681f129aa81514 100644 --- a/GUI/Model/Descriptor/DoubleProperty.h +++ b/GUI/Model/Descriptor/DoubleProperty.h @@ -110,11 +110,12 @@ void rwProperty(Streamer& s, const QString& tag, DoubleProperty& d); // clang-format off //! Add a member, a getter and a setter for a DoubleProperty -#define DOUBLE_PROPERTY(nameLower, nameUpper) \ -protected: \ - DoubleProperty m_##nameLower; \ -public: \ - DoubleDescriptor nameLower() const { return m_##nameLower; } \ +#define DOUBLE_PROPERTY(nameLower, nameUpper) \ +protected: \ + DoubleProperty m_##nameLower; \ +public: \ + DoubleProperty& nameLower() { return m_##nameLower; } \ + const DoubleProperty& nameLower() const { return m_##nameLower; } \ void set##nameUpper(double v) { m_##nameLower.set(v); } // clang-format on diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp index 38e152ed7cfc82604a09a2e98a548665785b4575..4c1f9995966a90640935ce2498d4a17c9f4da413 100644 --- a/GUI/Model/Model/ParameterTreeUtils.cpp +++ b/GUI/Model/Model/ParameterTreeUtils.cpp @@ -411,7 +411,7 @@ void ParameterTreeBuilder::addBackground(ParameterLabelItem* instrumentLabel, { if (auto* b = dynamic_cast<ConstantBackgroundItem*>(backgroundItem)) addParameterItem(instrumentLabel, b->backgroundValue(), - labelWithUnit("Constant background", b->backgroundValue().unit)); + labelWithUnit("Constant background", b->backgroundValue().unit())); } void ParameterTreeBuilder::addPolarization(ParameterLabelItem* instrumentLabel, diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp index d51825a64d84cbabd4813111c48d10295ec86dab..7904bb781c57c91a412a89ed084f05fa62518e22 100644 --- a/Tests/Unit/GUI/TestDetectorItems.cpp +++ b/Tests/Unit/GUI/TestDetectorItems.cpp @@ -43,8 +43,8 @@ TEST_F(TestDetectorItems, resolutionFunctionUnit) auto* p = dynamic_cast<ResolutionFunction2DGaussianItem*>( detector.resolutionFunctionSelection().currentItem()); EXPECT_NE(p, nullptr); - EXPECT_EQ(asString(p->sigmaX().unit), "mm"); - EXPECT_EQ(asString(p->sigmaY().unit), "mm"); + EXPECT_EQ(asString(p->sigmaX().unit()), "mm"); + EXPECT_EQ(asString(p->sigmaY().unit()), "mm"); SphericalDetectorItem sphericalDetector; sphericalDetector.setResolutionFunctionType<ResolutionFunctionNoneItem>(); @@ -52,6 +52,6 @@ TEST_F(TestDetectorItems, resolutionFunctionUnit) p = dynamic_cast<ResolutionFunction2DGaussianItem*>( sphericalDetector.resolutionFunctionSelection().currentItem()); EXPECT_NE(p, nullptr); - EXPECT_EQ(asString(p->sigmaX().unit), unitAsString(Unit::degree)); - EXPECT_EQ(asString(p->sigmaY().unit), unitAsString(Unit::degree)); + EXPECT_EQ(asString(p->sigmaX().unit()), unitAsString(Unit::degree)); + EXPECT_EQ(asString(p->sigmaY().unit()), unitAsString(Unit::degree)); }