diff --git a/GUI/Model/Axis/AmplitudeAxisItem.cpp b/GUI/Model/Axis/AmplitudeAxisItem.cpp index 5300726c8b935c6f4790e694f4dfa7fa3dba7e25..d4394bf5682271debbf2b70ed4b5727c3d3b8f20 100644 --- a/GUI/Model/Axis/AmplitudeAxisItem.cpp +++ b/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(); } diff --git a/GUI/Model/Axis/BasicAxisItem.cpp b/GUI/Model/Axis/BasicAxisItem.cpp index cca175ea326960823c0ec33af91f6e424b7c9b8b..7fe055fcb6700e6dcdfd8f8ea16a4a3fbeffe3c3 100644 --- a/GUI/Model/Axis/BasicAxisItem.cpp +++ b/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(); } diff --git a/GUI/Model/Axis/BasicAxisItem.h b/GUI/Model/Axis/BasicAxisItem.h index dc1b294bc9bd9044b05e4c3aaee105b7d394a64d..9a1b706bf425e4aa3ee6441492309c365ca3259b 100644 --- a/GUI/Model/Axis/BasicAxisItem.h +++ b/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 diff --git a/GUI/Model/Beam/GrazingScanItem.cpp b/GUI/Model/Beam/GrazingScanItem.cpp index d69801b4a3ddd7e61863340f075eeaf45cdd1c54..be38e536f5713140be19b17ff6650ed55e7b3387 100644 --- a/GUI/Model/Beam/GrazingScanItem.cpp +++ b/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); diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp index 71a8cfbff40036a535ac8d5c5edc654188c077ac..11461d747f73e965ce96f73db7c63e41db7e59a6 100644 --- a/GUI/Model/Beam/SourceItems.cpp +++ b/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()); } diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp index b02207acee9a004aeb71fac7af7657daa92d052a..c54729c95406eb24cdb9b2bf98ad6b771842fefa 100644 --- a/GUI/Model/Device/InstrumentItems.cpp +++ b/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)); diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp index a1603d6264c07a3d24069efb92f93687c27cd093..310f43d9c58a02284776f34d26b50876bd5702a9 100644 --- a/GUI/View/PlotSpecular/SpecularPlot.cpp +++ b/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)); diff --git a/GUI/View/PlotSpecular/SpecularPlot.h b/GUI/View/PlotSpecular/SpecularPlot.h index f54e615819d2a2a24fedb30a7c232abb0d623204..30a3cfe38f9a0c4443da36fb1b53a62149a5db04 100644 --- a/GUI/View/PlotSpecular/SpecularPlot.h +++ b/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);