diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp index 7c3caad97b983ab573a5b2906738f6925a55be78..8b5cf51af85f94423f9924bac8dea5fa78ff9c98 100644 --- a/GUI/Model/Data/DataItem.cpp +++ b/GUI/Model/Data/DataItem.cpp @@ -46,8 +46,6 @@ DataItem::DataItem(const QString& modelType) , m_last_modified(QDateTime::currentDateTime()) , m_last_saved(m_last_modified.addSecs(-2023)) { - setXaxisTitle(x_axis_default_name); - setYaxisTitle(y_axis_default_name); } DataItem::~DataItem() = default; @@ -255,16 +253,6 @@ QString DataItem::YaxisTitle() const return m_datafield ? QString::fromStdString(m_datafield->yAxis().axisName()) : ""; } -void DataItem::setXaxisTitle(const QString& title) -{ - xAxisItem()->setTitle(title); -} - -void DataItem::setYaxisTitle(const QString& title) -{ - yAxisItem()->setTitle(title); -} - void DataItem::setAxesRangeToData() { setLowerX(xMin()); diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h index de15f8aad06516f5afe87bdd494b8be0f1c68d13..b4c2a231961e227612ef7bef778e88acf6332496 100644 --- a/GUI/Model/Data/DataItem.h +++ b/GUI/Model/Data/DataItem.h @@ -99,8 +99,6 @@ public: // Axes titles QString XaxisTitle() const; QString YaxisTitle() const; - void setXaxisTitle(const QString& title); - void setYaxisTitle(const QString& title); //! Sets zoom range of x,y axes to axes of input data void setAxesRangeToData(); diff --git a/GUI/Model/Data/DataItemUtil.cpp b/GUI/Model/Data/DataItemUtil.cpp index 889dfb678f1a91926f0aee839ff3d50be527ee9f..9e9e8cdf49a17e9fdca7179362f3eec650eeaa66 100644 --- a/GUI/Model/Data/DataItemUtil.cpp +++ b/GUI/Model/Data/DataItemUtil.cpp @@ -19,24 +19,12 @@ #include "Device/Data/Datafield.h" #include "GUI/Model/Data/DataItem.h" -void GUI::Model::DataItemUtil::updateAxesTitle(DataItem* intensityItem, const Frame& frame) -{ - intensityItem->setXaxisTitle(QString::fromStdString(frame.axis(0).axisName())); - if (frame.rank() > 1) - intensityItem->setYaxisTitle(QString::fromStdString(frame.axis(1).axisName())); -} - void GUI::Model::DataItemUtil::createDefaultDetectorMap(DataItem* dataItem, const Frame& frame) { dataItem->setDatafield({frame.clonedAxes()}); - updateAxesTitle(dataItem, frame); } void GUI::Model::DataItemUtil::setResults(DataItem* dataItem, const Datafield& result) { - if (dataItem->c_field() == nullptr) { - const auto& frame = result.frame(); - updateAxesTitle(dataItem, frame); - } dataItem->setDatafield({result.frame().clonedAxes(), result.flatVector()}); } diff --git a/GUI/Model/Data/DataItemUtil.h b/GUI/Model/Data/DataItemUtil.h index f9d0c27a6b948b7c1e9b4c0164cc566fb3274c49..f6abe3b9b97d2b6ae4af6c8429004468b9bfe16f 100644 --- a/GUI/Model/Data/DataItemUtil.h +++ b/GUI/Model/Data/DataItemUtil.h @@ -27,9 +27,6 @@ class Datafield; namespace GUI::Model::DataItemUtil { -//! Updates axes' titles -void updateAxesTitle(DataItem* intensityItem, const Frame& frame); - //! Creates zero-value intensity map with given coordinate system void createDefaultDetectorMap(DataItem* dataItem, const Frame& frame); diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp index 744a96cd7ab0f8cfbdaa91da19ca2168f53209c6..6b80d92ac1d688b1e81a503147952632352e990d 100644 --- a/GUI/Model/Data/IntensityDataItem.cpp +++ b/GUI/Model/Data/IntensityDataItem.cpp @@ -77,7 +77,6 @@ void IntensityDataItem::setDatafield(const Datafield& data) ASSERT(data.rank() == 2); DataItem::setDatafield(data); updateAxesZoomLevel(); - updateAxesLabels(); updateDataRange(); } @@ -227,17 +226,6 @@ void IntensityDataItem::updateAxesZoomLevel() yAxisItem()->setBinCount(ny); } -//! Init axes labels, if it was not done already. - -void IntensityDataItem::updateAxesLabels() -{ - if (XaxisTitle().isEmpty()) - setXaxisTitle(QString::fromStdString(m_datafield->axis(0).axisName())); - - if (YaxisTitle().isEmpty()) - setYaxisTitle(QString::fromStdString(m_datafield->axis(1).axisName())); -} - //! Sets min,max values for z-axis, if axes is not locked, and ranges are not yet set. void IntensityDataItem::updateDataRange() diff --git a/GUI/Model/Data/IntensityDataItem.h b/GUI/Model/Data/IntensityDataItem.h index 3f568392265a893436370e85331ca3c538e0bc61..9b9101bf21c18f765bcad16ced4660487f39954a 100644 --- a/GUI/Model/Data/IntensityDataItem.h +++ b/GUI/Model/Data/IntensityDataItem.h @@ -111,7 +111,6 @@ signals: private: void updateAxesZoomLevel(); - void updateAxesLabels(); bool m_isInterpolated; ComboProperty m_gradient; diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp index b700c5f6a81393edf92d91dd3e4ce0b35e7cbed5..f4f67762f515c707cac2cda40f79957d69227090 100644 --- a/GUI/Model/Data/SpecularDataItem.cpp +++ b/GUI/Model/Data/SpecularDataItem.cpp @@ -62,7 +62,6 @@ SpecularDataItem::SpecularDataItem() , m_scatterType(scatter_map.key(QCPScatterStyle::ScatterShape::ssNone)) , m_scatterSize(5.0) { - setYaxisTitle("Signal [a.u]"); setSimuPlotStyle(); } @@ -174,8 +173,6 @@ void SpecularDataItem::setDiffPlotStyle() setScatter(QCPScatterStyle::ScatterShape::ssNone); setColor(Qt::GlobalColor::black); setLineStyle(QCPGraph::LineStyle::lsLine); - - setYaxisTitle("Relative difference"); } void SpecularDataItem::setRealPlotStyle() diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp index c8496542cb2741b3f656927d5fe3de6565792a62..9f7e614cb8b0a4cf14fff1b3d83a34a20a7c1461 100644 --- a/GUI/Model/Job/JobItem.cpp +++ b/GUI/Model/Job/JobItem.cpp @@ -314,11 +314,6 @@ DataItem* JobItem::createDiffDataItem() ASSERT(m_realItem); // TODO - // update axes labels - const auto frame = instrumentItem()->makeFrame(); - ASSERT(frame); - GUI::Model::DataItemUtil::updateAxesTitle(diffDataItem(), *frame); - if (isSpecularJob()) dynamic_cast<SpecularDataItem*>(diffDataItem())->setDiffPlotStyle();