Skip to content
Snippets Groups Projects
Commit 954da9e9 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename -> DataItem::p_field

parent 1cca0ee3
No related branches found
No related tags found
1 merge request!1578SimResult, Datafield: further clarifications
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
const QString TYPE{"uninitialized"}; const QString TYPE{"uninitialized"};
// Returns datafield, owned by this class // 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(); } const Datafield* converted_field() const { return m_datafield.get(); }
//! The given pointer becomes owned by this class!! //! The given pointer becomes owned by this class!!
......
...@@ -87,7 +87,7 @@ void JobItem::setStatus(JobStatus status) ...@@ -87,7 +87,7 @@ void JobItem::setStatus(JobStatus status)
m_status = status; m_status = status;
if (status == JobStatus::Failed) { if (status == JobStatus::Failed) {
if (DataItem* dataItem = simulatedDataItem()) { if (DataItem* dataItem = simulatedDataItem()) {
if (Datafield* df = dataItem->ptr_converted_field()) if (Datafield* df = dataItem->p_field())
df->setAllTo(0.0); df->setAllTo(0.0);
emit dataItem->datafieldChanged(); emit dataItem->datafieldChanged();
} }
...@@ -391,7 +391,7 @@ void JobItem::cropRealData() ...@@ -391,7 +391,7 @@ void JobItem::cropRealData()
GUI::Model::DataItemUtil::createDefaultDetectorMap(intensityItem, *converter); GUI::Model::DataItemUtil::createDefaultDetectorMap(intensityItem, *converter);
iiI->normalDetector()->iterateOverNonMaskedPoints([&](IDetector::const_iterator it) { 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()]; (*cropped_data)[it.roiIndex()] = (*origData)[it.detectorIndex()];
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment