Make BasicAxisItem::P_IS_VISIBLE private

GUI/Models/AxesItems.cpp

@@ -75,6 +75,21 @@ std::unique_ptr<IAxis> BasicAxisItem::createAxis(double scale) const
                                           upperBound() * scale);
 }
 
+SessionItem* BasicAxisItem::visibilityItem() const
+{
+    return getItem(P_IS_VISIBLE);
+}
+
+bool BasicAxisItem::visibilityValue() const
+{
+    return visibilityItem()->value().toBool();
+}
+
+bool BasicAxisItem::isVisibilityPropertyName(const QString& name)
+{
+    return name == P_IS_VISIBLE;
+}
+
 BasicAxisItem::~BasicAxisItem() = default;
 
 void BasicAxisItem::register_basic_properties()
@@ -96,8 +111,8 @@ AmplitudeAxisItem::AmplitudeAxisItem() : BasicAxisItem("AmplitudeAxis")
 {
     addProperty(P_LOCK_MIN_MAX, false)->setVisible(false);
     addProperty(P_IS_LOGSCALE, true);
-    getItem(BasicAxisItem::P_TITLE)->setVisible(false);
-    getItem(BasicAxisItem::P_IS_VISIBLE)->setVisible(true);
+    visibilityItem()->setVisible(false);
+    visibilityItem()->setVisible(true);
     setMinMaxEditor("ScientificDouble");
 
     mapper()->setOnPropertyChange([this](const QString& name) {

GUI/Models/AxesItems.h

@@ -21,8 +21,10 @@
 class IAxis;
 
 class BA_CORE_API_ BasicAxisItem : public SessionItem {
-public:
+private:
     static const QString P_IS_VISIBLE;
+
+public:
     static const QString P_NBINS;
     static const QString P_MIN_DEG;
     static const QString P_MAX_DEG;
@@ -46,6 +48,10 @@ public:
 
     virtual std::unique_ptr<IAxis> createAxis(double scale) const;
 
+    SessionItem* visibilityItem() const;
+    bool visibilityValue() const;
+    static bool isVisibilityPropertyName(const QString& name);
+    
 protected:
     void register_basic_properties();
 };

GUI/Models/Data1DViewItem.cpp

@@ -46,8 +46,8 @@ Data1DViewItem::Data1DViewItem() : SessionItem("Data1DViewItem"), m_job_item(nul
     auto amplitudeAxis = addProperty<AmplitudeAxisItem>(P_YAXIS);
     amplitudeAxis->getItem(BasicAxisItem::P_NBINS)->setVisible(false);
     amplitudeAxis->getItem(BasicAxisItem::P_TITLE)->setVisible(true);
-    amplitudeAxis->getItem(AmplitudeAxisItem::P_IS_VISIBLE)->setValue(true);
-    amplitudeAxis->getItem(AmplitudeAxisItem::P_IS_VISIBLE)->setVisible(false);
+    amplitudeAxis->visibilityItem()->setValue(true);
+    amplitudeAxis->visibilityItem()->setVisible(false);
 
     registerTag(T_DATA_PROPERTIES, 1, 1, QStringList() << "DataPropertyContainer");
 

GUI/Models/SpecularDataItem.cpp

@@ -35,8 +35,8 @@ SpecularDataItem::SpecularDataItem() : DataItem(M_TYPE)
     amplitudeAxis->getItem(BasicAxisItem::P_NBINS)->setVisible(false);
     amplitudeAxis->getItem(BasicAxisItem::P_TITLE)->setVisible(true);
 
-    amplitudeAxis->getItem(AmplitudeAxisItem::P_IS_VISIBLE)->setValue(true);
-    amplitudeAxis->getItem(AmplitudeAxisItem::P_IS_VISIBLE)->setVisible(false);
+    amplitudeAxis->visibilityItem()->setValue(true);
+    amplitudeAxis->visibilityItem()->setVisible(false);
 
     setXaxisTitle(SpecularDataAxesNames::x_axis_default_name);
     setYaxisTitle(SpecularDataAxesNames::y_axis_default_name);

GUI/Views/InstrumentWidgets/DetectorMaskDelegate.cpp

@@ -61,7 +61,7 @@ void DetectorMaskDelegate::createIntensityDataItem()
     m_intensityItem->setInterpolated(false);
 
     auto zAxisItem = m_intensityItem->zAxisItem();
-    zAxisItem->setItemValue(BasicAxisItem::P_IS_VISIBLE, false);
+    zAxisItem->visibilityItem()->setValue(false);
     zAxisItem->setLowerBound(0.0);
     zAxisItem->setUpperBound(2.0);
     zAxisItem->setLogScale(false);

GUI/Views/IntensityDataWidgets/ColorMap.cpp

@@ -156,11 +156,9 @@ void ColorMap::onAxisPropertyChanged(const QString& axisName, const QString& pro
             setLogz(intensityItem()->isLogz());
             replot();
 
-        } else if (propertyName == BasicAxisItem::P_IS_VISIBLE) {
+        } else if (BasicAxisItem::isVisibilityPropertyName(propertyName)) {
             setColorScaleVisible(intensityItem()
-                                     ->zAxisItem()
-                                     ->getItemValue(BasicAxisItem::P_IS_VISIBLE)
-                                     .toBool());
+                                 ->zAxisItem()->visibilityValue());
             replot();
         }
     }
@@ -393,9 +391,7 @@ void ColorMap::setDataFromItem(IntensityDataItem* item)
 
 void ColorMap::setColorScaleAppearanceFromItem(IntensityDataItem* item)
 {
-    setColorScaleVisible(item->zAxisItem()
-                             ->getItemValue(BasicAxisItem::P_IS_VISIBLE)
-                             .toBool());
+    setColorScaleVisible(item->zAxisItem()->visibilityValue());
     m_colorMap->setGradient(ColorMapUtils::itemGradient(intensityItem()));
     m_colorMap->setInterpolate(intensityItem()->isInterpolated());
     // make sure the axis rect and color scale synchronize their bottom and top margins (so they