From 954da9e9a6b31403185b6bfa50c5f89b23dd9536 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 11 Apr 2023 15:01:51 +0200
Subject: [PATCH] rename -> DataItem::p_field
---
GUI/Model/Data/DataItem.h | 2 +-
GUI/Model/Job/JobItem.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index 37d16e57949..12682f1ce4e 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 52059bf3d99..aafa69c06b5 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()];
});
--
GitLab