BasicAxisItem: rm P_TITLE_IS_VISIBLE

GUI/Model/Device/AxesItems.cpp

@@ -81,25 +81,15 @@ void BasicAxisItem::setTitle(const QString& title)
     emit axisTitleChanged();
 }
 
-bool BasicAxisItem::isTitleVisible() const
-{
-    return getItemValue(P_TITLE_IS_VISIBLE).toBool();
-}
-
 std::unique_ptr<IAxis> BasicAxisItem::createAxis(double scale) const
 {
     return std::make_unique<FixedBinAxis>(title().toStdString(), binCount(), min() * scale,
                                           max() * scale);
 }
 
-SessionItem* BasicAxisItem::visibilityItem() const
-{
-    return getItem(P_IS_VISIBLE);
-}
-
 bool BasicAxisItem::isVisible() const
 {
-    return visibilityItem()->value().toBool();
+    return getItemValue(P_MIN_DEG).toBool();
 }
 
 void BasicAxisItem::setVisibilityValue(bool b)
@@ -118,7 +108,6 @@ BasicAxisItem::BasicAxisItem(const QString& type)
     addProperty(P_MIN_DEG, 0.0)->setDecimals(3).setLimits(RealLimits::limitless());
     addProperty(P_MAX_DEG, -1.0)->setDecimals(3).setLimits(RealLimits::limitless());
     addProperty(P_TITLE, QString());
-    addProperty(P_TITLE_IS_VISIBLE, true);
 }
 
 void BasicAxisItem::serialize(Streamer& s)
@@ -129,7 +118,6 @@ void BasicAxisItem::serialize(Streamer& s)
     Serialize::rwSessionItem<double>(s, "min", getItem(P_MIN_DEG));
     Serialize::rwSessionItem<double>(s, "max", getItem(P_MAX_DEG));
     Serialize::rwSessionItem<QString>(s, "title", getItem(P_TITLE));
-    Serialize::rwSessionItem<bool>(s, "titleVisible", getItem(P_TITLE_IS_VISIBLE));
 }
 
 // ---------------------------------------------------------------------------------------------- //
@@ -139,7 +127,6 @@ AmplitudeAxisItem::AmplitudeAxisItem()
 {
     addProperty(P_LOCK_MIN_MAX, false);
     addProperty(P_IS_LOGSCALE, true);
-    visibilityItem();
 }
 
 void AmplitudeAxisItem::serialize(Streamer& s)

GUI/Model/Device/AxesItems.h

@@ -30,7 +30,6 @@ private:
     static constexpr auto P_MIN_DEG{"Min [deg]"};
     static constexpr auto P_MAX_DEG{"Max [deg]"};
     static constexpr auto P_TITLE{"Title"};
-    static constexpr auto P_TITLE_IS_VISIBLE{"Title Visibility"};
 
 public:
     static constexpr auto M_TYPE{"BasicAxis"};
@@ -54,11 +53,9 @@ public:
 
     QString title() const;
     void setTitle(const QString& title);
-    bool isTitleVisible() const;
 
     virtual std::unique_ptr<IAxis> createAxis(double scale) const;
 
-    SessionItem* visibilityItem() const;
     bool isVisible() const;
     void setVisibilityValue(bool b);
 

GUI/View/Plot2D/ColorMap.cpp

@@ -337,17 +337,11 @@ void ColorMap::setAxesLabelsFromItem()
 {
     if (!intensityItem())
         return;
-    if (intensityItem()->xAxisItem()->isTitleVisible())
-        m_customPlot->xAxis->setLabel(intensityItem()->XaxisTitle());
-    else
-        m_customPlot->xAxis->setLabel(QString());
 
+    m_customPlot->xAxis->setLabel(intensityItem()->XaxisTitle());
+    m_customPlot->yAxis->setLabel(intensityItem()->YaxisTitle());
     m_colorScale->setMargins(QMargins(0, 0, 0, 0));
 
-    if (intensityItem()->yAxisItem()->isTitleVisible())
-        m_customPlot->yAxis->setLabel(intensityItem()->YaxisTitle());
-    else
-        m_customPlot->yAxis->setLabel(QString());
     replot();
 }
 

GUI/View/PlotSpecular/SpecularPlot.cpp

@@ -239,10 +239,7 @@ void SpecularPlot::setAxesLabels()
 void SpecularPlot::setLabel(const BasicAxisItem* item, QCPAxis* axis)
 {
     ASSERT(item && axis);
-    if (item->isTitleVisible())
-        axis->setLabel(item->title());
-    else
-        axis->setLabel(QString());
+    axis->setLabel(item->title());
 }
 
 void SpecularPlot::setDataFromItem(SpecularDataItem* item)