diff --git a/GUI/View/Access/DataAccessWidget.cpp b/GUI/View/Access/DataAccessWidget.cpp index 64a9940cbbd39d944bb34cebcc3a7046b150c76b..0a83064c742a43dfacf1c68022d4929f52d2fdd0 100644 --- a/GUI/View/Access/DataAccessWidget.cpp +++ b/GUI/View/Access/DataAccessWidget.cpp @@ -28,7 +28,7 @@ DataAccessWidget::~DataAccessWidget() = default; void DataAccessWidget::setBaseItem(QObject* item) { m_item = item; - ASSERT(jobItem() || realxItem()); + ASSERT(jobxItem() || realxItem()); disconnect(m_item, &QObject::destroyed, this, nullptr); connect(m_item, &QObject::destroyed, [this] { m_item = nullptr; }); @@ -39,7 +39,7 @@ QList<QAction*> DataAccessWidget::actionList() return {}; } -JobItem* DataAccessWidget::jobItem() const +JobItem* DataAccessWidget::jobxItem() const { return dynamic_cast<JobItem*>(m_item); } @@ -50,8 +50,8 @@ DatafileItem* DataAccessWidget::realxItem() const } Data1DItem* DataAccessWidget::realData1DItem() const { - if (jobItem()) { - if (const DatafileItem* ii = jobItem()->realItem()) + if (jobxItem()) { + if (const DatafileItem* ii = jobxItem()->realItem()) return dynamic_cast<Data1DItem*>(ii->dataItem()); return nullptr; } @@ -62,8 +62,8 @@ Data1DItem* DataAccessWidget::realData1DItem() const Data2DItem* DataAccessWidget::realData2DItem() const { - if (jobItem()) { - if (const DatafileItem* ii = jobItem()->realItem()) + if (jobxItem()) { + if (const DatafileItem* ii = jobxItem()->realItem()) return dynamic_cast<Data2DItem*>(ii->dataItem()); return nullptr; } @@ -74,22 +74,22 @@ Data2DItem* DataAccessWidget::realData2DItem() const Data1DItem* DataAccessWidget::simuData1DItem() const { - return jobItem() ? dynamic_cast<Data1DItem*>(jobItem()->simulatedDataItem()) : nullptr; + return jobxItem() ? dynamic_cast<Data1DItem*>(jobxItem()->simulatedDataItem()) : nullptr; } Data2DItem* DataAccessWidget::simuData2DItem() const { - return jobItem() ? dynamic_cast<Data2DItem*>(jobItem()->simulatedDataItem()) : nullptr; + return jobxItem() ? dynamic_cast<Data2DItem*>(jobxItem()->simulatedDataItem()) : nullptr; } Data1DItem* DataAccessWidget::diffData1DItem() const { - return jobItem() ? dynamic_cast<Data1DItem*>(jobItem()->diffDataItem()) : nullptr; + return jobxItem() ? dynamic_cast<Data1DItem*>(jobxItem()->diffDataItem()) : nullptr; } Data2DItem* DataAccessWidget::diffData2DItem() const { - return jobItem() ? dynamic_cast<Data2DItem*>(jobItem()->diffDataItem()) : nullptr; + return jobxItem() ? dynamic_cast<Data2DItem*>(jobxItem()->diffDataItem()) : nullptr; } QList<Data1DItem*> DataAccessWidget::mainData1DItems() const diff --git a/GUI/View/Access/DataAccessWidget.h b/GUI/View/Access/DataAccessWidget.h index d65d24da36eb7a260327ce1b0fb73831e76b14d4..6fd1f98ab4084edf12b7679f4b69b79d7391a50e 100644 --- a/GUI/View/Access/DataAccessWidget.h +++ b/GUI/View/Access/DataAccessWidget.h @@ -37,7 +37,7 @@ public: virtual QList<QAction*> actionList(); - JobItem* jobItem() const; + JobItem* jobxItem() const; QObject* jobRealBase() const { return m_item; } //... Access to concrete items: diff --git a/GUI/View/Access/DataPropertyWidget.cpp b/GUI/View/Access/DataPropertyWidget.cpp index 31dc62b54d1d3b5c9a06bc84cf463f5325892d56..1df4df29448e918ff07eca2d563955e2142af4e1 100644 --- a/GUI/View/Access/DataPropertyWidget.cpp +++ b/GUI/View/Access/DataPropertyWidget.cpp @@ -59,8 +59,8 @@ void DataPropertyWidget::updateUIValues() InstrumentItem* DataPropertyWidget::instrumentItem() { - if (jobItem()) - return jobItem()->instrumentItem(); + if (jobxItem()) + return jobxItem()->instrumentItem(); else if (realxItem()) { ASSERT(gDoc); return gDoc->instrumentModel()->findInstrumentItemById(realxItem()->instrumentId()); diff --git a/GUI/View/Frame/Fit2DFrame.cpp b/GUI/View/Frame/Fit2DFrame.cpp index 21e40dbab87c0a1d5cd3cb4e037408d9e6bd905b..47e2d0e878945a10f6cf53513020feaf0f12ef5b 100644 --- a/GUI/View/Frame/Fit2DFrame.cpp +++ b/GUI/View/Frame/Fit2DFrame.cpp @@ -80,7 +80,6 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item) ASSERT(job_item); setBaseItem(job_item); - ASSERT(jobItem()); GUI::View::RangeUtil::setCommonRangeZ(mainData2DItems()); updateDiffData();