From 15f41514d44302793ffdd85951340129707f715b Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Mon, 1 Aug 2022 12:39:03 +0200
Subject: [PATCH] rename RealDataItem --> RealItem
---
GUI/Model/BaseItem/JobRealBase.h | 2 +-
GUI/Model/Data/DataItem.h | 2 +-
.../Data/{RealDataItem.cpp => RealItem.cpp} | 112 +++++++++---------
GUI/Model/Data/{RealDataItem.h => RealItem.h} | 10 +-
GUI/Model/Device/InstrumentCollection.cpp | 2 +-
GUI/Model/Device/InstrumentItems.cpp | 14 +--
GUI/Model/Device/InstrumentItems.h | 16 +--
.../Device/InstrumentsEditController.cpp | 2 +-
GUI/Model/Device/InstrumentsEditController.h | 4 +-
GUI/Model/Job/JobItem.cpp | 14 +--
GUI/Model/Job/JobItem.h | 10 +-
GUI/Model/MakeItem/ItemCatalog.cpp | 4 +-
GUI/Model/Model/JobFunctions.cpp | 20 ++--
GUI/Model/Model/JobFunctions.h | 8 +-
GUI/Model/Model/JobModel.cpp | 8 +-
GUI/Model/Model/JobModel.h | 4 +-
GUI/Model/Model/RealDataModel.cpp | 30 ++---
GUI/Model/Model/RealDataModel.h | 20 ++--
GUI/Model/Project/LinkInstrumentManager.cpp | 6 +-
GUI/Model/Project/LinkInstrumentManager.h | 10 +-
GUI/Model/Project/ProjectDocument.cpp | 4 +-
GUI/Support/IO/AbstractDataLoader.cpp | 6 +-
GUI/Support/IO/AbstractDataLoader.h | 10 +-
GUI/View/Common/DataAccessWidget.cpp | 4 +-
GUI/View/Common/DataAccessWidget.h | 6 +-
GUI/View/Fit/FitObjectiveBuilder.cpp | 2 +-
GUI/View/Import/ImportDataUtils.cpp | 4 +-
GUI/View/Import/ImportDataUtils.h | 4 +-
GUI/View/Import/ImportDataView.cpp | 2 +-
GUI/View/Import/ImportDataView.h | 2 +-
GUI/View/Import/RealDataMaskWidget.h | 2 +-
GUI/View/Import/RealDataPresenter.h | 2 +-
GUI/View/Import/RealDataPropertiesWidget.cpp | 4 +-
GUI/View/Import/RealDataPropertiesWidget.h | 12 +-
GUI/View/Import/RealDataSelectorWidget.cpp | 12 +-
GUI/View/Import/RealDataSelectorWidget.h | 10 +-
GUI/View/Import/RealDataTreeModel.cpp | 24 ++--
GUI/View/Import/RealDataTreeModel.h | 20 ++--
GUI/View/Import/SpecularDataImportWidget.h | 2 +-
.../Instrument/InstrumentEditController.h | 2 +-
GUI/View/Loaders/AutomaticDataLoader1D.cpp | 2 +-
.../AutomaticDataLoader1DResultModel.cpp | 4 +-
.../AutomaticDataLoader1DResultModel.h | 6 +-
GUI/View/Loaders/QREDataLoader.cpp | 4 +-
GUI/View/Loaders/QREDataLoader.h | 2 +-
GUI/View/Toplevel/SimulationView.cpp | 6 +-
GUI/View/Toplevel/SimulationView.h | 6 +-
Tests/Unit/GUI/TestIOService.cpp | 22 ++--
Tests/Unit/GUI/TestLinkInstrument.cpp | 14 +--
Tests/Unit/GUI/TestProjectDocument.cpp | 4 +-
Tests/Unit/GUI/TestRealDataModel.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 6 +-
Tests/Unit/GUI/TestSessionModel.cpp | 2 +-
Tests/Unit/GUI/Utils.cpp | 6 +-
Tests/Unit/GUI/Utils.h | 4 +-
55 files changed, 261 insertions(+), 261 deletions(-)
rename GUI/Model/Data/{RealDataItem.cpp => RealItem.cpp} (80%)
rename GUI/Model/Data/{RealDataItem.h => RealItem.h} (94%)
diff --git a/GUI/Model/BaseItem/JobRealBase.h b/GUI/Model/BaseItem/JobRealBase.h
index 58ee869ad9e..21b644510ce 100644
--- a/GUI/Model/BaseItem/JobRealBase.h
+++ b/GUI/Model/BaseItem/JobRealBase.h
@@ -18,7 +18,7 @@
#include "GUI/Model/BaseItem/SessionItem.h"
#include <QObject>
-//! This class serves as base class for JobItem and RealDataItem for passing them as function
+//! This class serves as base class for JobItem and RealItem for passing them as function
//! arguments.
class JobRealBase : public QObject, public SessionItem {
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index a94bacc40b5..f3160a3560b 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -31,7 +31,7 @@ class BasicAxisItem;
//! Abstract base class for IntensityDataItem and SpecularDataItem.
//! Owns one simulated data set of type Datafield.
-//! For experimental data, use RealDataItem.
+//! For experimental data, use RealItem.
class BA_CORE_API_ DataItem : public QObject, public SessionItem, public SaveLoadInterface {
Q_OBJECT
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealItem.cpp
similarity index 80%
rename from GUI/Model/Data/RealDataItem.cpp
rename to GUI/Model/Data/RealItem.cpp
index b912a7385ec..dc8ef0ef339 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealItem.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/RealDataItem.cpp
-//! @brief Implements class RealDataItem
+//! @file GUI/Model/Data/RealItem.cpp
+//! @brief Implements class RealItem
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
@@ -42,80 +42,80 @@ const QString value("value");
} // namespace
-RealDataItem::RealDataItem()
+RealItem::RealItem()
: JobRealBase(M_TYPE)
{
setItemName("undefined");
REFACTORED = true;
}
-QString RealDataItem::dataName() const
+QString RealItem::dataName() const
{
return itemName();
}
-void RealDataItem::setDataName(const QString& name)
+void RealItem::setDataName(const QString& name)
{
setItemName(name);
}
-IntensityDataItem* RealDataItem::intensityDataItem()
+IntensityDataItem* RealItem::intensityDataItem()
{
return dynamic_cast<IntensityDataItem*>(dataItem());
}
-const IntensityDataItem* RealDataItem::intensityDataItem() const
+const IntensityDataItem* RealItem::intensityDataItem() const
{
return dynamic_cast<const IntensityDataItem*>(dataItem());
}
-SpecularDataItem* RealDataItem::specularDataItem()
+SpecularDataItem* RealItem::specularDataItem()
{
return dynamic_cast<SpecularDataItem*>(dataItem());
}
-const SpecularDataItem* RealDataItem::specularDataItem() const
+const SpecularDataItem* RealItem::specularDataItem() const
{
return dynamic_cast<const SpecularDataItem*>(dataItem());
}
-DataItem* RealDataItem::dataItem()
+DataItem* RealItem::dataItem()
{
- return const_cast<DataItem*>(static_cast<const RealDataItem*>(this)->dataItem());
+ return const_cast<DataItem*>(static_cast<const RealItem*>(this)->dataItem());
}
-const DataItem* RealDataItem::dataItem() const
+const DataItem* RealItem::dataItem() const
{
return m_dataItem.get();
}
-DataItem* RealDataItem::nativeData()
+DataItem* RealItem::nativeData()
{
- return const_cast<DataItem*>(static_cast<const RealDataItem*>(this)->nativeData());
+ return const_cast<DataItem*>(static_cast<const RealItem*>(this)->nativeData());
}
-const DataItem* RealDataItem::nativeData() const
+const DataItem* RealItem::nativeData() const
{
return dynamic_cast<const DataItem*>(m_nativeDataItem.get());
}
-void RealDataItem::initNativeData()
+void RealItem::initNativeData()
{
const size_t rank = isSpecularData() ? 1 : 2;
initDataItem(rank, m_nativeDataItem);
}
-QString RealDataItem::nativeDataUnits() const
+QString RealItem::nativeDataUnits() const
{
return m_nativeDataUnits;
}
-void RealDataItem::setNativeDataUnits(const QString& units)
+void RealItem::setNativeDataUnits(const QString& units)
{
m_nativeDataUnits = units;
}
-void RealDataItem::removeNativeData()
+void RealItem::removeNativeData()
{
ASSERT(isSpecularData()); // not implemented for intensityDataItem
@@ -123,19 +123,19 @@ void RealDataItem::removeNativeData()
nativeData()->setDatafield(nullptr);
}
-bool RealDataItem::hasNativeData() const
+bool RealItem::hasNativeData() const
{
return (nativeData() != nullptr) && (nativeData()->getDatafield() != nullptr);
}
-const Datafield* RealDataItem::nativeDatafield() const
+const Datafield* RealItem::nativeDatafield() const
{
return hasNativeData() ? nativeData()->getDatafield() : nullptr;
}
//! takes ownership of data
-void RealDataItem::setNativeDatafield(Datafield* data)
+void RealItem::setNativeDatafield(Datafield* data)
{
nativeData()->setDatafield(data); // takes ownership of odata
}
@@ -144,7 +144,7 @@ void RealDataItem::setNativeDatafield(Datafield* data)
//! Checks for rank compatibility if already existing.
//! No further initialization (like clearing the data etc).
-void RealDataItem::initDataItem(const std::size_t rank, std::unique_ptr<DataItem>& dataItem)
+void RealItem::initDataItem(const std::size_t rank, std::unique_ptr<DataItem>& dataItem)
{
// TODO: initDataItem can be replaced by a template which accepts only
// SpecularDataItem or IntensityDataItem.
@@ -154,7 +154,7 @@ void RealDataItem::initDataItem(const std::size_t rank, std::unique_ptr<DataItem
if (dataItem) {
if ((rank == 1 && !dynamic_cast<const SpecularDataItem*>(dataItem.get()))
|| (rank == 2 && !dynamic_cast<const IntensityDataItem*>(dataItem.get())))
- throw Error("Error in RealDataItem::initDataItem: trying to set data "
+ throw Error("Error in RealItem::initDataItem: trying to set data "
"incompatible with underlying data item");
} else {
if (rank == 1)
@@ -162,7 +162,7 @@ void RealDataItem::initDataItem(const std::size_t rank, std::unique_ptr<DataItem
else // if rank == 2
dataItem = std::make_unique<IntensityDataItem>();
ASSERT(dataItem
- && "Assertion failed in RealDataItem::initDataItem: inserting data item failed.");
+ && "Assertion failed in RealItem::initDataItem: inserting data item failed.");
}
dataItem->setParentAndModel(this, model());
@@ -170,9 +170,9 @@ void RealDataItem::initDataItem(const std::size_t rank, std::unique_ptr<DataItem
//! Sets Datafield to underlying item. Creates it if not existing.
-void RealDataItem::setDatafield(Datafield* data)
+void RealItem::setDatafield(Datafield* data)
{
- ASSERT(data && "Assertion failed in RealDataItem::setDatafield: passed data is nullptr");
+ ASSERT(data && "Assertion failed in RealItem::setDatafield: passed data is nullptr");
initDataItem(data->rank(), m_dataItem);
@@ -182,7 +182,7 @@ void RealDataItem::setDatafield(Datafield* data)
//! Sets imported data to underlying item. Creates it if not existing.
//! This is used for 1D import. For 2D import, use setDatafield.
-void RealDataItem::setImportData(ImportDataInfo info)
+void RealItem::setImportData(ImportDataInfo info)
{
if (!info)
return;
@@ -199,35 +199,35 @@ void RealDataItem::setImportData(ImportDataInfo info)
m_nativeDataItem->setDatafield(output_data.release());
}
-void RealDataItem::initAsSpecularItem()
+void RealItem::initAsSpecularItem()
{
const size_t rank = 1;
initDataItem(rank, m_dataItem);
}
-void RealDataItem::initAsIntensityItem()
+void RealItem::initAsIntensityItem()
{
const size_t rank = 2;
initDataItem(rank, m_dataItem);
}
-bool RealDataItem::holdsDimensionalData() const
+bool RealItem::holdsDimensionalData() const
{
return nativeDataUnits() != "nbins";
}
-QString RealDataItem::instrumentId() const
+QString RealItem::instrumentId() const
{
return m_instrumentId;
}
-void RealDataItem::unlinkFromInstrument()
+void RealItem::unlinkFromInstrument()
{
m_instrumentId = QString{};
updateToInstrument(nullptr);
}
-void RealDataItem::linkToInstrument(const InstrumentItem* instrument)
+void RealItem::linkToInstrument(const InstrumentItem* instrument)
{
if (instrument) {
m_instrumentId = instrument->id();
@@ -236,7 +236,7 @@ void RealDataItem::linkToInstrument(const InstrumentItem* instrument)
unlinkFromInstrument();
}
-std::vector<int> RealDataItem::shape() const
+std::vector<int> RealItem::shape() const
{
const auto* data_item = dataItem();
if (!data_item) {
@@ -246,39 +246,39 @@ std::vector<int> RealDataItem::shape() const
return data_item->shape();
}
-bool RealDataItem::isIntensityData() const
+bool RealItem::isIntensityData() const
{
return intensityDataItem() != nullptr;
}
-bool RealDataItem::isSpecularData() const
+bool RealItem::isSpecularData() const
{
return specularDataItem() != nullptr;
}
-bool RealDataItem::hasImportErrors() const
+bool RealItem::hasImportErrors() const
{
return (dataLoader() != nullptr) ? dataLoader()->numErrors() > 0 : false;
}
-MaskContainerItem* RealDataItem::maskContainerItem()
+MaskContainerItem* RealItem::maskContainerItem()
{
if (auto* intensity_data = intensityDataItem())
return intensity_data->maskContainerItem();
return nullptr;
}
-void RealDataItem::setNativeFileName(const QString& filename)
+void RealItem::setNativeFileName(const QString& filename)
{
m_nativeFileName = filename;
}
-QString RealDataItem::nativeFileName() const
+QString RealItem::nativeFileName() const
{
return m_nativeFileName;
}
-QByteArray RealDataItem::serializeBinaryData() const
+QByteArray RealItem::serializeBinaryData() const
{
QByteArray a;
QDataStream s(&a, QIODevice::WriteOnly);
@@ -296,7 +296,7 @@ QByteArray RealDataItem::serializeBinaryData() const
return a;
}
-void RealDataItem::deserializeBinaryData(const QByteArray& data)
+void RealItem::deserializeBinaryData(const QByteArray& data)
{
m_nativeFileName.clear();
m_importSettings.clear();
@@ -328,20 +328,20 @@ void RealDataItem::deserializeBinaryData(const QByteArray& data)
throw DeserializationException::streamError();
}
-void RealDataItem::setDataLoader(AbstractDataLoader* loader)
+void RealItem::setDataLoader(AbstractDataLoader* loader)
{
m_dataLoader.reset(loader);
if (m_dataLoader)
connect(m_dataLoader.get(), &AbstractDataLoader::contentsProcessed, this,
- &RealDataItem::importContentsProcessed);
+ &RealItem::importContentsProcessed);
}
-AbstractDataLoader* RealDataItem::dataLoader() const
+AbstractDataLoader* RealItem::dataLoader() const
{
return m_dataLoader.get();
}
-bool RealDataItem::rotationAffectsSetup() const
+bool RealItem::rotationAffectsSetup() const
{
if (!isIntensityData()) // rotation only for 2D items possible
return false;
@@ -359,7 +359,7 @@ bool RealDataItem::rotationAffectsSetup() const
return false;
}
-void RealDataItem::rotateData()
+void RealItem::rotateData()
{
if (!isIntensityData()) // rotation only for 2D items possible
return;
@@ -384,7 +384,7 @@ void RealDataItem::rotateData()
//! Updates the name of file to store intensity data.
-void RealDataItem::updateNonXMLDataFileNames()
+void RealItem::updateNonXMLDataFileNames()
{
if (DataItem* item = dataItem())
item->setFileName(GUI::Model::FilenameUtils::realDataFileName(dataName()));
@@ -392,7 +392,7 @@ void RealDataItem::updateNonXMLDataFileNames()
item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(dataName()));
}
-void RealDataItem::updateToInstrument(const InstrumentItem* instrument)
+void RealItem::updateToInstrument(const InstrumentItem* instrument)
{
DataItem* data_item = dataItem();
if (!data_item)
@@ -426,7 +426,7 @@ void RealDataItem::updateToInstrument(const InstrumentItem* instrument)
// serialization/deserialization
-void RealDataItem::writeNonSessionItems(QXmlStreamWriter* writer) const
+void RealItem::writeNonSessionItems(QXmlStreamWriter* writer) const
{
GUI::Session::XML::writeAttribute(writer, GUI::Session::XML::Version, int(1));
@@ -465,7 +465,7 @@ inline T* readItemToEnd(QXmlStreamReader* reader, SessionItem* parent_item, cons
return item;
}
-void RealDataItem::readNonSessionItems(QXmlStreamReader* reader)
+void RealItem::readNonSessionItems(QXmlStreamReader* reader)
{
const int version = reader->attributes().value(GUI::Session::XML::Version).toInt();
@@ -492,7 +492,7 @@ void RealDataItem::readNonSessionItems(QXmlStreamReader* reader)
}
}
-void RealDataItem::copyTo(RealDataItem* const realdata_dst) const
+void RealItem::copyTo(RealItem* const realdata_dst) const
{
// set the data members
realdata_dst->m_nativeDataUnits = m_nativeDataUnits;
@@ -504,8 +504,8 @@ void RealDataItem::copyTo(RealDataItem* const realdata_dst) const
realdata_dst->m_instrumentId = m_instrumentId;
// copy DataItems
- // NOTE: For consistency, the DataItem's parent is set to the destination RealDataItem
- // and its model is inherited from the destination RealDataItem.
+ // NOTE: For consistency, the DataItem's parent is set to the destination RealItem
+ // and its model is inherited from the destination RealItem.
if (m_dataItem) {
realdata_dst->m_dataItem.reset(dynamic_cast<DataItem*>(
GUI::Session::XML::copyItem(m_dataItem.get(), realdata_dst /* parent */)));
diff --git a/GUI/Model/Data/RealDataItem.h b/GUI/Model/Data/RealItem.h
similarity index 94%
rename from GUI/Model/Data/RealDataItem.h
rename to GUI/Model/Data/RealItem.h
index 4c982237adf..d18d801b0eb 100644
--- a/GUI/Model/Data/RealDataItem.h
+++ b/GUI/Model/Data/RealItem.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/RealDataItem.h
-//! @brief Defines class RealDataItem
+//! @file GUI/Model/Data/RealItem.h
+//! @brief Defines class RealItem
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -29,7 +29,7 @@ class ImportDataInfo;
//! Provides access to experimental data, for display and fitting.
//! Owns an AbstractDataLoader.
-class BA_CORE_API_ RealDataItem : public JobRealBase {
+class BA_CORE_API_ RealItem : public JobRealBase {
Q_OBJECT
friend class TestView;
@@ -37,7 +37,7 @@ class BA_CORE_API_ RealDataItem : public JobRealBase {
public:
static constexpr auto M_TYPE{"RealData"};
- RealDataItem();
+ RealItem();
void initAsSpecularItem();
void initAsIntensityItem();
@@ -105,7 +105,7 @@ public:
virtual void readNonSessionItems(QXmlStreamReader* reader);
//! Make a copy instance.
- void copyTo(RealDataItem* const realdata_new) const;
+ void copyTo(RealItem* const realdata_new) const;
signals:
void importContentsProcessed();
diff --git a/GUI/Model/Device/InstrumentCollection.cpp b/GUI/Model/Device/InstrumentCollection.cpp
index 1c99cc69241..507b6442177 100644
--- a/GUI/Model/Device/InstrumentCollection.cpp
+++ b/GUI/Model/Device/InstrumentCollection.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Device/InstrumentCollection.h"
#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/XML/Serialize.h"
#include "GUI/Util/String.h"
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index f98a9b0a4c7..f368fb34db5 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -23,7 +23,7 @@
#include "GUI/Model/CatDevice/BackgroundItemCatalog.h"
#include "GUI/Model/CatDevice/DetectorItemCatalog.h"
#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
#include "GUI/Model/Device/DetectorItems.h"
@@ -126,7 +126,7 @@ SelectionDescriptor<BackgroundItem*> InstrumentItem::backgroundSelection() const
return m_backgroundItem;
}
-bool InstrumentItem::alignedWith(const RealDataItem* item) const
+bool InstrumentItem::alignedWith(const RealItem* item) const
{
return shape() == item->shape();
}
@@ -182,7 +182,7 @@ std::vector<int> SpecularInstrumentItem::shape() const
return {axis_item->binCount()};
}
-void SpecularInstrumentItem::updateToRealData(const RealDataItem* item)
+void SpecularInstrumentItem::updateToRealData(const RealItem* item)
{
if (shape().size() != item->shape().size())
throw Error("Error in SpecularInstrumentItem::updateToRealData: The type "
@@ -192,7 +192,7 @@ void SpecularInstrumentItem::updateToRealData(const RealDataItem* item)
beamItem()->updateToData(data, item->nativeDataUnits());
}
-bool SpecularInstrumentItem::alignedWith(const RealDataItem* item) const
+bool SpecularInstrumentItem::alignedWith(const RealItem* item) const
{
const QString native_units = item->nativeDataUnits();
if (native_units == "nbins") {
@@ -284,7 +284,7 @@ std::vector<int> DepthProbeInstrumentItem::shape() const
return std::vector<int>(); // no certain shape to avoid linking to real data
}
-void DepthProbeInstrumentItem::updateToRealData(const RealDataItem*)
+void DepthProbeInstrumentItem::updateToRealData(const RealItem*)
{
throw std::runtime_error("DepthProbeInstrumentItem::updateToRealData()");
}
@@ -401,7 +401,7 @@ std::vector<int> GISASInstrumentItem::shape() const
return {detector_item->xSize(), detector_item->ySize()};
}
-void GISASInstrumentItem::updateToRealData(const RealDataItem* item)
+void GISASInstrumentItem::updateToRealData(const RealItem* item)
{
if (!item)
return;
@@ -456,7 +456,7 @@ std::vector<int> OffspecInstrumentItem::shape() const
return {(int)m_alphaAxis.nbins(), detectorItem()->ySize()};
}
-void OffspecInstrumentItem::updateToRealData(const RealDataItem* dataItem)
+void OffspecInstrumentItem::updateToRealData(const RealItem* dataItem)
{
if (!dataItem)
return;
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index 088eb8fe34b..dedbaf4e159 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -32,7 +32,7 @@ class ICoordSystem;
class Instrument;
class MaskContainerItem;
class MultiLayer;
-class RealDataItem;
+class RealItem;
class OffspecSimulation;
class ScatteringSimulation;
@@ -77,8 +77,8 @@ public:
virtual void importMasks(const MaskContainerItem*) {}
- virtual void updateToRealData(const RealDataItem* item) = 0;
- virtual bool alignedWith(const RealDataItem* item) const;
+ virtual void updateToRealData(const RealItem* item) = 0;
+ virtual bool alignedWith(const RealItem* item) const;
//! The default user visible name when creating an instrument
virtual QString defaultName() const = 0;
@@ -115,8 +115,8 @@ public:
SpecularBeamItem* beamItem() const override;
std::vector<int> shape() const override;
- void updateToRealData(const RealDataItem* item) override;
- bool alignedWith(const RealDataItem* item) const override;
+ void updateToRealData(const RealItem* item) override;
+ bool alignedWith(const RealItem* item) const override;
QString defaultName() const override;
QString instrumentType() const override;
@@ -132,7 +132,7 @@ public:
SpecularBeamItem* beamItem() const override;
std::vector<int> shape() const override;
- void updateToRealData(const RealDataItem* item) override;
+ void updateToRealData(const RealItem* item) override;
QString defaultName() const override;
QString instrumentType() const override;
@@ -173,7 +173,7 @@ protected:
class GISASInstrumentItem : public Instrument2DItem {
public:
std::vector<int> shape() const override;
- void updateToRealData(const RealDataItem* item) override;
+ void updateToRealData(const RealItem* item) override;
QString defaultName() const override;
QString instrumentType() const override;
@@ -187,7 +187,7 @@ public:
void serialize(Streamer& s) override;
std::vector<int> shape() const override;
- void updateToRealData(const RealDataItem* item) override;
+ void updateToRealData(const RealItem* item) override;
QString defaultName() const override;
QString instrumentType() const override;
diff --git a/GUI/Model/Device/InstrumentsEditController.cpp b/GUI/Model/Device/InstrumentsEditController.cpp
index a2952fd56a6..0c6d771afaf 100644
--- a/GUI/Model/Device/InstrumentsEditController.cpp
+++ b/GUI/Model/Device/InstrumentsEditController.cpp
@@ -50,7 +50,7 @@ void InstrumentsEditController::setInstrumentName(InstrumentItem* instrument, co
}
void InstrumentsEditController::updateInstrumentToRealDataItem(InstrumentItem* instrument,
- const RealDataItem* realDataItem)
+ const RealItem* realDataItem)
{
instrument->updateToRealData(realDataItem);
emit instrumentChanged(instrument);
diff --git a/GUI/Model/Device/InstrumentsEditController.h b/GUI/Model/Device/InstrumentsEditController.h
index 38b553f5015..aca8366af33 100644
--- a/GUI/Model/Device/InstrumentsEditController.h
+++ b/GUI/Model/Device/InstrumentsEditController.h
@@ -20,7 +20,7 @@
class InstrumentCollection;
class InstrumentItem;
-class RealDataItem;
+class RealItem;
//! Class to modify the instruments list or a single instrument and provide the necessary signaling
//! within BornAgain.
@@ -61,7 +61,7 @@ public:
//! Calls the instrument's updateToRealData and emits the respective signal.
void updateInstrumentToRealDataItem(InstrumentItem* instrument,
- const RealDataItem* realDataItem);
+ const RealItem* realDataItem);
//! 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/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 8a0201dbd15..e94edd82cf8 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/FitSuiteItem.h"
@@ -285,12 +285,12 @@ FitParameterContainerItem* JobItem::fitParameterContainerItem()
return nullptr;
}
-RealDataItem* JobItem::realDataItem()
+RealItem* JobItem::realDataItem()
{
return m_realDataItem.get();
}
-RealDataItem* JobItem::copyRealDataIntoJob(const RealDataItem* real_data)
+RealItem* JobItem::copyRealDataIntoJob(const RealItem* real_data)
{
// create diffDataItem together with realDataItem
if (!diffDataItem()) {
@@ -330,9 +330,9 @@ RealDataItem* JobItem::copyRealDataIntoJob(const RealDataItem* real_data)
return m_realDataItem.get();
}
-RealDataItem* JobItem::createRealDataItem()
+RealItem* JobItem::createRealDataItem()
{
- m_realDataItem = std::make_unique<RealDataItem>();
+ m_realDataItem = std::make_unique<RealItem>();
m_realDataItem->setParentAndModel(this, model());
return m_realDataItem.get();
}
@@ -523,7 +523,7 @@ void JobItem::readNonSessionItems(QXmlStreamReader* reader)
} else if (reader->name() == Tags::OutputData) {
m_outputDataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::OutputData));
} else if (reader->name() == Tags::RealData) {
- m_realDataItem.reset(readItemToEnd<RealDataItem>(reader, this, Tags::RealData));
+ m_realDataItem.reset(readItemToEnd<RealItem>(reader, this, Tags::RealData));
} else if (reader->name() == Tags::DiffData) {
m_diffDataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::DiffData));
} else if (reader->name() == Tags::FitSuite) {
@@ -546,7 +546,7 @@ void JobItem::updateIntensityDataFileName()
if (DataItem* item = dataItem())
item->setFileName(GUI::Model::FilenameUtils::jobResultsFileName(itemName()));
- if (RealDataItem* realItem = realDataItem()) {
+ if (RealItem* realItem = realDataItem()) {
if (DataItem* item = realItem->dataItem())
item->setFileName(GUI::Model::FilenameUtils::jobReferenceFileName(itemName()));
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index 20eb2266c75..cdbbe37bf90 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -18,7 +18,7 @@
#include "GUI/Model/BaseItem/JobRealBase.h"
#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
@@ -104,9 +104,9 @@ public:
const ParameterContainerItem* parameterContainerItem() const;
FitParameterContainerItem* fitParameterContainerItem();
- RealDataItem* realDataItem();
- RealDataItem* copyRealDataIntoJob(const RealDataItem* real_data);
- RealDataItem* createRealDataItem();
+ RealItem* realDataItem();
+ RealItem* copyRealDataIntoJob(const RealItem* real_data);
+ RealItem* createRealDataItem();
DataItem* diffDataItem();
@@ -154,7 +154,7 @@ private:
int m_progress;
std::unique_ptr<DataItem> m_outputDataItem; // TODO: Can be replaced by std::variant
std::unique_ptr<DataItem> m_diffDataItem; // TODO: Can be replaced by std::variant
- std::unique_ptr<RealDataItem> m_realDataItem; // TODO: Can be replaced by optional
+ std::unique_ptr<RealItem> m_realDataItem; // TODO: Can be replaced by optional
std::unique_ptr<FitSuiteItem> m_fitSuiteItem; // TODO: Can be replaced by optional
};
diff --git a/GUI/Model/MakeItem/ItemCatalog.cpp b/GUI/Model/MakeItem/ItemCatalog.cpp
index 150131e04b6..7af661c8e8a 100644
--- a/GUI/Model/MakeItem/ItemCatalog.cpp
+++ b/GUI/Model/MakeItem/ItemCatalog.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
@@ -57,7 +57,7 @@ ItemCatalog::ItemCatalog()
addItem<FitParameterLinkItem>();
addItem<FitSuiteItem>();
- addItem<RealDataItem>();
+ addItem<RealItem>();
addItem<MinimizerContainerItem>();
addItem<MinuitMinimizerItem>();
diff --git a/GUI/Model/Model/JobFunctions.cpp b/GUI/Model/Model/JobFunctions.cpp
index 8e495495541..92523178f05 100644
--- a/GUI/Model/Model/JobFunctions.cpp
+++ b/GUI/Model/Model/JobFunctions.cpp
@@ -18,7 +18,7 @@
#include "Device/Detector/SimulationAreaIterator.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/Instrument.h"
#include "GUI/Model/Device/InstrumentItems.h"
@@ -34,33 +34,33 @@
namespace {
-//! Links RealDataItem to the JobItem's instrument.
+//! Links RealItem to the JobItem's instrument.
// (re-)Linking is necessary because of following reason
-// 1) Copying of RealDataItem from RealDataModel on board of JobItem requires relink to the copied
+// 1) Copying of RealItem from RealDataModel on board of JobItem requires relink to the copied
// insturment
// 2) During relink all masks (if exists) will be converted to the default units of current detector
void processInstrumentLink(JobItem* jobItem)
{
- RealDataItem* realData = jobItem->realDataItem();
+ RealItem* realData = jobItem->realDataItem();
if (!realData)
throw Error("GUI::Model::JobFunctions::processInstrumentLink() -> Error. No data.");
realData->linkToInstrument(jobItem->instrumentItem());
}
-//! Copies masks and ROI from RealDataItem on board of instrument.
+//! Copies masks and ROI from RealItem on board of instrument.
void copyMasksToInstrument(JobItem* jobItem)
{
auto* mask_container = jobItem->realDataItem()->maskContainerItem();
jobItem->instrumentItem()->importMasks(mask_container);
}
-//! Crops RealDataItem to the region of interest.
+//! Crops RealItem to the region of interest.
void cropRealData(JobItem* jobItem)
{
ASSERT(jobItem->instrumentItem()->is<Instrument2DItem>());
- RealDataItem* realData = jobItem->realDataItem();
+ RealItem* realData = jobItem->realDataItem();
// adjusting real data to the size of region of interest
IntensityDataItem* intensityItem = realData->intensityDataItem();
@@ -147,7 +147,7 @@ void GUI::Model::JobFunctions::setupJobItemOutput(JobItem* jobItem)
//! Setups JobItem for fit.
void GUI::Model::JobFunctions::setupJobItemForFit(JobItem* jobItem,
- const RealDataItem* realDataItem)
+ const RealItem* realDataItem)
{
ASSERT(jobItem->instrumentItem());
@@ -165,12 +165,12 @@ void GUI::Model::JobFunctions::setupJobItemForFit(JobItem* jobItem,
createFitContainers(jobItem);
}
-void GUI::Model::JobFunctions::copyRealDataItem(JobItem* jobItem, const RealDataItem* realDataItem)
+void GUI::Model::JobFunctions::copyRealDataItem(JobItem* jobItem, const RealItem* realDataItem)
{
if (!realDataItem)
return;
- RealDataItem* realDataItemCopy = jobItem->copyRealDataIntoJob(realDataItem);
+ RealItem* realDataItemCopy = jobItem->copyRealDataIntoJob(realDataItem);
ASSERT(realDataItemCopy);
realDataItemCopy->dataItem()->setDatafield(realDataItem->dataItem()->getDatafield()->clone());
diff --git a/GUI/Model/Model/JobFunctions.h b/GUI/Model/Model/JobFunctions.h
index 13e8fec571f..4e68d79f7ee 100644
--- a/GUI/Model/Model/JobFunctions.h
+++ b/GUI/Model/Model/JobFunctions.h
@@ -18,7 +18,7 @@
class InstrumentItem;
class JobItem;
class MultiLayerItem;
-class RealDataItem;
+class RealItem;
class SessionItem;
//! Contains set of functions to extend JobModel functionality.
@@ -31,10 +31,10 @@ void setupJobItemInstrument(JobItem* jobItem, const InstrumentItem* from);
void setupJobItemOutput(JobItem* jobItem);
-void setupJobItemForFit(JobItem* jobItem, const RealDataItem* realDataItem);
+void setupJobItemForFit(JobItem* jobItem, const RealItem* realDataItem);
-//! Copy RealDataItem to jobItem intended for fitting.
-void copyRealDataItem(JobItem* jobItem, const RealDataItem* realDataItem);
+//! Copy RealItem to jobItem intended for fitting.
+void copyRealDataItem(JobItem* jobItem, const RealItem* realDataItem);
} // namespace GUI::Model::JobFunctions
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index a46aad0bbe1..20ae8f0b6f2 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
@@ -51,7 +51,7 @@ JobItem* JobModel::getJobItemForIdentifier(const QString& identifier)
//! Main method to add a job
JobItem* JobModel::addJob(const MultiLayerItem* sampleItem, const InstrumentItem* instrumentItem,
- const RealDataItem* realDataItem, const SimulationOptionsItem& optionItem)
+ const RealItem* realDataItem, const SimulationOptionsItem& optionItem)
{
ASSERT(sampleItem);
ASSERT(instrumentItem);
@@ -115,7 +115,7 @@ QVector<SessionItem*> JobModel::nonXMLItems() const
if (auto* intensityItem = jobItem->dataItem())
result.push_back(intensityItem);
- if (auto* real_data = dynamic_cast<RealDataItem*>(jobItem->realDataItem())) {
+ if (auto* real_data = dynamic_cast<RealItem*>(jobItem->realDataItem())) {
if (auto* data_item = real_data->dataItem())
result.push_back(data_item);
if (auto* native_data = real_data->nativeData())
@@ -133,7 +133,7 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService
// Set & check instrument links. JobItem and realDataItem have to reference the same instrument
// (which is the one contained in this job item, not contained in the instrument model)
for (auto* jobItem : jobItems()) {
- if (RealDataItem* refItem = jobItem->realDataItem())
+ if (RealItem* refItem = jobItem->realDataItem())
refItem->linkToInstrument(jobItem->instrumentItem());
// Create the not stored parameter tuning tree
diff --git a/GUI/Model/Model/JobModel.h b/GUI/Model/Model/JobModel.h
index 70877ed61aa..d317ae2697c 100644
--- a/GUI/Model/Model/JobModel.h
+++ b/GUI/Model/Model/JobModel.h
@@ -21,7 +21,7 @@ class InstrumentItem;
class JobItem;
class JobQueueData;
class MultiLayerItem;
-class RealDataItem;
+class RealItem;
class SimulationOptionsItem;
class JobModel : public SessionModel {
@@ -34,7 +34,7 @@ public:
JobItem* getJobItemForIdentifier(const QString& identifier);
JobItem* addJob(const MultiLayerItem* sampleItem, const InstrumentItem* instrumentItem,
- const RealDataItem* realDataItem, const SimulationOptionsItem& optionItem);
+ const RealItem* realDataItem, const SimulationOptionsItem& optionItem);
QVector<JobItem*> jobItems() const;
diff --git a/GUI/Model/Model/RealDataModel.cpp b/GUI/Model/Model/RealDataModel.cpp
index b446c716fa3..970753614fd 100644
--- a/GUI/Model/Model/RealDataModel.cpp
+++ b/GUI/Model/Model/RealDataModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Model/SessionXML.h"
RealDataModel::RealDataModel(QObject* parent)
@@ -30,7 +30,7 @@ QVector<SessionItem*> RealDataModel::nonXMLItems() const
{
QVector<SessionItem*> result;
- for (auto* realData : topItems<RealDataItem>()) {
+ for (auto* realData : topItems<RealItem>()) {
if (auto* intensityItem = realData->dataItem())
result.push_back(intensityItem);
if (auto* native_data_item = realData->nativeData())
@@ -54,47 +54,47 @@ void RealDataModel::readFrom(QXmlStreamReader* reader, MessageService* messageSe
emit realDataAddedOrRemoved();
}
-RealDataItem* RealDataModel::insertSpecularDataItem()
+RealItem* RealDataModel::insertSpecularDataItem()
{
- auto* r = insertItem<RealDataItem>();
+ auto* r = insertItem<RealItem>();
r->initAsSpecularItem();
return r;
}
-RealDataItem* RealDataModel::insertIntensityDataItem()
+RealItem* RealDataModel::insertIntensityDataItem()
{
- auto* r = insertItem<RealDataItem>();
+ auto* r = insertItem<RealItem>();
r->initAsIntensityItem();
return r;
}
-RealDataItem* RealDataModel::insertDataItem(int rank)
+RealItem* RealDataModel::insertDataItem(int rank)
{
return (rank == 1) ? insertSpecularDataItem() : insertIntensityDataItem();
}
-QVector<RealDataItem*> RealDataModel::realDataItems() const
+QVector<RealItem*> RealDataModel::realDataItems() const
{
- return topItems<RealDataItem>();
+ return topItems<RealItem>();
}
-QVector<RealDataItem*> RealDataModel::realDataItems(int rank) const
+QVector<RealItem*> RealDataModel::realDataItems(int rank) const
{
return rank == 1 ? realDataItems1D() : realDataItems2D();
}
-QVector<RealDataItem*> RealDataModel::realDataItems1D() const
+QVector<RealItem*> RealDataModel::realDataItems1D() const
{
- return topItems<RealDataItem>([](const RealDataItem& item) { return item.isSpecularData(); });
+ return topItems<RealItem>([](const RealItem& item) { return item.isSpecularData(); });
}
-QVector<RealDataItem*> RealDataModel::realDataItems2D() const
+QVector<RealItem*> RealDataModel::realDataItems2D() const
{
- return topItems<RealDataItem>([](const RealDataItem& item) { return !item.isSpecularData(); });
+ return topItems<RealItem>([](const RealItem& item) { return !item.isSpecularData(); });
}
-void RealDataModel::remove(RealDataItem* item)
+void RealDataModel::remove(RealItem* item)
{
removeItem(item);
}
diff --git a/GUI/Model/Model/RealDataModel.h b/GUI/Model/Model/RealDataModel.h
index e03903d1cd5..0e83554ecc0 100644
--- a/GUI/Model/Model/RealDataModel.h
+++ b/GUI/Model/Model/RealDataModel.h
@@ -17,9 +17,9 @@
#include "GUI/Model/Model/SessionModel.h"
-class RealDataItem;
+class RealItem;
-//! The RealDataModel class is a model to store all imported RealDataItem's.
+//! The RealDataModel class is a model to store all imported RealItem's.
class RealDataModel : public SessionModel {
Q_OBJECT
@@ -30,16 +30,16 @@ public:
QVector<SessionItem*> nonXMLItems() const override;
void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override;
- RealDataItem* insertSpecularDataItem();
- RealDataItem* insertIntensityDataItem();
- RealDataItem* insertDataItem(int rank);
- QVector<RealDataItem*> realDataItems() const;
- QVector<RealDataItem*> realDataItems(int rank) const;
+ RealItem* insertSpecularDataItem();
+ RealItem* insertIntensityDataItem();
+ RealItem* insertDataItem(int rank);
+ QVector<RealItem*> realDataItems() const;
+ QVector<RealItem*> realDataItems(int rank) const;
- QVector<RealDataItem*> realDataItems1D() const;
- QVector<RealDataItem*> realDataItems2D() const;
+ QVector<RealItem*> realDataItems1D() const;
+ QVector<RealItem*> realDataItems2D() const;
- void remove(RealDataItem* item);
+ void remove(RealItem* item);
QStringList realDataNames() const;
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index d266b5d0384..2109602c49a 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
@@ -76,7 +76,7 @@ LinkInstrumentManager::LinkInstrumentManager(ProjectDocument* document)
this, &LinkInstrumentManager::onInstrumentChanged);
}
-bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realDataItem,
+bool LinkInstrumentManager::canLinkDataToInstrument(const RealItem* realDataItem,
const QString& identifier, QWidget* parent)
{
auto* instrumentItem = m_document->collectedItems()->findInstrumentById(identifier);
@@ -115,7 +115,7 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realData
void LinkInstrumentManager::onInstrumentChanged(const InstrumentItem* instrument)
{
- // Run through all RealDataItem and refresh linking to match possible change in detector
+ // Run through all RealItem and refresh linking to match possible change in detector
// axes definition.
for (auto* realDataItem : m_document->realDataModel()->realDataItems())
if (realDataItem->instrumentId() == instrument->id()) {
diff --git a/GUI/Model/Project/LinkInstrumentManager.h b/GUI/Model/Project/LinkInstrumentManager.h
index a99362a66ae..adb7c3fabbe 100644
--- a/GUI/Model/Project/LinkInstrumentManager.h
+++ b/GUI/Model/Project/LinkInstrumentManager.h
@@ -21,11 +21,11 @@
#include <QVector>
class InstrumentItem;
-class RealDataItem;
+class RealItem;
class ProjectDocument;
//! The LinkInstrumentManager class provides communication between InstrumentCollection and
-//! RealDataModel. Particularly, it notifies RealDataItem about changes in linked instruments
+//! RealDataModel. Particularly, it notifies RealItem about changes in linked instruments
//! to adjust axes of IntensityDataItem.
class LinkInstrumentManager : public QObject {
@@ -34,16 +34,16 @@ class LinkInstrumentManager : public QObject {
public:
LinkInstrumentManager(ProjectDocument* document);
- //! Returns true if RealDataItem can be linked to the instrument (same number of bins).
+ //! Returns true if RealItem can be linked to the instrument (same number of bins).
//! Also offers dialog to adjust instrument to match shape of real data.
//! 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 RealDataItem* realDataItem, const QString& identifier,
+ bool canLinkDataToInstrument(const RealItem* realDataItem, const QString& identifier,
QWidget* parent);
signals:
- void linkToInstrumentChanged(const RealDataItem* realDataItem);
+ void linkToInstrumentChanged(const RealItem* realDataItem);
private:
void onInstrumentChanged(const InstrumentItem* instrument);
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index af0826c0ec3..1d3808e4bb2 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/RealDataModel.h"
@@ -190,7 +190,7 @@ void ProjectDocument::updateNonXMLDataFileNames()
// store the current modified status of the document
const bool modified0 = m_modified;
// updating non-XML-data filenames will trigget a modified document state
- for (RealDataItem* d : realDataModel()->realDataItems())
+ for (RealItem* d : realDataModel()->realDataItems())
d->updateNonXMLDataFileNames();
// restore the previous modified state of the document
m_modified = modified0;
diff --git a/GUI/Support/IO/AbstractDataLoader.cpp b/GUI/Support/IO/AbstractDataLoader.cpp
index 5e3cea29fb6..1d097b24b2f 100644
--- a/GUI/Support/IO/AbstractDataLoader.cpp
+++ b/GUI/Support/IO/AbstractDataLoader.cpp
@@ -62,17 +62,17 @@ QByteArray AbstractDataLoader::fileContent() const
return {};
}
-void AbstractDataLoader::setRealDataItem(RealDataItem* item)
+void AbstractDataLoader::setRealDataItem(RealItem* item)
{
m_item = item;
}
-RealDataItem* AbstractDataLoader::realDataItem()
+RealItem* AbstractDataLoader::realDataItem()
{
return m_item;
}
-const RealDataItem* AbstractDataLoader::realDataItem() const
+const RealItem* AbstractDataLoader::realDataItem() const
{
return m_item;
}
diff --git a/GUI/Support/IO/AbstractDataLoader.h b/GUI/Support/IO/AbstractDataLoader.h
index 26adcf5f026..e7d9ce5c7d0 100644
--- a/GUI/Support/IO/AbstractDataLoader.h
+++ b/GUI/Support/IO/AbstractDataLoader.h
@@ -20,7 +20,7 @@ class QByteArray;
class QGroupBox;
class QCustomPlot;
class QTableWidget;
-class RealDataItem;
+class RealItem;
class AbstractDataLoaderResultModel;
#include <QtCore>
@@ -39,13 +39,13 @@ public:
virtual QString persistentClassName() const = 0;
//! Define the real data item on which the import shall work.
- void setRealDataItem(RealDataItem* item);
+ void setRealDataItem(RealItem* item);
//! The real data item on which the import shall work.
- RealDataItem* realDataItem();
+ RealItem* realDataItem();
//! The real data item on which the import shall work.
- const RealDataItem* realDataItem() const;
+ const RealItem* realDataItem() const;
//! Fills the widget on the import dialog pane.
//! The implementation here in the base class does nothing
@@ -121,7 +121,7 @@ signals:
void contentsProcessed();
protected:
- RealDataItem* m_item; //!< The real-data-item which owns this loader. Never delete this!
+ RealItem* m_item; //!< The real-data-item which owns this loader. Never delete this!
};
QDataStream& operator<<(QDataStream& stream, const AbstractDataLoader& s);
diff --git a/GUI/View/Common/DataAccessWidget.cpp b/GUI/View/Common/DataAccessWidget.cpp
index 4a4563a1d12..4acc509b076 100644
--- a/GUI/View/Common/DataAccessWidget.cpp
+++ b/GUI/View/Common/DataAccessWidget.cpp
@@ -48,9 +48,9 @@ JobItem* DataAccessWidget::jobItem() const
return dynamic_cast<JobItem*>(m_item);
}
-RealDataItem* DataAccessWidget::realItem() const
+RealItem* DataAccessWidget::realItem() const
{
- return dynamic_cast<RealDataItem*>(m_item);
+ return dynamic_cast<RealItem*>(m_item);
}
JobRealBase* DataAccessWidget::jobRealBase() const
diff --git a/GUI/View/Common/DataAccessWidget.h b/GUI/View/Common/DataAccessWidget.h
index e01f4662295..c66549b2203 100644
--- a/GUI/View/Common/DataAccessWidget.h
+++ b/GUI/View/Common/DataAccessWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
#define BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include <QWidget>
@@ -39,7 +39,7 @@ public:
virtual QList<QAction*> actionList();
JobItem* jobItem() const;
- RealDataItem* realItem() const;
+ RealItem* realItem() const;
JobRealBase* jobRealBase() const;
// Access to concrete items:
@@ -123,7 +123,7 @@ template <class T>
T* DataAccessWidget::realDataItem() const
{
if (jobItem()) {
- RealDataItem* real_item_from_job = jobItem()->realDataItem();
+ RealItem* real_item_from_job = jobItem()->realDataItem();
if (real_item_from_job)
return dynamic_cast<T*>(real_item_from_job->dataItem());
else
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 1a93871e37b..497760986a8 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -16,7 +16,7 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
diff --git a/GUI/View/Import/ImportDataUtils.cpp b/GUI/View/Import/ImportDataUtils.cpp
index 3709c6e5be0..a632b729207 100644
--- a/GUI/View/Import/ImportDataUtils.cpp
+++ b/GUI/View/Import/ImportDataUtils.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Import/ImportDataUtils.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Support/IO/IOUtils.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/View/Loaders/QREDataLoader.h"
@@ -59,7 +59,7 @@ GUI::View::ImportDataUtils::Import2dData(const QString& fileName, IOFactory::Loa
return ImportKnownData(fileName, loader);
}
-QString GUI::View::ImportDataUtils::Import1dData(RealDataItem* realDataItem,
+QString GUI::View::ImportDataUtils::Import1dData(RealItem* realDataItem,
const AbstractDataLoader* selectedLoader)
{
const QString fileName = realDataItem->nativeFileName();
diff --git a/GUI/View/Import/ImportDataUtils.h b/GUI/View/Import/ImportDataUtils.h
index 62cfe9a5c4f..49dd026a7cf 100644
--- a/GUI/View/Import/ImportDataUtils.h
+++ b/GUI/View/Import/ImportDataUtils.h
@@ -20,7 +20,7 @@
#include <memory>
class Datafield;
-class RealDataItem;
+class RealItem;
class InstrumentItem;
class AbstractDataLoader;
@@ -39,7 +39,7 @@ std::unique_ptr<Datafield> Import2dData(const QString& fileName, IOFactory::Load
//! by different import settings or by using a different data loader.
//! Argument selectedLoader is the one which was selected in the open-file-dialog
//! (or null if none selected).
-QString Import1dData(RealDataItem* realDataItem, const AbstractDataLoader* selectedLoader);
+QString Import1dData(RealItem* realDataItem, const AbstractDataLoader* selectedLoader);
} // namespace GUI::View::ImportDataUtils
diff --git a/GUI/View/Import/ImportDataView.cpp b/GUI/View/Import/ImportDataView.cpp
index 7dd463dc24d..4c17469348f 100644
--- a/GUI/View/Import/ImportDataView.cpp
+++ b/GUI/View/Import/ImportDataView.cpp
@@ -68,7 +68,7 @@ ImportDataView::ImportDataView(QWidget* parent, ProjectDocument* document)
onSelectionChanged(m_selectorWidget->currentItem());
}
-void ImportDataView::onSelectionChanged(RealDataItem* realItem)
+void ImportDataView::onSelectionChanged(RealItem* realItem)
{
m_stackedWidget->setItem(realItem);
}
diff --git a/GUI/View/Import/ImportDataView.h b/GUI/View/Import/ImportDataView.h
index 640a9251958..fabcf6dde02 100644
--- a/GUI/View/Import/ImportDataView.h
+++ b/GUI/View/Import/ImportDataView.h
@@ -30,7 +30,7 @@ public:
ImportDataView(QWidget* parent, ProjectDocument* document);
public slots:
- void onSelectionChanged(RealDataItem* realItem);
+ void onSelectionChanged(RealItem* realItem);
private:
//! Show/hide UI elements according to settings in current project
diff --git a/GUI/View/Import/RealDataMaskWidget.h b/GUI/View/Import/RealDataMaskWidget.h
index 763bf95278d..c2b76886aca 100644
--- a/GUI/View/Import/RealDataMaskWidget.h
+++ b/GUI/View/Import/RealDataMaskWidget.h
@@ -22,7 +22,7 @@ class MaskEditorActions;
class MaskEditorToolbar;
class MaskEditorCanvas;
-//! The RealDataMaskWidget class provides mask editing for RealDataItem on ImportDataView.
+//! The RealDataMaskWidget class provides mask editing for RealItem on ImportDataView.
class RealDataMaskWidget : public DataAccessWidget {
Q_OBJECT
diff --git a/GUI/View/Import/RealDataPresenter.h b/GUI/View/Import/RealDataPresenter.h
index 523e2719764..7e5349956db 100644
--- a/GUI/View/Import/RealDataPresenter.h
+++ b/GUI/View/Import/RealDataPresenter.h
@@ -17,7 +17,7 @@
#include "GUI/View/Common/ItemComboWidget.h"
-//! Presents imported data (RealDataItem) using stack of different widgets and combo box in the
+//! Presents imported data (RealItem) using stack of different widgets and combo box in the
//! right top corner of ImportDataView, to switch between widgets.
class RealDataPresenter : public ItemComboWidget {
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 8c0fab804d1..65a9078e51e 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsEditController.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
@@ -63,7 +63,7 @@ RealDataPropertiesWidget::RealDataPropertiesWidget(QWidget* parent, ProjectDocum
this, &RealDataPropertiesWidget::updateInstrumentComboIndex);
}
-void RealDataPropertiesWidget::setRealItem(RealDataItem* realItem)
+void RealDataPropertiesWidget::setRealItem(RealItem* realItem)
{
m_currentRealItem = realItem;
updateInstrumentComboIndex();
diff --git a/GUI/View/Import/RealDataPropertiesWidget.h b/GUI/View/Import/RealDataPropertiesWidget.h
index 93bf77d9c40..6cd1c677f96 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.h
+++ b/GUI/View/Import/RealDataPropertiesWidget.h
@@ -17,11 +17,11 @@
#include <QWidget>
-class RealDataItem;
+class RealItem;
class QComboBox;
class ProjectDocument;
-//! The RealDataPropertiesWidget class holds instrument selector to link with RealDataItem.
+//! The RealDataPropertiesWidget class holds instrument selector to link with RealItem.
//! Part of RealDataSelectorWidget, resides at lower left corner of ImportDataView.
class RealDataPropertiesWidget : public QWidget {
@@ -32,11 +32,11 @@ public:
QSize sizeHint() const override { return QSize(64, 135); }
QSize minimumSizeHint() const override { return QSize(64, 128); }
- //! Set current RealDataItem to display in instrument selector.
- void setRealItem(RealDataItem* realItem);
+ //! Set current RealItem to display in instrument selector.
+ void setRealItem(RealItem* realItem);
signals:
- void instrumentUpdated(RealDataItem* realItem);
+ void instrumentUpdated(RealItem* realItem);
private:
//! Processes user interaction with instrument selector combo. If there is realDataItem,
@@ -47,7 +47,7 @@ private:
void updateInstrumentComboIndex();
QComboBox* m_instrumentCombo;
- RealDataItem* m_currentRealItem;
+ RealItem* m_currentRealItem;
ProjectDocument* m_document;
};
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 2e9d36f7cad..5467f275412 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -16,7 +16,7 @@
#include "Device/Data/DataUtils.h"
#include "Device/Data/Datafield.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
@@ -144,12 +144,12 @@ QSize RealDataSelectorWidget::minimumSizeHint() const
return QSize(128, 200);
}
-RealDataItem* RealDataSelectorWidget::currentItem()
+RealItem* RealDataSelectorWidget::currentItem()
{
return m_itemTreeModel->itemForIndex(currentIndex());
}
-void RealDataSelectorWidget::setCurrentItem(RealDataItem* item)
+void RealDataSelectorWidget::setCurrentItem(RealItem* item)
{
m_itemTree->selectionModel()->clearSelection();
QModelIndex index = m_itemTreeModel->indexForItem(item);
@@ -248,7 +248,7 @@ void RealDataSelectorWidget::importData1D()
const AbstractDataLoader* selectedLoader = loaderOfFilter.value(selectedFilter, nullptr);
for (const auto& fileName : fileNames) {
- RealDataItem* realDataItem = m_itemTreeModel->insertSpecularDataItem();
+ RealItem* realDataItem = m_itemTreeModel->insertSpecularDataItem();
realDataItem->setDataName(QFileInfo(fileName).baseName());
realDataItem->setNativeFileName(fileName);
@@ -303,7 +303,7 @@ void RealDataSelectorWidget::importData2D()
GUI::View::ImportDataUtils::Import2dData(fileName, selectedLoader);
if (!data)
continue;
- RealDataItem* realDataItem = m_itemTreeModel->insertIntensityDataItem();
+ RealItem* realDataItem = m_itemTreeModel->insertIntensityDataItem();
realDataItem->setDataName(QFileInfo(fileName).baseName());
try {
@@ -344,7 +344,7 @@ void RealDataSelectorWidget::updateActionEnabling()
updateActionEnabling(currentItem());
}
-void RealDataSelectorWidget::updateActionEnabling(const RealDataItem* item) const
+void RealDataSelectorWidget::updateActionEnabling(const RealItem* item) const
{
m_import2dDataAction->setEnabled(true);
m_import1dDataAction->setEnabled(true);
diff --git a/GUI/View/Import/RealDataSelectorWidget.h b/GUI/View/Import/RealDataSelectorWidget.h
index 9ee62a27e18..1d1749b914a 100644
--- a/GUI/View/Import/RealDataSelectorWidget.h
+++ b/GUI/View/Import/RealDataSelectorWidget.h
@@ -25,7 +25,7 @@ class InstrumentCollection;
class RealDataModel;
class SessionItem;
class RealDataSelectorActions;
-class RealDataItem;
+class RealItem;
class RealDataTreeModel;
class QItemSelection;
class QTreeView;
@@ -44,18 +44,18 @@ public:
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
- RealDataItem* currentItem();
- void setCurrentItem(RealDataItem* item);
+ RealItem* currentItem();
+ void setCurrentItem(RealItem* item);
signals:
- void selectionChanged(RealDataItem*);
+ void selectionChanged(RealItem*);
private:
void onSelectionChanged();
void renameCurrentItem();
void removeCurrentItem();
void updateActionEnabling();
- void updateActionEnabling(const RealDataItem* item) const;
+ void updateActionEnabling(const RealItem* item) const;
void updateFunctionalities();
void onContextMenuRequest(const QPoint& point);
void importData1D();
diff --git a/GUI/View/Import/RealDataTreeModel.cpp b/GUI/View/Import/RealDataTreeModel.cpp
index fd1c757b04d..a8089e7f302 100644
--- a/GUI/View/Import/RealDataTreeModel.cpp
+++ b/GUI/View/Import/RealDataTreeModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Model/RealDataModel.h"
#include <QApplication>
#include <QtCore>
@@ -71,7 +71,7 @@ void RealDataTreeModel::clear()
updateSubscriptions();
}
-void RealDataTreeModel::removeItem(RealDataItem* item)
+void RealDataTreeModel::removeItem(RealItem* item)
{
QModelIndex index = indexForItem(item);
if (!index.isValid())
@@ -90,17 +90,17 @@ void RealDataTreeModel::removeItem(RealDataItem* item)
}
}
-RealDataItem* RealDataTreeModel::insertSpecularDataItem()
+RealItem* RealDataTreeModel::insertSpecularDataItem()
{
return insertDataItem(1);
}
-RealDataItem* RealDataTreeModel::insertIntensityDataItem()
+RealItem* RealDataTreeModel::insertIntensityDataItem()
{
return insertDataItem(2);
}
-RealDataItem* RealDataTreeModel::insertDataItem(int rank)
+RealItem* RealDataTreeModel::insertDataItem(int rank)
{
auto* newItem = m_model->insertDataItem(rank);
if (!m_visibleRanks.contains(rank))
@@ -114,7 +114,7 @@ RealDataItem* RealDataTreeModel::insertDataItem(int rank)
return newItem;
}
-RealDataItem* RealDataTreeModel::topMostItem() const
+RealItem* RealDataTreeModel::topMostItem() const
{
if (!m_items[0].isEmpty() && m_visibleRanks.contains(1))
return m_items[0].first();
@@ -283,15 +283,15 @@ bool RealDataTreeModel::setData(const QModelIndex& index, const QVariant& value,
return false;
}
-RealDataItem* RealDataTreeModel::itemForIndex(const QModelIndex& index) const
+RealItem* RealDataTreeModel::itemForIndex(const QModelIndex& index) const
{
if (!index.isValid())
return nullptr;
- return reinterpret_cast<RealDataItem*>(index.internalPointer());
+ return reinterpret_cast<RealItem*>(index.internalPointer());
}
-QModelIndex RealDataTreeModel::indexForItem(RealDataItem* item) const
+QModelIndex RealDataTreeModel::indexForItem(RealItem* item) const
{
if (item == nullptr)
return QModelIndex();
@@ -315,15 +315,15 @@ bool RealDataTreeModel::isHeadline(const QModelIndex& index) const
void RealDataTreeModel::updateSubscriptions()
{
for (auto* item : m_items[0])
- connect(item, &RealDataItem::importContentsProcessed, this,
+ connect(item, &RealItem::importContentsProcessed, this,
[=]() { onContentsProcessed(item); });
for (auto* item : m_items[1])
- connect(item, &RealDataItem::importContentsProcessed, this,
+ connect(item, &RealItem::importContentsProcessed, this,
[=]() { onContentsProcessed(item); });
}
-void RealDataTreeModel::onContentsProcessed(RealDataItem* item)
+void RealDataTreeModel::onContentsProcessed(RealItem* item)
{
QModelIndex index = indexForItem(item);
emit dataChanged(index, index);
diff --git a/GUI/View/Import/RealDataTreeModel.h b/GUI/View/Import/RealDataTreeModel.h
index 08f8193069f..4ca380801a7 100644
--- a/GUI/View/Import/RealDataTreeModel.h
+++ b/GUI/View/Import/RealDataTreeModel.h
@@ -19,7 +19,7 @@
#include <QSet>
class RealDataModel;
-class RealDataItem;
+class RealItem;
//! Tree model for real data item selection. Used for the tree in the import view.
class RealDataTreeModel : public QAbstractItemModel {
@@ -36,30 +36,30 @@ public:
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags(const QModelIndex& index) const override;
bool setData(const QModelIndex& index, const QVariant& value, int role) override;
- RealDataItem* itemForIndex(const QModelIndex& index) const;
- QModelIndex indexForItem(RealDataItem* item) const;
+ RealItem* itemForIndex(const QModelIndex& index) const;
+ QModelIndex indexForItem(RealItem* item) const;
void refreshAfterModelChange();
- void removeItem(RealDataItem* item);
- RealDataItem* insertSpecularDataItem();
- RealDataItem* insertIntensityDataItem();
- RealDataItem* insertDataItem(int rank);
+ void removeItem(RealItem* item);
+ RealItem* insertSpecularDataItem();
+ RealItem* insertIntensityDataItem();
+ RealItem* insertDataItem(int rank);
//! The topmost visible item. Can be null of course.
- RealDataItem* topMostItem() const;
+ RealItem* topMostItem() const;
QModelIndex indexOfHeadline(int rank) const;
bool isHeadline(const QModelIndex& index) const;
private:
void updateSubscriptions();
- void onContentsProcessed(RealDataItem* item);
+ void onContentsProcessed(RealItem* item);
void clear();
private:
RealDataModel* m_model = nullptr;
- QVector<RealDataItem*> m_items[2]; //< Items borrowed from realDataModel. Never delete the ptrs!
+ QVector<RealItem*> m_items[2]; //< Items borrowed from realDataModel. Never delete the ptrs!
QSet<int> m_visibleRanks;
};
diff --git a/GUI/View/Import/SpecularDataImportWidget.h b/GUI/View/Import/SpecularDataImportWidget.h
index c3170abb4b0..c4c14d086f9 100644
--- a/GUI/View/Import/SpecularDataImportWidget.h
+++ b/GUI/View/Import/SpecularDataImportWidget.h
@@ -22,7 +22,7 @@
class SpecularDataItem;
class AbstractDataLoader;
-class RealDataItem;
+class RealItem;
namespace Ui {
diff --git a/GUI/View/Instrument/InstrumentEditController.h b/GUI/View/Instrument/InstrumentEditController.h
index 06a1ae7a472..585ad9c9e68 100644
--- a/GUI/View/Instrument/InstrumentEditController.h
+++ b/GUI/View/Instrument/InstrumentEditController.h
@@ -18,7 +18,7 @@
#include <QObject>
class InstrumentItem;
-class RealDataItem;
+class RealItem;
class InstrumentsEditController;
class DoubleDescriptor;
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index 511cf2310ea..458d0b9fbea 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Loaders/AutomaticDataLoader1D.h"
#include "Device/IO/ReadReflectometry.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Util/DeserializationException.h"
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
index 51a0de9c99b..de06064600f 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
@@ -14,10 +14,10 @@
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
#include "Base/Axis/Frame.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
-AutomaticDataLoader1DResultModel::AutomaticDataLoader1DResultModel(RealDataItem* item)
+AutomaticDataLoader1DResultModel::AutomaticDataLoader1DResultModel(RealItem* item)
: m_item(item)
{
}
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h
index 64c9109024d..31d2a964972 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h
@@ -17,12 +17,12 @@
#include "GUI/Support/IO/AbstractDataLoaderResultModel.h"
-class RealDataItem;
+class RealItem;
//! The result model of a AutomaticDataLoader1D (for showing the import results in a table view).
class AutomaticDataLoader1DResultModel : public AbstractDataLoaderResultModel {
public:
- AutomaticDataLoader1DResultModel(RealDataItem* item);
+ AutomaticDataLoader1DResultModel(RealItem* item);
protected:
bool rowIsSkipped(int row) const override;
@@ -37,7 +37,7 @@ protected:
using AbstractDataLoaderResultModel::rowCount;
private:
- RealDataItem* m_item;
+ RealItem* m_item;
};
#endif // BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 041ef9598fb..3c8445a203c 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loaders/QREDataLoader.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Coord/AxisNames.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Util/CoordName.h"
#include "GUI/Util/DeserializationException.h"
@@ -519,7 +519,7 @@ void QREDataLoader::calculateFromParseResult() const
}
}
-void QREDataLoader::datafieldFromParsingResult(RealDataItem* item) const
+void QREDataLoader::datafieldFromParsingResult(RealItem* item) const
{
// create data sorted by ascending Q values.
// For this, the line numbers are sorted by Q
diff --git a/GUI/View/Loaders/QREDataLoader.h b/GUI/View/Loaders/QREDataLoader.h
index 3e69ef7ffce..d034d9d2b57 100644
--- a/GUI/View/Loaders/QREDataLoader.h
+++ b/GUI/View/Loaders/QREDataLoader.h
@@ -49,7 +49,7 @@ public:
private:
void parseFileContent() const;
void calculateFromParseResult() const;
- void datafieldFromParsingResult(RealDataItem* item) const;
+ void datafieldFromParsingResult(RealItem* item) const;
private:
enum class UnitInFile { none, perNanoMeter, perAngstrom, other };
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 3c07bc26583..d327f8ad797 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SimulationView.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
@@ -241,7 +241,7 @@ QVector<InstrumentItem*> SimulationView::collectedItems() const
return m_document->collectedItems()->collectedItems();
}
-QVector<RealDataItem*> SimulationView::realDataItems() const
+QVector<RealItem*> SimulationView::realDataItems() const
{
return m_document->realDataModel()->realDataItems();
}
@@ -261,7 +261,7 @@ const InstrumentItem* SimulationView::selectedInstrument() const
return collectedItems().value(m_ui->instrumentCombo->currentIndex(), nullptr);
}
-const RealDataItem* SimulationView::selectedRealData() const
+const RealItem* SimulationView::selectedRealData() const
{
return realDataItems().value(m_ui->realDataCombo->currentIndex() - 1, nullptr); // -1: "None"
}
diff --git a/GUI/View/Toplevel/SimulationView.h b/GUI/View/Toplevel/SimulationView.h
index 73944cc6e6a..ae3003966db 100644
--- a/GUI/View/Toplevel/SimulationView.h
+++ b/GUI/View/Toplevel/SimulationView.h
@@ -20,7 +20,7 @@
class MainWindow;
class MultiLayerItem;
class InstrumentItem;
-class RealDataItem;
+class RealItem;
class QComboBox;
class SimulationOptionsItem;
class ProjectDocument;
@@ -68,7 +68,7 @@ private:
//! Returns selected real data item taking into account that there might be several
//! items with the same name.
- const RealDataItem* selectedRealData() const;
+ const RealItem* selectedRealData() const;
//! Updates selection combo with string list while preserving previous selection.
//! If allowNone == true, additional "None" item will be added to the combo.
@@ -84,7 +84,7 @@ private:
// Convenience methods for easier access
QVector<MultiLayerItem*> sampleItems() const;
QVector<InstrumentItem*> collectedItems() const;
- QVector<RealDataItem*> realDataItems() const;
+ QVector<RealItem*> realDataItems() const;
SimulationOptionsItem* optionsItem() const;
private:
diff --git a/Tests/Unit/GUI/TestIOService.cpp b/Tests/Unit/GUI/TestIOService.cpp
index 4930e3bbd64..7c7522e689e 100644
--- a/Tests/Unit/GUI/TestIOService.cpp
+++ b/Tests/Unit/GUI/TestIOService.cpp
@@ -2,7 +2,7 @@
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/ApplicationModels.h"
#include "GUI/Model/Model/JobFunctions.h"
@@ -34,7 +34,7 @@ TEST_F(TestIOService, nonXMLData)
auto dataItems = models.nonXMLItems();
EXPECT_EQ(dataItems.size(), 0);
- // adding RealDataItem
+ // adding RealItem
auto* realData = models.realDataModel()->insertIntensityDataItem();
realData->setDatafield(UTest::GUI::createData().release());
EXPECT_EQ(models.realDataModel()->nonXMLItems().size(), 1);
@@ -44,8 +44,8 @@ TEST_F(TestIOService, nonXMLData)
auto* dataItem = jobItem->setDataType<IntensityDataItem>();
EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 1);
- // adding RealDataItem to jobItem
- RealDataItem* realData2 = jobItem->createRealDataItem();
+ // adding RealItem to jobItem
+ RealItem* realData2 = jobItem->createRealDataItem();
EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 1);
realData2->setDatafield(UTest::GUI::createData(0.0, UTest::GUI::DIM::D1).release());
EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 2);
@@ -61,13 +61,13 @@ TEST_F(TestIOService, nonXMLData)
EXPECT_EQ(dataItems.indexOf(dataItem), 1);
EXPECT_EQ(dataItems.indexOf(realData2->dataItem()), 2);
- // Replacing the data inside RealDataItem with the data of the same dimensions
+ // Replacing the data inside RealItem with the data of the same dimensions
realData->setDatafield(UTest::GUI::createData(2.0).release());
EXPECT_EQ(models.realDataModel()->nonXMLItems().size(), 1);
- // Replacing the data inside RealDataItem with the data of different dimensions
+ // Replacing the data inside RealItem with the data of different dimensions
auto data = UTest::GUI::createData(3.0, UTest::GUI::DIM::D1);
- EXPECT_THROW(dynamic_cast<RealDataItem*>(realData)->setDatafield(data.get()), Error);
+ EXPECT_THROW(dynamic_cast<RealItem*>(realData)->setDatafield(data.get()), Error);
EXPECT_EQ(models.realDataModel()->nonXMLItems().size(), 1);
}
@@ -179,8 +179,8 @@ TEST_F(TestIOService, IOService)
const double value1(1.0), value2(2.0), value3(3.0);
ApplicationModels models;
- RealDataItem* realData1 = UTest::GUI::createRealData("data1", *models.realDataModel(), value1);
- RealDataItem* realData2 = UTest::GUI::createRealData("data2", *models.realDataModel(), value2);
+ RealItem* realData1 = UTest::GUI::createRealData("data1", *models.realDataModel(), value1);
+ RealItem* realData2 = UTest::GUI::createRealData("data2", *models.realDataModel(), value2);
realData1->updateNonXMLDataFileNames();
realData2->updateNonXMLDataFileNames();
@@ -236,7 +236,7 @@ TEST_F(TestIOService, RealDataItemWithNativeData)
auto dataItems = models.nonXMLItems();
EXPECT_EQ(dataItems.size(), 0);
- // adding RealDataItem
+ // adding RealItem
auto* realData = models.realDataModel()->insertIntensityDataItem();
EXPECT_EQ(models.realDataModel()->nonXMLItems().size(), 1);
@@ -254,7 +254,7 @@ TEST_F(TestIOService, RealDataItemWithNativeData)
jobItem->setDataType<IntensityDataItem>();
EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 1);
- // copying RealDataItem to JobItem
+ // copying RealItem to JobItem
GUI::Model::JobFunctions::copyRealDataItem(jobItem, realData);
EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 3);
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index cf945544b7c..d1711cdde9a 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,5 +1,5 @@
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
@@ -14,12 +14,12 @@
class TestLinkInstrument : public ::testing::Test {
};
-QList<RealDataItem*> linkedRealDataItems(RealDataModel& realDataModel,
+QList<RealItem*> linkedRealDataItems(RealDataModel& realDataModel,
const InstrumentItem* instrumentItem)
{
ASSERT(instrumentItem);
- QList<RealDataItem*> result;
+ QList<RealItem*> result;
for (auto* realDataItem : realDataModel.realDataItems()) {
const QString linkedIdentifier = realDataItem->instrumentId();
const QString instrumentIdentifier = instrumentItem->id();
@@ -40,7 +40,7 @@ TEST_F(TestLinkInstrument, canLinkToInstrument)
ASSERT_TRUE(!identifier.isEmpty());
// populating real data model, setting intensity data
- RealDataItem* realData = UTest::GUI::createRealData("RealData", *document.realDataModel());
+ RealItem* realData = UTest::GUI::createRealData("RealData", *document.realDataModel());
GUI::Model::JobItemUtils::createDefaultDetectorMap(realData->dataItem(), instrument);
ASSERT_TRUE(
@@ -48,12 +48,12 @@ TEST_F(TestLinkInstrument, canLinkToInstrument)
// making link
realData->linkToInstrument(instrument);
- EXPECT_EQ(linkedRealDataItems(*document.realDataModel(), instrument), QList<RealDataItem*>()
+ EXPECT_EQ(linkedRealDataItems(*document.realDataModel(), instrument), QList<RealItem*>()
<< realData);
// changing detector type and checking that link remain
instrument->setDetectorType<RectangularDetectorItem>();
- EXPECT_EQ(linkedRealDataItems(*document.realDataModel(), instrument), QList<RealDataItem*>()
+ EXPECT_EQ(linkedRealDataItems(*document.realDataModel(), instrument), QList<RealItem*>()
<< realData);
// changing detector binning and checking that link is destroyed
@@ -61,6 +61,6 @@ TEST_F(TestLinkInstrument, canLinkToInstrument)
detectorItem->setXSize(10);
document.instrumentsEditController()->notifyInstrumentChanged(instrument);
- EXPECT_EQ(linkedRealDataItems(*document.realDataModel(), instrument), QList<RealDataItem*>());
+ EXPECT_EQ(linkedRealDataItems(*document.realDataModel(), instrument), QList<RealItem*>());
EXPECT_EQ(realData->instrumentId(), QString());
}
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 683a01e6a56..caa2d542b18 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,6 +1,6 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
@@ -72,7 +72,7 @@ TEST_F(TestProjectDocument, projectDocumentWithData)
ProjectDocument document;
auto* instrument = document.collectedItems()->addInstrument<GISASInstrumentItem>();
instrument->setInstrumentName("GISAS");
- RealDataItem* realData = UTest::GUI::createRealData("TestData", *document.realDataModel());
+ RealItem* realData = UTest::GUI::createRealData("TestData", *document.realDataModel());
ASSERT(realData);
DataItem* intensityItem = realData->dataItem();
GUI::Model::JobItemUtils::createDefaultDetectorMap(
diff --git a/Tests/Unit/GUI/TestRealDataModel.cpp b/Tests/Unit/GUI/TestRealDataModel.cpp
index 4a56ae3c5a8..07ed81a4956 100644
--- a/Tests/Unit/GUI/TestRealDataModel.cpp
+++ b/Tests/Unit/GUI/TestRealDataModel.cpp
@@ -1,6 +1,6 @@
#include "Base/Axis/PointwiseAxis.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index c0b98946717..5d106ff0a8e 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,6 +1,6 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
@@ -176,7 +176,7 @@ TEST_F(TestSaveService, saveServiceWithData)
auto* instrument = document->collectedItems()->addInstrument<GISASInstrumentItem>();
instrument->setInstrumentName("GISAS");
- RealDataItem* realData = UTest::GUI::createRealData("TestData", *document->realDataModel());
+ RealItem* realData = UTest::GUI::createRealData("TestData", *document->realDataModel());
ASSERT(realData);
DataItem* intensityItem = realData->dataItem();
GUI::Model::JobItemUtils::createDefaultDetectorMap(
@@ -211,7 +211,7 @@ TEST_F(TestSaveService, autosaveEnabled)
auto* instrument = document->collectedItems()->addInstrument<GISASInstrumentItem>();
instrument->setInstrumentName("GISAS");
- RealDataItem* realData = UTest::GUI::createRealData("TestData", *document->realDataModel());
+ RealItem* realData = UTest::GUI::createRealData("TestData", *document->realDataModel());
DataItem* intensityItem = realData->dataItem();
GUI::Model::JobItemUtils::createDefaultDetectorMap(
intensityItem, document->collectedItems()->instrument2DItems().front());
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 97ba971fd26..1f53450efb4 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,6 +1,6 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentCollection.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Job/JobItem.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index d614bacfba4..aac12fe40cc 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -18,7 +18,7 @@
#include "Device/Histo/DiffUtil.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
@@ -53,10 +53,10 @@ std::unique_ptr<Datafield> UTest::GUI::createData(double value, DIM n_dim)
return result;
}
-RealDataItem* UTest::GUI::createRealData(const QString& name, SessionModel& model, double value,
+RealItem* UTest::GUI::createRealData(const QString& name, SessionModel& model, double value,
DIM n_dim)
{
- auto* result = model.insertItem<RealDataItem>();
+ auto* result = model.insertItem<RealItem>();
result->setDatafield(createData(value, n_dim).release());
result->setDataName(name);
return result;
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 0872f5fec12..493dad8b88b 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -22,7 +22,7 @@
#include <QXmlStreamWriter>
class Datafield;
-class RealDataItem;
+class RealItem;
namespace UTest::GUI {
@@ -36,7 +36,7 @@ void create_dir(const QString& dir_name);
std::unique_ptr<Datafield> createData(double value = 0.0, DIM n_dim = DIM::D2);
//! Creates real data item initialized with Datafield for testing purposes
-RealDataItem* createRealData(const QString& name, SessionModel& model, double value = 0.0,
+RealItem* createRealData(const QString& name, SessionModel& model, double value = 0.0,
DIM n_dim = DIM::D2);
//! Converts property to XML string
--
GitLab