diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h index 37d16e57949188e871f7420c1e7164335f00f0b5..12682f1ce4ee1a649f821eb2795d2bd4922ef258 100644 --- a/GUI/Model/Data/DataItem.h +++ b/GUI/Model/Data/DataItem.h @@ -43,7 +43,7 @@ public: const QString TYPE{"uninitialized"}; // Returns datafield, owned by this class - Datafield* ptr_converted_field() { return m_datafield.get(); } + Datafield* p_field() { return m_datafield.get(); } const Datafield* converted_field() const { return m_datafield.get(); } //! The given pointer becomes owned by this class!! diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp index 52059bf3d99d864c77be81df8140d6f4ac84f1e4..aafa69c06b5e4fda09168235f8f5bc82483b0f4d 100644 --- a/GUI/Model/Job/JobItem.cpp +++ b/GUI/Model/Job/JobItem.cpp @@ -87,7 +87,7 @@ void JobItem::setStatus(JobStatus status) m_status = status; if (status == JobStatus::Failed) { if (DataItem* dataItem = simulatedDataItem()) { - if (Datafield* df = dataItem->ptr_converted_field()) + if (Datafield* df = dataItem->p_field()) df->setAllTo(0.0); emit dataItem->datafieldChanged(); } @@ -391,7 +391,7 @@ void JobItem::cropRealData() GUI::Model::DataItemUtil::createDefaultDetectorMap(intensityItem, *converter); iiI->normalDetector()->iterateOverNonMaskedPoints([&](IDetector::const_iterator it) { - Datafield* cropped_data = intensityItem->ptr_converted_field(); + Datafield* cropped_data = intensityItem->p_field(); (*cropped_data)[it.roiIndex()] = (*origData)[it.detectorIndex()]; });