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

ItemFileNameUtils: pass name, not item

parent 8f442aa8
No related branches found
No related tags found
1 merge request!427Reduce include dependences in GUI; break cyclic dependence between View and Model
......@@ -427,9 +427,9 @@ void RealDataItem::rotateData()
void RealDataItem::updateNonXMLDataFileNames()
{
if (DataItem* item = dataItem())
item->setFileName(GUI::Model::FilenameUtils::realDataFileName(*this));
item->setFileName(GUI::Model::FilenameUtils::realDataFileName(dataName()));
if (DataItem* item = nativeData())
item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(*this));
item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(dataName()));
}
void RealDataItem::updateToInstrument(const InstrumentItem* instrument)
......
......@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Models/Varia/ItemFileNameUtils.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/utils/Helpers.h"
......@@ -57,14 +56,14 @@ QString GUI::Model::FilenameUtils::jobNativeDataFileName(const JobItem& jobItem)
//! Constructs the name of the intensity file belonging to real data item.
QString GUI::Model::FilenameUtils::realDataFileName(const RealDataItem& realDataItem)
QString GUI::Model::FilenameUtils::realDataFileName(const QString& dataName)
{
return intensityDataFileName(realDataItem.dataName(), realdata_file_prefix);
return intensityDataFileName(dataName, realdata_file_prefix);
}
QString GUI::Model::FilenameUtils::nativeDataFileName(const RealDataItem& realDataItem)
QString GUI::Model::FilenameUtils::nativeDataFileName(const QString& dataName)
{
return intensityDataFileName(realDataItem.dataName(), nativedata_file_prefix);
return intensityDataFileName(dataName, nativedata_file_prefix);
}
QString GUI::Model::FilenameUtils::instrumentDataFileName(const InstrumentItem& instrumentItem)
......
......@@ -31,9 +31,9 @@ QString jobReferenceFileName(const JobItem& jobItem);
QString jobNativeDataFileName(const JobItem& jobItem);
QString realDataFileName(const RealDataItem& realDataItem);
QString realDataFileName(const QString& dataName);
QString nativeDataFileName(const RealDataItem& realDataItem);
QString nativeDataFileName(const QString& dataName);
QString instrumentDataFileName(const InstrumentItem& instrumentItem);
......
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