rm Title from BasicAxisItem

GUI/Model/Axis/AmplitudeAxisItem.cpp

@@ -22,7 +22,6 @@ const QString IsVisible("IsVisible");
 const QString Nbins("Nbins");
 const QString MinDeg("MinDeg");
 const QString MaxDeg("MaxDeg");
-const QString Title("Title");
 const QString BaseData("BaseData");
 const QString LockMinMax("LockMinMax");
 const QString LogScale("LogScale");
@@ -75,11 +74,6 @@ void AmplitudeAxisItem::readFrom(QXmlStreamReader* r)
             XML::readAttribute(r, XML::Attrib::value, &m_lockMinMax);
             XML::gotoEndElementOfTag(r, tag);
 
-            // title
-        } else if (tag == Tag::LogScale) {
-            XML::readAttribute(r, XML::Attrib::value, &m_logScale);
-            XML::gotoEndElementOfTag(r, tag);
-
         } else
             r->skipCurrentElement();
     }

GUI/Model/Axis/BasicAxisItem.cpp

@@ -24,7 +24,6 @@ const QString IsVisible("IsVisible");
 const QString Nbins("Nbins");
 const QString MinDeg("MinDeg");
 const QString MaxDeg("MaxDeg");
-const QString Title("Title");
 const QString BaseData("BaseData");
 const QString LockMinMax("LockMinMax");
 const QString LogScale("LogScale");
@@ -38,7 +37,6 @@ BasicAxisItem::BasicAxisItem(QObject* parent)
     , m_nbins(100)
     , m_min(0)
     , m_max(-1)
-    , m_title("")
 {
 }
 
@@ -77,20 +75,9 @@ void BasicAxisItem::setMax(double value)
     emit axisRangeChanged();
 }
 
-QString BasicAxisItem::title() const
-{
-    return m_title;
-}
-
-void BasicAxisItem::setTitle(const QString& title)
-{
-    m_title = title;
-    emit axisTitleChanged();
-}
-
 std::unique_ptr<Scale> BasicAxisItem::itemToRegularAxis(double scale) const
 {
-    return uniqueEquiDivision(title().toStdString(), binCount(), min() * scale, max() * scale);
+    return uniqueEquiDivision("PLACEHOLDER", binCount(), min() * scale, max() * scale);
 }
 
 std::unique_ptr<Scale> BasicAxisItem::itemToAxis(double scale,
@@ -133,11 +120,6 @@ void BasicAxisItem::writeTo(QXmlStreamWriter* w) const
     w->writeStartElement(Tag::MaxDeg);
     XML::writeAttribute(w, XML::Attrib::value, m_max);
     w->writeEndElement();
-
-    // title
-    w->writeStartElement(Tag::Title);
-    XML::writeAttribute(w, XML::Attrib::value, m_title);
-    w->writeEndElement();
 }
 
 void BasicAxisItem::readFrom(QXmlStreamReader* r)
@@ -168,11 +150,6 @@ void BasicAxisItem::readFrom(QXmlStreamReader* r)
             XML::readAttribute(r, XML::Attrib::value, &m_max);
             XML::gotoEndElementOfTag(r, tag);
 
-            // title
-        } else if (tag == Tag::Title) {
-            XML::readAttribute(r, XML::Attrib::value, &m_title);
-            XML::gotoEndElementOfTag(r, tag);
-
         } else
             r->skipCurrentElement();
     }

GUI/Model/Axis/BasicAxisItem.h

@@ -44,9 +44,6 @@ public:
     double max() const;
     void setMax(double value);
 
-    QString title() const;
-    void setTitle(const QString& title);
-
     bool isVisible() const;
     void setVisible(bool b);
 
@@ -60,7 +57,6 @@ private:
     int m_nbins;
     double m_min; // in display units (if angle, then deg)
     double m_max;
-    QString m_title;
 };
 
 #endif // BORNAGAIN_GUI_MODEL_AXIS_BASICAXISITEM_H

GUI/Model/Beam/GrazingScanItem.cpp

@@ -35,8 +35,6 @@ const QString BaseData("BaseData");
 void setAxisPresentationDefaults(BasicAxisItem* axisItem)
 {
     ASSERT(axisItem);
-    axisItem->setTitle("alpha_i (rad)");
-
     if (!dynamic_cast<PointwiseAxisItem*>(axisItem)) {
         axisItem->setMin(0.0);
         axisItem->setMax(3.0);

GUI/Model/Beam/SourceItems.cpp

@@ -299,7 +299,6 @@ void ScanItem::setScan(const IBeamScan* scan)
     axis_item->setBinCount(static_cast<int>(axis->size()));
     axis_item->setMin(axis->min() / Units::deg);
     axis_item->setMax(axis->max() / Units::deg);
-    axis_item->setTitle(QString::fromStdString(axis->axisName()));
 
     setFootprint(scan->footprint());
 }

GUI/Model/Device/InstrumentItems.cpp

@@ -418,8 +418,8 @@ std::unique_ptr<const Frame> SpecularInstrumentItem::makeFrame() const
         return std::make_unique<Frame>(std::move(f));
     }
 
-    Scale axis = EquiDivision(axis_item->title().toStdString(), axis_item->binCount(),
-                              axis_item->min(), axis_item->max());
+    Scale axis =
+        EquiDivision("PLACEHOLDER2", axis_item->binCount(), axis_item->min(), axis_item->max());
 
     std::vector<const Scale*> f{axis.clone()};
     return std::make_unique<Frame>(std::move(f));

GUI/View/PlotSpecular/SpecularPlot.cpp

@@ -235,17 +235,11 @@ void SpecularPlot::setAxesLabels()
 {
     if (!currentSpecularDataItem())
         return;
-    setLabel(currentSpecularDataItem()->xAxisItem(), m_custom_plot->xAxis);
-    setLabel(currentSpecularDataItem()->yAxisItem(), m_custom_plot->yAxis);
+    m_custom_plot->xAxis->setLabel(currentSpecularDataItem()->XaxisTitle());
+    m_custom_plot->yAxis->setLabel("Reflectivity");
     replot();
 }
 
-void SpecularPlot::setLabel(const BasicAxisItem* item, QCPAxis* axis)
-{
-    ASSERT(item && axis);
-    axis->setLabel(item->title());
-}
-
 void SpecularPlot::setDataFromItem(SpecularDataItem* item)
 {
     ASSERT(item && m_graph_map.contains(item));

GUI/View/PlotSpecular/SpecularPlot.h

@@ -85,9 +85,6 @@ private:
     //! Sets X,Y axes labels from the first item
     void setAxesLabels();
 
-    //! Sets label to axis
-    void setLabel(const BasicAxisItem* item, QCPAxis* axis);
-
     //! Sets the data values to SpecularPlot.
     void setDataFromItem(SpecularDataItem* item);