GUI Suite test with just one InstrumentItem

GUI/Model/FromCore/ItemizeSimulation.cpp

@@ -375,24 +375,22 @@ SpecularInstrumentItem* createSpecularInstrumentItem(const SpecularSimulation& s
 } // namespace
 
 
-InstrumentModel* GUI::FromCore::itemizeInstrument(const ISimulation& simulation)
+InstrumentItem* GUI::FromCore::itemizeInstrument(const ISimulation& simulation)
 {
-    InstrumentItem* item;
+    InstrumentItem* result;
 
     if (const auto* sim = dynamic_cast<const ScatteringSimulation*>(&simulation))
-        item = createGISASInstrumentItem(*sim);
+        result = createGISASInstrumentItem(*sim);
     else if (const auto* sim = dynamic_cast<const OffspecSimulation*>(&simulation))
-        item = createOffspecInstrumentItem(*sim);
+        result = createOffspecInstrumentItem(*sim);
     else if (const auto* sim = dynamic_cast<const SpecularSimulation*>(&simulation))
-        item = createSpecularInstrumentItem(*sim);
+        result = createSpecularInstrumentItem(*sim);
     else
         ASSERT_NEVER;
 
-    setBackground(item, simulation);
+    setBackground(result, simulation);
 
-    auto* model = new InstrumentModel;
-    model->emplace_back(item);
-    return model;
+    return result;
 }
 
 SimulationOptionsItem* GUI::FromCore::itemizeOptions(const ISimulation& simulation)

GUI/Model/FromCore/ItemizeSimulation.h

@@ -17,13 +17,13 @@
 
 class SimulationOptionsItem;
 class ISimulation;
-class InstrumentModel;
+class InstrumentItem;
 
 //! Contains set of methods to populate GUI models with content from domain.
 
 namespace GUI::FromCore {
 
-InstrumentModel* itemizeInstrument(const ISimulation& simulation);
+InstrumentItem* itemizeInstrument(const ISimulation& simulation);
 
 SimulationOptionsItem* itemizeOptions(const ISimulation& simulation);
 

Tests/Suite/GUI/Check.cpp

@@ -18,7 +18,8 @@
 #include "Device/Data/Datafield.h"
 #include "Device/IO/DiffUtil.h"
 #include "Device/IO/IOFactory.h"
-#include "GUI/Model/Device/InstrumentModel.h"
+#include "GUI/Model/Device/BackgroundItems.h"
+#include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/FromCore/ItemizeSample.h"
 #include "GUI/Model/FromCore/ItemizeSimulation.h"
 #include "GUI/Model/Sample/SampleItem.h"
@@ -36,11 +37,10 @@ namespace {
 std::unique_ptr<ISimulation> indirectSimulation(const ISimulation& sim)
 {
     std::unique_ptr<SampleItem> sampleItem(GUI::FromCore::itemizeSample(*sim.sample()));
-    std::unique_ptr<InstrumentModel> instrumentModel(GUI::FromCore::itemizeInstrument(sim));
+    std::unique_ptr<InstrumentItem> instrumentItem(GUI::FromCore::itemizeInstrument(sim));
     std::unique_ptr<SimulationOptionsItem> optionsItem(GUI::FromCore::itemizeOptions(sim));
 
-    return GUI::ToCore::itemsToSimulation(*sampleItem, *instrumentModel->instrumentItems().front(),
-                                          *optionsItem);
+    return GUI::ToCore::itemsToSimulation(*sampleItem, *instrumentItem, *optionsItem);
 }
 
 } // namespace