Make BasicAxisItem::P_TITLE_IS_VISIBLE private

GUI/Models/AxesItems.cpp

@@ -99,6 +99,16 @@ bool BasicAxisItem::isTitlePropertyName(const QString& name)
     return name == P_TITLE;
 }
 
+bool BasicAxisItem::isTitleVisible() const
+{
+    return getItemValue(P_TITLE_IS_VISIBLE).toBool();
+}
+
+bool BasicAxisItem::isTitleVisiblePropertyName(const QString& name)
+{
+    return name == P_TITLE_IS_VISIBLE;
+}
+
 std::unique_ptr<IAxis> BasicAxisItem::createAxis(double scale) const
 {
     return std::make_unique<FixedBinAxis>(title().toStdString(), binCount(), lowerBound() * scale,

GUI/Models/AxesItems.h

@@ -27,9 +27,9 @@ private:
     static const QString P_MIN_DEG;
     static const QString P_MAX_DEG;
     static const QString P_TITLE;
+    static const QString P_TITLE_IS_VISIBLE;
 
 public:
-    static const QString P_TITLE_IS_VISIBLE;
 
     explicit BasicAxisItem(const QString& type = "BasicAxis");
     virtual ~BasicAxisItem();
@@ -53,6 +53,8 @@ public:
     void setTitle(const QString& title);
     SessionItem* titleItem() const;
     static bool isTitlePropertyName(const QString& name);
+    bool isTitleVisible() const;
+    static bool isTitleVisiblePropertyName(const QString& name);
 
     virtual std::unique_ptr<IAxis> createAxis(double scale) const;
 

GUI/Views/IntensityDataWidgets/ColorMap.cpp

@@ -127,7 +127,7 @@ void ColorMap::onAxisPropertyChanged(const QString& axisName, const QString& pro
         return;
 
     if (BasicAxisItem::isTitlePropertyName(propertyName)
-        || propertyName == BasicAxisItem::P_TITLE_IS_VISIBLE) {
+        || BasicAxisItem::isTitleVisiblePropertyName(propertyName)) {
         setAxesLabelsFromItem(intensityItem());
         replot();
     }
@@ -356,7 +356,7 @@ void ColorMap::setAxesZoomFromItem(IntensityDataItem* item)
 void ColorMap::setAxesLabelsFromItem(IntensityDataItem* item)
 {
     auto xaxis = item->xAxisItem();
-    if (xaxis->getItemValue(BasicAxisItem::P_TITLE_IS_VISIBLE).toBool())
+    if (xaxis->isTitleVisible())
         m_customPlot->xAxis->setLabel(item->getXaxisTitle());
     else
         m_customPlot->xAxis->setLabel(QString());
@@ -364,7 +364,7 @@ void ColorMap::setAxesLabelsFromItem(IntensityDataItem* item)
     m_colorScale->setMargins(QMargins(0, 0, 0, 0));
 
     auto yaxis = item->yAxisItem();
-    if (yaxis->getItemValue(BasicAxisItem::P_TITLE_IS_VISIBLE).toBool())
+    if (yaxis->isTitleVisible())
         m_customPlot->yAxis->setLabel(item->getYaxisTitle());
     else
         m_customPlot->yAxis->setLabel(QString());

GUI/Views/IntensityDataWidgets/Plot1D.cpp

@@ -231,7 +231,7 @@ void Plot1D::setAxesLabelsFromItem(Data1DViewItem* item)
 void Plot1D::setLabel(const BasicAxisItem* item, QCPAxis* axis, QString label)
 {
     ASSERT(item && axis);
-    if (item->getItemValue(BasicAxisItem::P_TITLE_IS_VISIBLE).toBool())
+    if (item->isTitleVisible())
         axis->setLabel(std::move(label));
     else
         axis->setLabel(QString());
@@ -270,7 +270,7 @@ void Plot1D::modifyAxesProperties(const QString& axisName, const QString& proper
         return;
 
     if (BasicAxisItem::isTitlePropertyName(propertyName)
-        || propertyName == BasicAxisItem::P_TITLE_IS_VISIBLE) {
+        || BasicAxisItem::isTitleVisiblePropertyName(propertyName)) {
         setAxesLabelsFromItem(viewItem());
         replot();
     }

GUI/Views/SpecularDataWidgets/SpecularPlot.cpp

@@ -215,7 +215,7 @@ void SpecularPlot::setAxesLabelsFromItem(SpecularDataItem* item)
 void SpecularPlot::setLabel(const BasicAxisItem* item, QCPAxis* axis, QString label)
 {
     ASSERT(item && axis);
-    if (item->getItemValue(BasicAxisItem::P_TITLE_IS_VISIBLE).toBool())
+    if (item->isTitleVisible())
         axis->setLabel(std::move(label));
     else
         axis->setLabel(QString());
@@ -252,7 +252,7 @@ void SpecularPlot::modifyAxesProperties(const QString& axisName, const QString&
         return;
 
     if (BasicAxisItem::isTitlePropertyName(propertyName)
-        || propertyName == BasicAxisItem::P_TITLE_IS_VISIBLE) {
+        || BasicAxisItem::isTitleVisiblePropertyName(propertyName)) {
         setAxesLabelsFromItem(specularItem());
         replot();
     }