From 4b0699c3d9b37f8cd7ade1665fcf14abc861e716 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Tue, 23 Jan 2024 20:01:20 +0100
Subject: [PATCH] std name m_dfile_item
---
GUI/Model/Device/MultiInstrumentNotifier.cpp | 4 +-
GUI/Model/Device/MultiInstrumentNotifier.h | 2 +-
GUI/Model/Files/DatafilesSet.cpp | 54 ++++++++++----------
GUI/Model/Files/DatafilesSet.h | 2 +-
GUI/Model/Job/JobItem.cpp | 44 ++++++++--------
GUI/Model/Job/JobItem.h | 6 +--
GUI/Model/Project/LinkInstrumentManager.cpp | 30 +++++------
GUI/Model/Project/LinkInstrumentManager.h | 4 +-
GUI/Model/Tune/JobsSet.cpp | 7 +--
GUI/View/Data/DatafileEditor.cpp | 4 +-
GUI/View/Data/DatafileEditor.h | 6 +--
GUI/View/Data/DatafilesSelector.cpp | 22 ++++----
GUI/View/FitControl/FitObjectiveBuilder.cpp | 6 +--
Tests/Unit/GUI/TestJobModel.cpp | 6 +--
Tests/Unit/GUI/TestLinkInstrument.cpp | 6 +--
15 files changed, 102 insertions(+), 101 deletions(-)
diff --git a/GUI/Model/Device/MultiInstrumentNotifier.cpp b/GUI/Model/Device/MultiInstrumentNotifier.cpp
index 42b7569dfa0..db1cea88bb3 100644
--- a/GUI/Model/Device/MultiInstrumentNotifier.cpp
+++ b/GUI/Model/Device/MultiInstrumentNotifier.cpp
@@ -44,9 +44,9 @@ void MultiInstrumentNotifier::setInstrumentName(InstrumentItem* instrument, cons
}
void MultiInstrumentNotifier::updateInstrumentToRealDataItem(InstrumentItem* instrument,
- const DatafileItem* realItem)
+ const DatafileItem* dfile_item)
{
- instrument->updateToRealData(realItem);
+ instrument->updateToRealData(dfile_item);
emit instrumentChanged(instrument);
}
diff --git a/GUI/Model/Device/MultiInstrumentNotifier.h b/GUI/Model/Device/MultiInstrumentNotifier.h
index 1a126572f80..c3018246e68 100644
--- a/GUI/Model/Device/MultiInstrumentNotifier.h
+++ b/GUI/Model/Device/MultiInstrumentNotifier.h
@@ -58,7 +58,7 @@ public:
void setInstrumentName(InstrumentItem* instrument, const QString& name);
//! Calls the instrument's updateToRealData and emits the respective signal.
- void updateInstrumentToRealDataItem(InstrumentItem* instrument, const DatafileItem* realItem);
+ void updateInstrumentToRealDataItem(InstrumentItem* instrument, const DatafileItem* dfile_item);
//! Simply emits the instrumentChanged signal. Call this whenever you change an instrument's
//! data without using this edit controller. By calling this method, the listeners will be
diff --git a/GUI/Model/Files/DatafilesSet.cpp b/GUI/Model/Files/DatafilesSet.cpp
index 83be1c3a32e..414b45e70f1 100644
--- a/GUI/Model/Files/DatafilesSet.cpp
+++ b/GUI/Model/Files/DatafilesSet.cpp
@@ -39,8 +39,8 @@ DatafilesSet::~DatafilesSet() = default;
QVector<DataItem*> DatafilesSet::dataItems() const
{
QVector<DataItem*> result;
- for (auto* realData : realItems())
- if (auto* data_item = realData->dataItem())
+ for (auto* dfile_item : realItems())
+ if (auto* data_item = dfile_item->dataItem())
result.push_back(data_item);
return result;
@@ -48,8 +48,8 @@ QVector<DataItem*> DatafilesSet::dataItems() const
void DatafilesSet::clear()
{
- for (auto* realItem : realItems())
- removeDatafileItem(realItem);
+ for (auto* dfile_item : realItems())
+ removeDatafileItem(dfile_item);
}
void DatafilesSet::writeTo(QXmlStreamWriter* w) const
@@ -57,10 +57,10 @@ void DatafilesSet::writeTo(QXmlStreamWriter* w) const
XML::writeAttribute(w, XML::Attrib::version, uint(1));
// real items
- for (auto* realItem : realItems()) {
+ for (auto* dfile_item : realItems()) {
w->writeStartElement(Tag::RealData);
- XML::writeAttribute(w, XML::Attrib::name, realItem->realItemName());
- realItem->writeTo(w);
+ XML::writeAttribute(w, XML::Attrib::name, dfile_item->realItemName());
+ dfile_item->writeTo(w);
w->writeEndElement();
}
@@ -89,7 +89,7 @@ void DatafilesSet::readFrom(QXmlStreamReader* r)
if (tag == Tag::RealData) {
auto* item = new DatafileItem;
item->readFrom(r);
- m_real_items.emplace_back(item);
+ m_dfile_items.emplace_back(item);
XML::gotoEndElementOfTag(r, tag);
// selected index
@@ -112,16 +112,16 @@ void DatafilesSet::readFrom(QXmlStreamReader* r)
void DatafilesSet::writeDatafiles(const QString& projectDir)
{
- for (const auto* realItem : realItems())
- realItem->writeDatafiles(projectDir);
+ for (const auto* dfile_item : realItems())
+ dfile_item->writeDatafiles(projectDir);
dataFilesCleaner.cleanOldFiles(projectDir, dataItems());
}
void DatafilesSet::readDatafiles(const QString& projectDir, MessageService* messageService)
{
- for (auto* realItem : realItems())
- realItem->readDatafiles(projectDir, messageService);
+ for (auto* dfile_item : realItems())
+ dfile_item->readDatafiles(projectDir, messageService);
dataFilesCleaner.recollectDataNames(dataItems());
}
@@ -129,15 +129,15 @@ void DatafilesSet::readDatafiles(const QString& projectDir, MessageService* mess
DatafileItem* DatafilesSet::insertDataItem(const QString& fname, const Datafield& df)
{
auto* r = new DatafileItem(QFileInfo(fname).baseName(), df);
- m_real_items.emplace_back(r);
+ m_dfile_items.emplace_back(r);
return r;
}
QVector<DatafileItem*> DatafilesSet::realItems() const
{
- QVector<DatafileItem*> items(m_real_items.size());
+ QVector<DatafileItem*> items(m_dfile_items.size());
for (int i = 0; i < items.size(); i++)
- items[i] = m_real_items[i].get();
+ items[i] = m_dfile_items[i].get();
return items;
}
@@ -151,9 +151,9 @@ QVector<DatafileItem*> DatafilesSet::realItems1D() const
{
QVector<DatafileItem*> vec_1d;
- for (auto* item : realItems())
- if (item->rank() == 1)
- vec_1d.push_back(item);
+ for (DatafileItem* dfile_item : realItems())
+ if (dfile_item->rank() == 1)
+ vec_1d.push_back(dfile_item);
return vec_1d;
}
@@ -162,24 +162,24 @@ QVector<DatafileItem*> DatafilesSet::realItems2D() const
{
QVector<DatafileItem*> vec_2d;
- for (auto* item : realItems())
- if (item->rank() == 2)
- vec_2d.push_back(item);
+ for (DatafileItem* dfile_item : realItems())
+ if (dfile_item->rank() == 2)
+ vec_2d.push_back(dfile_item);
return vec_2d;
}
-void DatafilesSet::removeDatafileItem(DatafileItem* realItem)
+void DatafilesSet::removeDatafileItem(DatafileItem* dfile_item)
{
- ASSERT(realItem);
- int index = realItems().indexOf(realItem);
- m_real_items.erase(m_real_items.begin() + index);
+ ASSERT(dfile_item);
+ int index = realItems().indexOf(dfile_item);
+ m_dfile_items.erase(m_dfile_items.begin() + index);
}
QStringList DatafilesSet::realItemNames() const
{
QStringList result;
- for (auto* item : realItems())
- result.append(item->realItemName());
+ for (DatafileItem* dfile_item : realItems())
+ result.append(dfile_item->realItemName());
return result;
}
diff --git a/GUI/Model/Files/DatafilesSet.h b/GUI/Model/Files/DatafilesSet.h
index 66b19b0ddce..86f27f42608 100644
--- a/GUI/Model/Files/DatafilesSet.h
+++ b/GUI/Model/Files/DatafilesSet.h
@@ -60,7 +60,7 @@ public:
private:
DatafilesCleaner dataFilesCleaner;
- std::vector<std::unique_ptr<DatafileItem>> m_real_items;
+ std::vector<std::unique_ptr<DatafileItem>> m_dfile_items;
int m_selected_index = -1;
int m_selected_rank = -1;
};
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 655ae31d08f..d2b98f33cc5 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -142,9 +142,9 @@ const DataItem* JobItem::createDiffDataItem()
ASSERT(!diffDataItem());
m_diff_data_item.reset(::newDataItem(rank()));
- ASSERT(m_real_item);
+ ASSERT(m_dfile_item);
// use the same axes as simulated item (same as external data item if loading pre-22.0 project)
- const DataItem* source = m_simulated_data_item ? simulatedDataItem() : m_real_item->dataItem();
+ const DataItem* source = m_simulated_data_item ? simulatedDataItem() : m_dfile_item->dataItem();
GUI::Util::copyContents(source->axItemX(), m_diff_data_item->axItemX());
if (rank() == 2)
GUI::Util::copyContents(source->axItemY(), m_diff_data_item->axItemY());
@@ -153,7 +153,7 @@ const DataItem* JobItem::createDiffDataItem()
spec_diff->setDiffPlotStyle();
if (auto* intensity_diff = dynamic_cast<Data2DItem*>(diffDataItem()))
- intensity_diff->setCurrentGradient(m_real_item->data2DItem()->currentGradient());
+ intensity_diff->setCurrentGradient(m_dfile_item->data2DItem()->currentGradient());
return m_diff_data_item.get();
}
@@ -162,28 +162,28 @@ void JobItem::copyDatafileItemIntoJob(const DatafileItem* source)
{
ASSERT(!realItem());
ASSERT(source->rank() == rank());
- m_real_item.reset(source->clone());
+ m_dfile_item.reset(source->clone());
if (rank() == 1) {
- m_real_item->data1DItem()->setRealPlotStyle();
+ m_dfile_item->data1DItem()->setRealPlotStyle();
} else if (rank() == 2) {
// use color scheme from loaded data
ASSERT(data2DItem());
- data2DItem()->setCurrentGradient(m_real_item->data2DItem()->currentGradient());
+ data2DItem()->setCurrentGradient(m_dfile_item->data2DItem()->currentGradient());
}
}
void JobItem::adjustReaDataToJobInstrument()
{
// update stored instrument id without updating rest of real data
- m_real_item->setInstrumentId(instrumentItem()->id());
+ m_dfile_item->setInstrumentId(instrumentItem()->id());
if (instrumentItem()->is<SpecularInstrumentItem>()) {
// coords of loaded data --> instrumental --> representation coords
- const Datafield* old = m_real_item->data1DItem()->c_field();
+ const Datafield* old = m_dfile_item->data1DItem()->c_field();
Frame frame = instrumentItem()->makeFrame();
- m_real_item->data1DItem()->setDatafield(
+ m_dfile_item->data1DItem()->setDatafield(
{frame.clone(), old->flatVector(), old->errorSigmas()});
} else if (instrumentItem()->is<GISASInstrumentItem>()) {
@@ -208,14 +208,14 @@ void JobItem::importMasksFromDatafileItem()
void JobItem::convertMaskCoords()
{
- const Datafield* dfield = m_real_item->data2DItem()->c_field();
+ const Datafield* dfield = m_dfile_item->data2DItem()->c_field();
ASSERT(dfield);
MaskUnitsConverter mask_converter(dfield->frame());
// Masks conversion can be done in two steps: first from original coords to bins,
// then from bins to target coords.
// If 'IDetector::addBinMask' is used by detector, only "orig coords --> bins" is needed.
- if (const auto* container = m_real_item->data2DItem()->maskContainerItem())
+ if (const auto* container = m_dfile_item->data2DItem()->maskContainerItem())
for (auto* maskItem : container->modifiableMaskItems())
mask_converter.convertToNbins(maskItem);
}
@@ -287,9 +287,9 @@ void JobItem::writeTo(QXmlStreamWriter* w) const
}
// real item
- if (m_real_item) {
+ if (m_dfile_item) {
w->writeStartElement(Tag::DatafileItem);
- m_real_item->writeTo(w);
+ m_dfile_item->writeTo(w);
w->writeEndElement();
}
@@ -348,9 +348,9 @@ void JobItem::readFrom(QXmlStreamReader* r)
// real item
} else if (tag == Tag::DatafileItem) {
- m_real_item = std::make_unique<DatafileItem>();
- m_real_item->readFrom(r);
- createDiffDataItem()->checkXYranges(m_real_item->dataItem());
+ m_dfile_item = std::make_unique<DatafileItem>();
+ m_dfile_item->readFrom(r);
+ createDiffDataItem()->checkXYranges(m_dfile_item->dataItem());
importMasksFromDatafileItem();
XML::gotoEndElementOfTag(r, tag);
@@ -366,8 +366,8 @@ void JobItem::readFrom(QXmlStreamReader* r)
void JobItem::writeDatafiles(const QString& projectDir) const
{
- if (m_real_item)
- m_real_item->writeDatafiles(projectDir);
+ if (m_dfile_item)
+ m_dfile_item->writeDatafiles(projectDir);
if (m_simulated_data_item)
m_simulated_data_item->saveDatafield(projectDir);
@@ -377,8 +377,8 @@ void JobItem::readDatafiles(const QString& projectDir, MessageService* messageSe
{
QString realError, simError, errorMessage;
- if (m_real_item)
- realError = m_real_item->readDatafiles(projectDir, messageService);
+ if (m_dfile_item)
+ realError = m_dfile_item->readDatafiles(projectDir, messageService);
if (m_simulated_data_item)
simError = m_simulated_data_item->loadDatafield(messageService, projectDir, rank());
@@ -415,7 +415,7 @@ void JobItem::updateFileName()
if (DataItem* item = simulatedDataItem())
item->setFileName(GUI::Path::intensityDataFileName(batchInfo()->jobName(), "jobdata"));
- if (m_real_item)
- if (DataItem* item = m_real_item->dataItem())
+ if (m_dfile_item)
+ if (DataItem* item = m_dfile_item->dataItem())
item->setFileName(GUI::Path::intensityDataFileName(batchInfo()->jobName(), "refdata"));
}
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index a76ca010b32..36a4e4c5411 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -45,7 +45,7 @@ public:
void setFailed();
- bool isValidForFitting() const { return bool(m_real_item); }
+ bool isValidForFitting() const { return bool(m_dfile_item); }
QString activity() const { return m_activity; }
void setActivity(const QString& activity) { m_activity = activity; }
@@ -90,7 +90,7 @@ public:
DataItem* diffDataItem() { return m_diff_data_item.get(); }
void copyDatafileItemIntoJob(const DatafileItem* source);
- const DatafileItem* realItem() const { return m_real_item.get(); }
+ const DatafileItem* realItem() const { return m_dfile_item.get(); }
void adjustReaDataToJobInstrument();
void updateFileName();
@@ -116,7 +116,7 @@ private:
QString m_activity;
std::unique_ptr<DataItem> m_simulated_data_item;
std::unique_ptr<DataItem> m_diff_data_item;
- std::unique_ptr<DatafileItem> m_real_item;
+ std::unique_ptr<DatafileItem> m_dfile_item;
std::unique_ptr<FitSuiteItem> m_fit_suite_item;
};
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index 7ed8bec6e19..74675442c76 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -84,7 +84,7 @@ LinkInstrumentManager::LinkInstrumentManager(ProjectDocument* document)
&LinkInstrumentManager::onInstrumentChanged);
}
-bool LinkInstrumentManager::canLinkDataToInstrument(const DatafileItem* realItem,
+bool LinkInstrumentManager::canLinkDataToInstrument(const DatafileItem* dfile_item,
const QString& identifier, QWidget* parent)
{
auto* instrumentItem = m_document->instrumentModel()->findInstrumentItemById(identifier);
@@ -93,23 +93,23 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const DatafileItem* realItem
if (!instrumentItem)
return true;
- if (instrumentItem->axdims().size() != realItem->axdims().size()) {
+ if (instrumentItem->axdims().size() != dfile_item->axdims().size()) {
::warn(parent, "Cannot link, data is incompatible with the instrument.");
return false;
}
- if (instrumentItem->alignedWith(realItem))
+ if (instrumentItem->alignedWith(dfile_item))
return true;
ASSERT(parent);
QString message =
- realItem->holdsDimensionalData()
+ dfile_item->holdsDimensionalData()
? "Experimental data carries information on the range/points of measurement."
- : printShapeMessage(instrumentItem->axdims(), realItem->axdims());
+ : printShapeMessage(instrumentItem->axdims(), dfile_item->axdims());
if (!QuestionOnInstrumentReshaping(message))
return false;
- m_document->multiNotifier()->updateInstrumentToRealDataItem(instrumentItem, realItem);
+ m_document->multiNotifier()->updateInstrumentToRealDataItem(instrumentItem, dfile_item);
return true;
}
@@ -117,20 +117,20 @@ void LinkInstrumentManager::onInstrumentChanged(const InstrumentItem* instrument
{
// Run through all DatafileItem and refresh linking to match possible change in detector
// axes definition.
- for (auto* realItem : m_document->realModel()->realItems())
- if (realItem->instrumentId() == instrument->id()) {
- if (!instrument->alignedWith(realItem)) {
- realItem->unlinkFromInstrument();
- emit linkToInstrumentChanged(realItem);
+ for (auto* dfile_item : m_document->realModel()->realItems())
+ if (dfile_item->instrumentId() == instrument->id()) {
+ if (!instrument->alignedWith(dfile_item)) {
+ dfile_item->unlinkFromInstrument();
+ emit linkToInstrumentChanged(dfile_item);
} else
- realItem->linkToInstrument(instrument); // link stays same, only data is updated
+ dfile_item->linkToInstrument(instrument); // link stays same, only data is updated
}
}
void LinkInstrumentManager::onInstrumentAddedOrRemoved()
{
// remove links in realItems (in case of a linked instrument was removed)
- for (auto* realItem : m_document->realModel()->realItems())
- if (!m_document->instrumentModel()->instrumentExists(realItem->instrumentId()))
- realItem->unlinkFromInstrument();
+ for (auto* dfile_item : m_document->realModel()->realItems())
+ if (!m_document->instrumentModel()->instrumentExists(dfile_item->instrumentId()))
+ dfile_item->unlinkFromInstrument();
}
diff --git a/GUI/Model/Project/LinkInstrumentManager.h b/GUI/Model/Project/LinkInstrumentManager.h
index b31fbf4abed..9b57ab13f6a 100644
--- a/GUI/Model/Project/LinkInstrumentManager.h
+++ b/GUI/Model/Project/LinkInstrumentManager.h
@@ -38,11 +38,11 @@ public:
//! quiet defines whether a "not possible" message box is shown if link is not possible. Use
//! this e.g. for unit tests. The question for adjusting the instrument is not suppressed by
//! this flag.
- bool canLinkDataToInstrument(const DatafileItem* realItem, const QString& identifier,
+ bool canLinkDataToInstrument(const DatafileItem* dfile_item, const QString& identifier,
QWidget* parent);
signals:
- void linkToInstrumentChanged(const DatafileItem* realItem);
+ void linkToInstrumentChanged(const DatafileItem* dfile_item);
private:
void onInstrumentChanged(const InstrumentItem* instrument);
diff --git a/GUI/Model/Tune/JobsSet.cpp b/GUI/Model/Tune/JobsSet.cpp
index 2f009ffd87d..379edeb26a8 100644
--- a/GUI/Model/Tune/JobsSet.cpp
+++ b/GUI/Model/Tune/JobsSet.cpp
@@ -61,7 +61,8 @@ JobItem* JobsSet::createJobItem()
//! Main method to add a job
JobItem* JobsSet::addJobItem(const SampleItem* sampleItem, const InstrumentItem* instrumentItem,
- const DatafileItem* realItem, const SimulationOptionsItem& optionItem)
+ const DatafileItem* dfile_item,
+ const SimulationOptionsItem& optionItem)
{
ASSERT(sampleItem);
ASSERT(instrumentItem);
@@ -79,8 +80,8 @@ JobItem* JobsSet::addJobItem(const SampleItem* sampleItem, const InstrumentItem*
job_item->copySimulationOptionsIntoJob(optionItem);
job_item->createSimulatedDataItem();
- if (realItem) {
- job_item->copyDatafileItemIntoJob(realItem);
+ if (dfile_item) {
+ job_item->copyDatafileItemIntoJob(dfile_item);
job_item->adjustReaDataToJobInstrument();
job_item->createDiffDataItem();
diff --git a/GUI/View/Data/DatafileEditor.cpp b/GUI/View/Data/DatafileEditor.cpp
index 7e36a530bcc..fc994c42770 100644
--- a/GUI/View/Data/DatafileEditor.cpp
+++ b/GUI/View/Data/DatafileEditor.cpp
@@ -55,9 +55,9 @@ DatafileEditor::DatafileEditor()
&DatafileEditor::updateInstrumentComboIndex);
}
-void DatafileEditor::setDatafileItem(DatafileItem* realItem)
+void DatafileEditor::setDatafileItem(DatafileItem* dfile_item)
{
- m_current_datafile_item = realItem;
+ m_current_datafile_item = dfile_item;
updateInstrumentComboIndex();
setEnabled(m_current_datafile_item != nullptr);
}
diff --git a/GUI/View/Data/DatafileEditor.h b/GUI/View/Data/DatafileEditor.h
index 8851cee9042..97e3a6de368 100644
--- a/GUI/View/Data/DatafileEditor.h
+++ b/GUI/View/Data/DatafileEditor.h
@@ -35,13 +35,13 @@ public:
QSize minimumSizeHint() const override { return {64, 128}; }
//! Set current DatafileItem to display in instrument selector.
- void setDatafileItem(DatafileItem* realItem);
+ void setDatafileItem(DatafileItem* dfile_item);
signals:
- void instrumentUpdated(DatafileItem* realItem);
+ void instrumentUpdated(DatafileItem* dfile_item);
private:
- //! Processes user interaction with instrument selector combo. If there is realItem,
+ //! Processes user interaction with instrument selector combo. If there is dfile_item,
//! it will be linked with selected instrument.
void onInstrumentComboIndexChanged(int index);
diff --git a/GUI/View/Data/DatafilesSelector.cpp b/GUI/View/Data/DatafilesSelector.cpp
index cde462b4ea0..12a2de1f1d3 100644
--- a/GUI/View/Data/DatafilesSelector.cpp
+++ b/GUI/View/Data/DatafilesSelector.cpp
@@ -233,13 +233,13 @@ void DatafilesSelector::onSelectionChanged()
void DatafilesSelector::onContextMenuRequest(const QPoint& point)
{
- auto* realItemAtPoint = m_tree_model->itemForIndex(m_tree_view->indexAt(point));
- updateActionEnabling(realItemAtPoint);
+ auto* dfile_item = m_tree_model->itemForIndex(m_tree_view->indexAt(point));
+ updateActionEnabling(dfile_item);
QMenu menu;
menu.setToolTipsVisible(true);
- if (realItemAtPoint != nullptr) {
+ if (dfile_item != nullptr) {
menu.addAction(m_rename_data_action);
menu.addAction(m_remove_data_action);
menu.addSeparator();
@@ -276,7 +276,7 @@ void DatafilesSelector::importData1D()
const IO::Filetype1D global_ftype = ::filterkey2type(filters1D, selectedFilter);
for (const QString& fname : fnames) {
- DatafileItem* realItem = nullptr;
+ DatafileItem* dfile_item = nullptr;
const ImportSettings1D* settings = nullptr;
IO::Filetype1D ftype = global_ftype;
@@ -296,10 +296,10 @@ void DatafilesSelector::importData1D()
continue;
if (df->rank() != 1)
throw std::runtime_error("File does not contain a 1d data set");
- realItem = m_tree_model->injectDataItem(fname, *df);
- setCurrentDatafileItem(realItem);
+ dfile_item = m_tree_model->injectDataItem(fname, *df);
+ setCurrentDatafileItem(dfile_item);
} catch (std::exception& ex) {
- m_tree_model->removeDataItem(realItem);
+ m_tree_model->removeDataItem(dfile_item);
const QString message = QString("Cannot read file %1:\n\n%2")
.arg(fname)
@@ -343,17 +343,17 @@ void DatafilesSelector::importData2D()
if (ftype == IO::unknown2D)
ftype = IO::filename2type2D(fname.toStdString());
- DatafileItem* realItem = nullptr;
+ DatafileItem* dfile_item = nullptr;
try {
std::unique_ptr<Datafield> df(IO::readData2D(fname.toStdString(), ftype));
if (!df)
continue;
if (df->rank() != 2)
throw std::runtime_error("File does not contain a 2d data set");
- realItem = m_tree_model->injectDataItem(fname, *df);
- setCurrentDatafileItem(realItem);
+ dfile_item = m_tree_model->injectDataItem(fname, *df);
+ setCurrentDatafileItem(dfile_item);
} catch (std::exception& ex) {
- m_tree_model->removeDataItem(realItem);
+ m_tree_model->removeDataItem(dfile_item);
const QString message = QString("Cannot read file %1\n\n%2")
.arg(fname)
diff --git a/GUI/View/FitControl/FitObjectiveBuilder.cpp b/GUI/View/FitControl/FitObjectiveBuilder.cpp
index 72a38f81538..23f707825ac 100644
--- a/GUI/View/FitControl/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitControl/FitObjectiveBuilder.cpp
@@ -76,10 +76,10 @@ std::unique_ptr<FitObjective> FitObjectiveBuilder::createFitObjective() const
return buildSimulation(params);
};
- auto* realItem = m_job_item->realItem();
- ASSERT(realItem);
+ auto* dfile_item = m_job_item->realItem();
+ ASSERT(dfile_item);
- const DataItem* intensity_item = realItem->dataItem();
+ const DataItem* intensity_item = dfile_item->dataItem();
ASSERT(intensity_item);
ASSERT(intensity_item->c_field());
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index b47ef3c70ec..d064628e1c6 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -128,7 +128,7 @@ TEST(TestJobsSet, masksToDetector)
job_item.createSimulatedDataItem();
// create external 2d data
- DatafileItem realItem("foo", UTest::GUI::makeData2D(1.0, nx, -4.5, 2.5, ny, 0., 5.0));
+ DatafileItem dfile_item("foo", UTest::GUI::makeData2D(1.0, nx, -4.5, 2.5, ny, 0., 5.0));
// create mask (M - masked pixel)
// _ _ _ _ _ _ _
@@ -147,11 +147,11 @@ TEST(TestJobsSet, masksToDetector)
mask.setYUp(4.0);
// add mask to DatafileItem
- MasksSet* container = realItem.data2DItem()->getOrCreateMaskModel()->maskContItem();
+ MasksSet* container = dfile_item.data2DItem()->getOrCreateMaskModel()->maskContItem();
container->addMaskItem(&mask);
// add DatafileItem to job
- job_item.copyDatafileItemIntoJob(&realItem);
+ job_item.copyDatafileItemIntoJob(&dfile_item);
// check DatafileItem data before applying mask
const auto* field_before = job_item.realItem()->data2DItem()->c_field();
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 7cc50db7131..a4f1d48ace3 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -22,12 +22,12 @@ QList<DatafileItem*> linkedRealDataItems(DatafilesSet& realModel,
ASSERT(instrumentItem);
QList<DatafileItem*> result;
- for (auto* realItem : realModel.realItems()) {
- const QString linkedIdentifier = realItem->instrumentId();
+ for (auto* dfile_item : realModel.realItems()) {
+ const QString linkedIdentifier = dfile_item->instrumentId();
const QString instrumentIdentifier = instrumentItem->id();
if (linkedIdentifier == instrumentIdentifier)
- result.append(realItem);
+ result.append(dfile_item);
}
return result;
}
--
GitLab