Models: nonXMLItems --> dataItems && SessionItem --> DataItem

GUI/Model/Model/ApplicationModels.cpp

@@ -64,10 +64,10 @@ void ApplicationModels::readFrom(QXmlStreamReader* reader, MessageService* messa
 }
 
 
-QVector<SessionItem*> ApplicationModels::nonXMLItems() const
+QVector<DataItem*> ApplicationModels::dataItems() const
 {
     ASSERT(m_realDataModel && m_jobModel);
-    return QVector<SessionItem*>() << m_realDataModel->nonXMLItems() << m_jobModel->nonXMLItems();
+    return QVector<DataItem*>() << m_realDataModel->dataItems() << m_jobModel->dataItems();
 }
 
 void ApplicationModels::connectModel(SessionModel* model) const

GUI/Model/Model/ApplicationModels.h

@@ -18,7 +18,7 @@
 #include <QObject>
 
 class SessionModel;
-class SessionItem;
+class DataItem;
 class DocumentModel;
 class InstrumentCollection;
 class RealModel;
@@ -36,8 +36,8 @@ public:
     void writeTo(class QXmlStreamWriter* writer);
     void readFrom(class QXmlStreamReader* reader, MessageService* messageService);
 
-    //! Returns all non-XML items
-    QVector<SessionItem*> nonXMLItems() const;
+    //! Returns all data items
+    QVector<DataItem*> dataItems() const;
 
 signals:
     void modelChanged();

GUI/Model/Model/JobModel.cpp

@@ -109,9 +109,9 @@ void JobModel::clear()
     SessionModel::clear();
 }
 
-QVector<SessionItem*> JobModel::nonXMLItems() const
+QVector<DataItem*> JobModel::dataItems() const
 {
-    QVector<SessionItem*> result;
+    QVector<DataItem*> result;
 
     for (auto* jobItem : jobItems()) {
         if (auto* dataItem = jobItem->simulatedDataItem())

GUI/Model/Model/JobModel.h

@@ -22,6 +22,7 @@ class JobItem;
 class JobQueueData;
 class MultiLayerItem;
 class RealItem;
+class DataItem;
 class SimulationOptionsItem;
 
 class JobModel : public SessionModel {
@@ -43,7 +44,7 @@ public:
     bool hasUnfinishedJobs();
 
     void clear() override;
-    QVector<SessionItem*> nonXMLItems() const override;
+    QVector<DataItem*> dataItems() const;
     void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override;
 
     void runJob(JobItem* jobItem);

GUI/Model/Model/RealModel.cpp

@@ -26,9 +26,9 @@ RealModel::RealModel(QObject* parent)
     connect(this, &SessionModel::rowsRemoved, this, &RealModel::onRowsChange);
 }
 
-QVector<SessionItem*> RealModel::nonXMLItems() const
+QVector<DataItem*> RealModel::dataItems() const
 {
-    QVector<SessionItem*> result;
+    QVector<DataItem*> result;
 
     for (auto* realData : realItems()) {
         if (auto* intensityItem = realData->dataItem())

GUI/Model/Model/RealModel.h

@@ -18,6 +18,7 @@
 #include "GUI/Model/Model/SessionModel.h"
 
 class RealItem;
+class DataItem;
 
 //! The RealModel class is a model to store all imported RealItem's.
 
@@ -27,7 +28,7 @@ class RealModel : public SessionModel {
 public:
     explicit RealModel(QObject* parent = nullptr);
 
-    QVector<SessionItem*> nonXMLItems() const override;
+    QVector<DataItem*> dataItems() const;
     void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override;
 
     RealItem* insertSpecularDataItem();

GUI/Model/Project/IOService.cpp

@@ -113,9 +113,9 @@ QVector<SaveLoadInterface*> DatafieldIOService::dataInterfaces() const
     if (!m_applicationModels)
         return result;
 
-    for (auto* item : m_applicationModels->nonXMLItems())
-        if (auto* non_xml_item = dynamic_cast<SaveLoadInterface*>(item))
-            result.push_back(non_xml_item);
+    for (auto* item : m_applicationModels->dataItems())
+        if (auto* data_item = dynamic_cast<SaveLoadInterface*>(item))
+            result.push_back(data_item);
 
     return result;
 }

Tests/Unit/GUI/TestIOService.cpp

@@ -30,13 +30,13 @@ TEST_F(TestIOService, nonXMLData)
     ApplicationModels models;
 
     // initial state
-    auto dataItems = models.nonXMLItems();
+    auto dataItems = models.dataItems();
     EXPECT_EQ(dataItems.size(), 0);
 
     // adding RealItem
     auto* realData = models.realModel()->insertIntensityDataItem();
     realData->setDatafield(UTest::GUI::createData().release());
-    EXPECT_EQ(models.realModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.realModel()->dataItems().size(), 1);
 
     // adding JobItem
     auto* jobItem = models.jobModel()->insertItem<JobItem>();
@@ -44,20 +44,20 @@ TEST_F(TestIOService, nonXMLData)
     jobItem->copyInstrumentIntoJob(instrumentItem);
     jobItem->createSumulatedDataItem();
     auto* dataItem = jobItem->simulatedDataItem();
-    EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.jobModel()->dataItems().size(), 1);
 
     // adding RealItem to jobItem
     RealItem* realData2 = jobItem->createRealItem();
-    EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.jobModel()->dataItems().size(), 1);
     realData2->setDatafield(UTest::GUI::createData(0.0, UTest::GUI::DIM::D1).release());
-    EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 2);
+    EXPECT_EQ(models.jobModel()->dataItems().size(), 2);
 
     // checking data items of DatafieldIOService
     DatafieldIOService service(&models);
     EXPECT_EQ(service.dataInterfaces().size(), 3);
 
     // checking data items of ApplicationModels
-    dataItems = models.nonXMLItems();
+    dataItems = models.dataItems();
     EXPECT_EQ(dataItems.size(), 3);
     EXPECT_EQ(dataItems.indexOf(realData->dataItem()), 0);
     EXPECT_EQ(dataItems.indexOf(dataItem), 1);
@@ -65,12 +65,12 @@ TEST_F(TestIOService, nonXMLData)
 
     // Replacing the data inside RealItem with the data of the same dimensions
     realData->setDatafield(UTest::GUI::createData(2.0).release());
-    EXPECT_EQ(models.realModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.realModel()->dataItems().size(), 1);
 
     // 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<RealItem*>(realData)->setDatafield(data.get()), Error);
-    EXPECT_EQ(models.realModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.realModel()->dataItems().size(), 1);
 }
 
 //! Tests DatafieldSaveInfo class intended for storing info about the last save.
@@ -234,19 +234,19 @@ TEST_F(TestIOService, RealDataItemWithNativeData)
     ApplicationModels models;
 
     // initial state
-    auto dataItems = models.nonXMLItems();
+    auto dataItems = models.dataItems();
     EXPECT_EQ(dataItems.size(), 0);
 
     // adding RealItem
     auto* realData = models.realModel()->insertIntensityDataItem();
-    EXPECT_EQ(models.realModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.realModel()->dataItems().size(), 1);
 
     ImportDataInfo import_data(std::unique_ptr<Datafield>(m_data.clone()), "nbins");
     realData->setImportData(std::move(import_data));
     // TODO: setImportData tested here with 2D data while main code uses it for 1D only.
 
     EXPECT_TRUE(realData->isIntensityData());
-    EXPECT_EQ(models.realModel()->nonXMLItems().size(), 2);
+    EXPECT_EQ(models.realModel()->dataItems().size(), 2);
     realData->setDataName("RealData");
 
     // adding JobItem
@@ -256,11 +256,11 @@ TEST_F(TestIOService, RealDataItemWithNativeData)
     auto* instrumentItem = new GISASInstrumentItem();
     jobItem->copyInstrumentIntoJob(instrumentItem);
     jobItem->createSumulatedDataItem();
-    EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 1);
+    EXPECT_EQ(models.jobModel()->dataItems().size(), 1);
 
     // copying RealItem to JobItem
     jobItem->copyRealItemIntoJob(realData);
-    EXPECT_EQ(models.jobModel()->nonXMLItems().size(), 3);
+    EXPECT_EQ(models.jobModel()->dataItems().size(), 3);
 
     // checking data items of DatafieldIOService
     DatafieldIOService service(&models);