merge and inline fcts

GUI/Model/Model/RealModel.cpp

@@ -133,25 +133,13 @@ RealItem* RealModel::pushNewItem()
     return m_realItems.back().get();
 }
 
-RealItem* RealModel::insertSpecularDataItem()
-{
-    RealItem* r = pushNewItem();
-    r->initItemWithRank(1);
-    return r;
-}
-
-RealItem* RealModel::insertIntensityDataItem()
+RealItem* RealModel::insertDataItem(int rank)
 {
     RealItem* r = pushNewItem();
-    r->initItemWithRank(2);
+    r->initItemWithRank(rank);
     return r;
 }
 
-RealItem* RealModel::insertDataItem(int rank)
-{
-    return (rank == 1) ? insertSpecularDataItem() : insertIntensityDataItem();
-}
-
 QVector<RealItem*> RealModel::realItems() const
 {
     QVector<RealItem*> items(m_realItems.size());

GUI/Model/Model/RealModel.h

@@ -40,8 +40,6 @@ public:
     void writeDataFiles(const QString& projectDir);
     void readDataFiles(const QString& projectDir, MessageService* messageService);
 
-    RealItem* insertSpecularDataItem();
-    RealItem* insertIntensityDataItem();
     RealItem* insertDataItem(int rank);
     QVector<RealItem*> realItems() const;
     QVector<RealItem*> realItems(int rank) const;

Tests/Unit/GUI/TestRealModel.cpp

@@ -27,7 +27,7 @@ TEST(TestRealModel, RealItemWithNativeData)
     EXPECT_EQ(dataItems.size(), 0);
 
     // add 1D RealItem
-    auto* realItem1D = realModel.insertSpecularDataItem();
+    auto* realItem1D = realModel.insertDataItem(1);
     realItem1D->setRealItemName("RealItem1D");
     EXPECT_EQ(realModel.dataItems().size(), 1);
 
@@ -40,7 +40,7 @@ TEST(TestRealModel, RealItemWithNativeData)
     EXPECT_EQ(realModel.dataItems().size(), 2);
 
     // add 2D RealItem
-    auto* realItem2D = realModel.insertIntensityDataItem();
+    auto* realItem2D = realModel.insertDataItem(2);
     realItem2D->setRealItemName("RealItem2D");
     EXPECT_EQ(realModel.dataItems().size(), 3);
 
@@ -64,7 +64,7 @@ TEST(TestRealModel, removeNativeData)
     RealModel model;
 
     // add RealItem
-    auto* item = model.insertSpecularDataItem();
+    auto* item = model.insertDataItem(1);
     EXPECT_EQ(item->nativeDataItem(), nullptr);
 
     // add native data
@@ -168,7 +168,7 @@ TEST(TestRealModel, saveXMLData)
     RealModel model1(&instrument_model);
 
     // add specular RealItems with non-default parameters
-    auto* spec1 = model1.insertSpecularDataItem();
+    auto* spec1 = model1.insertDataItem(1);
     spec1->setRealItemName("spec1");
     spec1->setNativeFileName("spec1_file_name");
     spec1->setNativeDataUnits("Radians");
@@ -183,7 +183,7 @@ TEST(TestRealModel, saveXMLData)
     loader1->processContents();
 
     // add second specular RealItem
-    auto* spec2 = model1.insertSpecularDataItem();
+    auto* spec2 = model1.insertDataItem(1);
     spec2->setRealItemName("spec2");
 
     // create QREDataLoader for specular RealItem
@@ -193,8 +193,8 @@ TEST(TestRealModel, saveXMLData)
     loader2->processContents();
 
     // add 2D RealItems with non-default parameters
-    auto* intensity1 = model1.insertIntensityDataItem();
-    auto* intensity2 = model1.insertIntensityDataItem();
+    auto* intensity1 = model1.insertDataItem(2);
+    auto* intensity2 = model1.insertDataItem(2);
     intensity1->setRealItemName("GISAS");
     intensity2->setRealItemName("OffSpec");
     intensity1->linkToInstrument(instrument_model.addInstrumentItem<GISASInstrumentItem>());