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

uniform local var name

parent ba2c21dc
No related branches found
No related tags found
1 merge request!2151some classes no longer inherit from DataAccessWidget (#838)
Pipeline #120561 passed
...@@ -289,17 +289,17 @@ void DatafilesSelector::importData1D() ...@@ -289,17 +289,17 @@ void DatafilesSelector::importData1D()
} }
try { try {
std::unique_ptr<Datafield> data(IO::readData1D(fname.toStdString(), ftype, settings)); std::unique_ptr<Datafield> df(IO::readData1D(fname.toStdString(), ftype, settings));
if (!data) if (!df)
continue; continue;
realItem = m_treeModel->injectDataItem(1); realItem = m_treeModel->injectDataItem(1);
realItem->setDatafileItemName(QFileInfo(fname).baseName()); realItem->setDatafileItemName(QFileInfo(fname).baseName());
ASSERT(data->rank() == 1); ASSERT(df->rank() == 1);
realItem->setTheDatafield(*data); realItem->setTheDatafield(*df);
setCurrentItem(realItem); setCurrentItem(realItem);
realItem->initNativeData(); realItem->initNativeData();
realItem->nativeDataItem()->setDatafield(*data); realItem->nativeDataItem()->setDatafield(*df);
realItem->updateFileName(); realItem->updateFileName();
} catch (std::exception& ex) { } catch (std::exception& ex) {
m_treeModel->removeDataItem(realItem); m_treeModel->removeDataItem(realItem);
......
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