From e084a2e1f856f51043e57d112da0d8d06f205738 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 7 Apr 2023 18:51:59 +0200
Subject: [PATCH] rename -> DataItemUtil
---
.../Data/{JobItemUtil.cpp => DataItemUtil.cpp} | 18 +++++++++---------
.../Data/{JobItemUtil.h => DataItemUtil.h} | 14 +++++++-------
GUI/Model/Data/IntensityDataItem.cpp | 4 ++--
GUI/Model/Data/RealItem.cpp | 8 ++++----
GUI/Model/Data/SpecularDataItem.cpp | 4 ++--
GUI/Model/Job/JobItem.cpp | 10 +++++-----
Tests/Unit/GUI/TestAutosaveController.cpp | 4 ++--
Tests/Unit/GUI/TestLinkInstrument.cpp | 4 ++--
Tests/Unit/GUI/TestProjectDocument.cpp | 4 ++--
9 files changed, 35 insertions(+), 35 deletions(-)
rename GUI/Model/Data/{JobItemUtil.cpp => DataItemUtil.cpp} (85%)
rename GUI/Model/Data/{JobItemUtil.h => DataItemUtil.h} (80%)
diff --git a/GUI/Model/Data/JobItemUtil.cpp b/GUI/Model/Data/DataItemUtil.cpp
similarity index 85%
rename from GUI/Model/Data/JobItemUtil.cpp
rename to GUI/Model/Data/DataItemUtil.cpp
index 106e7038b3d..60ea365894f 100644
--- a/GUI/Model/Data/JobItemUtil.cpp
+++ b/GUI/Model/Data/DataItemUtil.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/JobItemUtil.cpp
-//! @brief Implements class JobItemUtils
+//! @file GUI/Model/Data/DataItemUtil.cpp
+//! @brief Implements class DataItemUtils
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "Device/Coord/ICoordSystem.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/SimulationResult.h"
@@ -50,7 +50,7 @@ ComboProperty availableUnits(const ICoordSystem& converter)
//! Updates axes of Datafield in IntensityData item to correspond with axes units selection.
//! InstrumentItem is used to get domain's detector map for given units.
-void GUI::Model::JobItemUtil::updateDataAxes(DataItem* dataItem,
+void GUI::Model::DataItemUtil::updateDataAxes(DataItem* dataItem,
const InstrumentItem* instrumentItem)
{
ASSERT(dataItem);
@@ -79,7 +79,7 @@ void GUI::Model::JobItemUtil::updateDataAxes(DataItem* dataItem,
//! Sets axes units suitable for given instrument.
-void GUI::Model::JobItemUtil::setDataItemCoords(DataItem* dataItem,
+void GUI::Model::DataItemUtil::setDataItemCoords(DataItem* dataItem,
const InstrumentItem* instrumentItem)
{
ASSERT(instrumentItem);
@@ -88,13 +88,13 @@ void GUI::Model::JobItemUtil::setDataItemCoords(DataItem* dataItem,
setDataItemCoords(dataItem, *converter);
}
-void GUI::Model::JobItemUtil::setDataItemCoords(DataItem* dataItem, const ICoordSystem& converter)
+void GUI::Model::DataItemUtil::setDataItemCoords(DataItem* dataItem, const ICoordSystem& converter)
{
ComboProperty combo = availableUnits(converter);
dataItem->setAxesUnitsCombo(combo);
}
-void GUI::Model::JobItemUtil::createDefaultDetectorMap(DataItem* dataItem,
+void GUI::Model::DataItemUtil::createDefaultDetectorMap(DataItem* dataItem,
const InstrumentItem* instrumentItem)
{
const auto converter = instrumentItem->createCoordSystem();
@@ -105,11 +105,11 @@ void GUI::Model::JobItemUtil::createDefaultDetectorMap(DataItem* dataItem,
updateAxesTitle(dataItem, *converter, converter->defaultUnits());
}
-void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationResult& result)
+void GUI::Model::DataItemUtil::setResults(DataItem* dataItem, const SimulationResult& result)
{
if (dataItem->datafield() == nullptr) {
const auto& converter = result.converter();
- GUI::Model::JobItemUtil::setDataItemCoords(dataItem, converter);
+ GUI::Model::DataItemUtil::setDataItemCoords(dataItem, converter);
updateAxesTitle(dataItem, converter, converter.defaultUnits());
}
auto selected_units = GUI::Util::CoordName::coordFromName(dataItem->currentAxesUnits());
diff --git a/GUI/Model/Data/JobItemUtil.h b/GUI/Model/Data/DataItemUtil.h
similarity index 80%
rename from GUI/Model/Data/JobItemUtil.h
rename to GUI/Model/Data/DataItemUtil.h
index 3b2db1a3257..e9e9f267d41 100644
--- a/GUI/Model/Data/JobItemUtil.h
+++ b/GUI/Model/Data/DataItemUtil.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/JobItemUtil.h
-//! @brief Defines namespace GUI::Model::JobItemUtil
+//! @file GUI/Model/Data/DataItemUtil.h
+//! @brief Defines namespace GUI::Model::DataItemUtil
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
-#define BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATAITEMUTIL_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATAITEMUTIL_H
#include "Device/Detector/IDetector.h"
#include "GUI/Model/Data/ComboProperty.h"
@@ -27,7 +27,7 @@ class ICoordSystem;
//! Contains convenience methods to trasfer data from domain simulation to IntensityDataItem.
//! Used to modify Datafield's axes units as requested by IntensityDataItem.
-namespace GUI::Model::JobItemUtil {
+namespace GUI::Model::DataItemUtil {
//! updates axes of Datafield in IntensityData item
void updateDataAxes(DataItem* dataItem, const InstrumentItem* instrumentItem);
@@ -41,6 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume
//! Sets simulation results into the DataItem
void setResults(DataItem* dataItem, const SimulationResult& result);
-} // namespace GUI::Model::JobItemUtil
+} // namespace GUI::Model::DataItemUtil
-#endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATAITEMUTIL_H
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index 4829d083af8..94b3f8c5784 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -17,7 +17,7 @@
#include "Device/Data/Datafield.h"
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/MaskUnitsConverter.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Support/IO/ImportDataInfo.h"
@@ -209,7 +209,7 @@ void IntensityDataItem::updateCoords(const InstrumentItem* instrument)
MaskUnitsConverter converter;
converter.convertToNbins(this);
- GUI::Model::JobItemUtil::updateDataAxes(this, instrument);
+ GUI::Model::DataItemUtil::updateDataAxes(this, instrument);
converter.convertFromNbins(this);
}
diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Data/RealItem.cpp
index 105c95959b0..5faf7e79396 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Data/RealItem.cpp
@@ -16,7 +16,7 @@
#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
@@ -454,12 +454,12 @@ void RealItem::readFrom(QXmlStreamReader* r, InstrumentItem* jobInstrument)
// create axes units list from job's instrument or linked instrument
if (jobInstrument)
- GUI::Model::JobItemUtil::setDataItemCoords(m_dataItem.get(), jobInstrument);
+ GUI::Model::DataItemUtil::setDataItemCoords(m_dataItem.get(), jobInstrument);
else if (!m_instrumentId.isEmpty()) { // read 'm_instrumentId' before
ASSERT(m_instrumentModel);
auto* instrument = m_instrumentModel->findInstrumentItemById(m_instrumentId);
ASSERT(instrument);
- GUI::Model::JobItemUtil::setDataItemCoords(m_dataItem.get(), instrument);
+ GUI::Model::DataItemUtil::setDataItemCoords(m_dataItem.get(), instrument);
}
m_dataItem->readFrom(r);
@@ -574,7 +574,7 @@ void RealItem::updateToInstrument(const InstrumentItem* instrument)
return;
if (instrument) {
- GUI::Model::JobItemUtil::setDataItemCoords(data_item, instrument);
+ GUI::Model::DataItemUtil::setDataItemCoords(data_item, instrument);
if (dataItem())
dataItem()->updateCoords(instrument);
return;
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index 6190c80a8b1..ffd197d156b 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -18,7 +18,7 @@
#include "Device/Data/Datafield.h"
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/XML/UtilXML.h"
@@ -112,7 +112,7 @@ void SpecularDataItem::setLog(bool islog)
void SpecularDataItem::updateCoords(const InstrumentItem* instrument)
{
- GUI::Model::JobItemUtil::updateDataAxes(this, instrument);
+ GUI::Model::DataItemUtil::updateDataAxes(this, instrument);
}
std::vector<int> SpecularDataItem::shape() const
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 1646576277d..0dfd8a3bdcb 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -16,7 +16,7 @@
#include "Device/Data/Datafield.h"
#include "Device/Detector/SimulationAreaIterator.h" // roiIndex
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
@@ -237,7 +237,7 @@ void JobItem::copySimulationOptionsIntoJob(const SimulationOptionsItem& options)
void JobItem::setResults(const SimulationResult& result)
{
- GUI::Model::JobItemUtil::setResults(simulatedDataItem(), result);
+ GUI::Model::DataItemUtil::setResults(simulatedDataItem(), result);
updateDataFileName();
}
@@ -312,7 +312,7 @@ DataItem* JobItem::createDiffDataItem()
m_diffDataItem.reset(createNewDataItem());
// Immediately create coordinate system and axes units
- GUI::Model::JobItemUtil::setDataItemCoords(diffDataItem(), instrumentItem());
+ GUI::Model::DataItemUtil::setDataItemCoords(diffDataItem(), instrumentItem());
diffDataItem()->updateCoords(instrumentItem());
if (isSpecularJob())
@@ -384,7 +384,7 @@ void JobItem::cropRealData()
std::unique_ptr<Datafield> origData(intensityItem->datafield()->clone());
- GUI::Model::JobItemUtil::createDefaultDetectorMap(intensityItem, iiI);
+ GUI::Model::DataItemUtil::createDefaultDetectorMap(intensityItem, iiI);
iiI->normalDetector()->iterateOverNonMaskedPoints([&](IDetector::const_iterator it) {
auto* cropped_data = intensityItem->datafield();
@@ -597,7 +597,7 @@ void JobItem::readFrom(QXmlStreamReader* r)
ASSERT(instrumentItem()); // read 'm_instrument' before
createSimulatedDataItem();
// create axes units list in data item before reading selected units
- GUI::Model::JobItemUtil::setDataItemCoords(simulatedDataItem(), instrumentItem());
+ GUI::Model::DataItemUtil::setDataItemCoords(simulatedDataItem(), instrumentItem());
m_simulatedDataItem->readFrom(r);
XML::gotoEndElementOfTag(r, tag);
diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp
index 8c5ff6c1ecd..625461e5539 100644
--- a/Tests/Unit/GUI/TestAutosaveController.cpp
+++ b/Tests/Unit/GUI/TestAutosaveController.cpp
@@ -1,5 +1,5 @@
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
@@ -117,7 +117,7 @@ TEST_F(TestAutosaveController, autosaveEnabled)
RealItem* realData = UTest::GUI::createRealData("TestData", *document->realModel());
DataItem* intensityItem = realData->dataItem();
intensityItem->setSaveInBackground(false);
- GUI::Model::JobItemUtil::createDefaultDetectorMap(
+ GUI::Model::DataItemUtil::createDefaultDetectorMap(
intensityItem, document->instrumentModel()->instrument2DItems().front());
document->clearModified();
EXPECT_FALSE(document->isModified());
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 26adf6ebcef..396da08080c 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,5 +1,5 @@
#include "GUI/Model/Axis/BasicAxisItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
@@ -37,7 +37,7 @@ TEST(TestLinkInstrument, canLinkToInstrument)
// populating real data model, setting intensity data
RealItem* realData = UTest::GUI::createRealData("RealData", *document.realModel());
- GUI::Model::JobItemUtil::createDefaultDetectorMap(realData->dataItem(), instrument);
+ GUI::Model::DataItemUtil::createDefaultDetectorMap(realData->dataItem(), instrument);
ASSERT_TRUE(
document.linkInstrumentManager()->canLinkDataToInstrument(realData, identifier, nullptr));
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 7d2c17be256..c74f4fc3856 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,5 +1,5 @@
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtil.h"
+#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealModel.h"
@@ -78,7 +78,7 @@ TEST_F(TestProjectDocument, projectDocumentWithData)
RealItem* realData = UTest::GUI::createRealData("TestData", *document.realModel());
ASSERT(realData);
DataItem* intensityItem = realData->dataItem();
- GUI::Model::JobItemUtil::createDefaultDetectorMap(
+ GUI::Model::DataItemUtil::createDefaultDetectorMap(
intensityItem, document.instrumentModel()->instrument2DItems().front());
intensityItem->setSaveInBackground(false);
--
GitLab