From fbb72f5bafcdb8b610439a3d84eb1b1631a7e20d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 27 Jun 2021 21:38:01 +0200
Subject: [PATCH] GUI::Model::FilenameUtils
---
GUI/Models/InstrumentItems.cpp | 2 +-
GUI/Models/ItemFileNameUtils.cpp | 14 +++++++-------
GUI/Models/ItemFileNameUtils.h | 4 ++--
GUI/Models/JobItem.cpp | 6 +++---
GUI/Models/JobModelFunctions.cpp | 6 +++---
GUI/Models/RealDataItem.cpp | 4 ++--
GUI/mainwindow/ProjectUtils.cpp | 2 +-
Tests/UnitTests/GUI/TestSavingSpecularData.cpp | 4 ++--
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/GUI/Models/InstrumentItems.cpp b/GUI/Models/InstrumentItems.cpp
index abecd4e700f..f0291f07cf2 100644
--- a/GUI/Models/InstrumentItems.cpp
+++ b/GUI/Models/InstrumentItems.cpp
@@ -145,7 +145,7 @@ SpecularInstrumentItem::SpecularInstrumentItem() : InstrumentItem(M_TYPE)
addBeam<SpecularBeamItem>();
initBackgroundGroup();
- beam<SpecularBeamItem>()->updateFileName(ItemFileNameUtils::instrumentDataFileName(*this));
+ beam<SpecularBeamItem>()->updateFileName(GUI::Model::FilenameUtils::instrumentDataFileName(*this));
}
SpecularBeamItem* SpecularInstrumentItem::beamItem() const
diff --git a/GUI/Models/ItemFileNameUtils.cpp b/GUI/Models/ItemFileNameUtils.cpp
index a448071b5dd..5d98663e1fe 100644
--- a/GUI/Models/ItemFileNameUtils.cpp
+++ b/GUI/Models/ItemFileNameUtils.cpp
@@ -31,43 +31,43 @@ QString intensityDataFileName(const QString& itemName, const QString& prefix);
//! Constructs the name of the file with simulated intensities.
-QString ItemFileNameUtils::jobResultsFileName(const JobItem& jobItem)
+QString GUI::Model::FilenameUtils::jobResultsFileName(const JobItem& jobItem)
{
return intensityDataFileName(jobItem.itemName(), jobdata_file_prefix);
}
//! Constructs the name of the file with reference data.
-QString ItemFileNameUtils::jobReferenceFileName(const JobItem& jobItem)
+QString GUI::Model::FilenameUtils::jobReferenceFileName(const JobItem& jobItem)
{
return intensityDataFileName(jobItem.itemName(), refdata_file_prefix);
}
-QString ItemFileNameUtils::jobNativeDataFileName(const JobItem& jobItem)
+QString GUI::Model::FilenameUtils::jobNativeDataFileName(const JobItem& jobItem)
{
return intensityDataFileName(jobItem.getIdentifier(), nativedata_file_prefix);
}
//! Constructs the name of the intensity file belonging to real data item.
-QString ItemFileNameUtils::realDataFileName(const RealDataItem& realDataItem)
+QString GUI::Model::FilenameUtils::realDataFileName(const RealDataItem& realDataItem)
{
return intensityDataFileName(realDataItem.name(), realdata_file_prefix);
}
-QString ItemFileNameUtils::nativeDataFileName(const RealDataItem& realDataItem)
+QString GUI::Model::FilenameUtils::nativeDataFileName(const RealDataItem& realDataItem)
{
return intensityDataFileName(realDataItem.name(), nativedata_file_prefix);
}
-QString ItemFileNameUtils::instrumentDataFileName(const InstrumentItem& instrumentItem)
+QString GUI::Model::FilenameUtils::instrumentDataFileName(const InstrumentItem& instrumentItem)
{
return intensityDataFileName(instrumentItem.id(), instrument_file_prefix);
}
//! Returns list of fileName filters related to nonXML data stored by JobModel and RealDataModel.
-QStringList ItemFileNameUtils::nonXMLFileNameFilters()
+QStringList GUI::Model::FilenameUtils::nonXMLFileNameFilters()
{
QStringList result = QStringList() << QString(jobdata_file_prefix + "_*.int.gz")
<< QString(refdata_file_prefix + "_*.int.gz")
diff --git a/GUI/Models/ItemFileNameUtils.h b/GUI/Models/ItemFileNameUtils.h
index b8df7b6cf32..8db1d5ff0a3 100644
--- a/GUI/Models/ItemFileNameUtils.h
+++ b/GUI/Models/ItemFileNameUtils.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/Models/ItemFileNameUtils.h
-//! @brief Defines auxiliary functions in ItemFileNameUtils namespace.
+//! @brief Defines auxiliary functions in namespace ItemFileNameUtils.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -23,7 +23,7 @@ class RealDataItem;
//! Contains set of convenience methods for JobItem and its children.
-namespace ItemFileNameUtils {
+namespace GUI::Model::FilenameUtils {
QString jobResultsFileName(const JobItem& jobItem);
diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 75914a0113f..0f683a9e4d7 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -357,14 +357,14 @@ void JobItem::setPresentationType(const QString& type)
void JobItem::updateIntensityDataFileName()
{
if (DataItem* item = dataItem())
- item->setFileName(ItemFileNameUtils::jobResultsFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::jobResultsFileName(*this));
if (RealDataItem* realItem = realDataItem()) {
if (DataItem* item = realItem->dataItem())
- item->setFileName(ItemFileNameUtils::jobReferenceFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::jobReferenceFileName(*this));
if (DataItem* item = realItem->nativeData())
- item->setFileName(ItemFileNameUtils::jobNativeDataFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::jobNativeDataFileName(*this));
}
}
diff --git a/GUI/Models/JobModelFunctions.cpp b/GUI/Models/JobModelFunctions.cpp
index d77c46ec8ea..4da3ca054fa 100644
--- a/GUI/Models/JobModelFunctions.cpp
+++ b/GUI/Models/JobModelFunctions.cpp
@@ -110,7 +110,7 @@ void GUI::Model::JobFunctions::setupJobItemInstrument(JobItem* jobItem, const In
return;
// updating filename
- const auto filename = ItemFileNameUtils::instrumentDataFileName(*spec_to);
+ const auto filename = GUI::Model::FilenameUtils::instrumentDataFileName(*spec_to);
spec_to->beamItem()->updateFileName(filename);
// copying axis data
@@ -185,7 +185,7 @@ void GUI::Model::JobFunctions::copyRealDataItem(JobItem* jobItem, const RealData
realDataItemCopy->dataItem()->setOutputData(realDataItem->dataItem()->getOutputData()->clone());
// adapting the name to job name
- realDataItemCopy->dataItem()->setFileName(ItemFileNameUtils::jobReferenceFileName(*jobItem));
+ realDataItemCopy->dataItem()->setFileName(GUI::Model::FilenameUtils::jobReferenceFileName(*jobItem));
// #baimport ++ copy members of realDataItem?
@@ -193,7 +193,7 @@ void GUI::Model::JobFunctions::copyRealDataItem(JobItem* jobItem, const RealData
return;
realDataItemCopy->setNativeOutputData(realDataItem->nativeOutputData()->clone());
- realDataItemCopy->nativeData()->setFileName(ItemFileNameUtils::jobNativeDataFileName(*jobItem));
+ realDataItemCopy->nativeData()->setFileName(GUI::Model::FilenameUtils::jobNativeDataFileName(*jobItem));
}
const JobItem* GUI::Model::JobFunctions::findJobItem(const SessionItem* item)
diff --git a/GUI/Models/RealDataItem.cpp b/GUI/Models/RealDataItem.cpp
index 0ecbf5a598d..ed4cd39dbe0 100644
--- a/GUI/Models/RealDataItem.cpp
+++ b/GUI/Models/RealDataItem.cpp
@@ -425,9 +425,9 @@ void RealDataItem::rotateData()
void RealDataItem::updateNonXMLDataFileNames()
{
if (DataItem* item = dataItem())
- item->setFileName(ItemFileNameUtils::realDataFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::realDataFileName(*this));
if (DataItem* item = nativeData())
- item->setFileName(ItemFileNameUtils::nativeDataFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(*this));
}
RealDataModel* RealDataItem::realDataModel() const
diff --git a/GUI/mainwindow/ProjectUtils.cpp b/GUI/mainwindow/ProjectUtils.cpp
index b44ceee149f..7e45ec1b5f1 100644
--- a/GUI/mainwindow/ProjectUtils.cpp
+++ b/GUI/mainwindow/ProjectUtils.cpp
@@ -81,7 +81,7 @@ QStringList ProjectUtils::nonXMLDataInDir(const QString& dirname)
"directory '"
+ dirname + "'.");
- return dir.entryList(ItemFileNameUtils::nonXMLFileNameFilters());
+ return dir.entryList(GUI::Model::FilenameUtils::nonXMLFileNameFilters());
}
bool ProjectUtils::removeRecursively(const QString& dirname)
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
index 3d7ca585e56..d1e0f474932 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
@@ -265,9 +265,9 @@ TEST_F(TestSavingSpecularData, test_CopyInstrumentToJobItem)
// checking filenames
EXPECT_EQ(pointwise_axis_item->fileName(),
- ItemFileNameUtils::instrumentDataFileName(*instrument));
+ GUI::Model::FilenameUtils::instrumentDataFileName(*instrument));
EXPECT_EQ(job_axis_item->fileName(),
- ItemFileNameUtils::instrumentDataFileName(*job_instrument));
+ GUI::Model::FilenameUtils::instrumentDataFileName(*job_instrument));
// Saving
OutputDataIOService service(&models);
--
GitLab