Merge branch 'refactor_gui_unittest' into 'develop'

Remove usage of cloned ISimulation for sample model creation

See merge request !208

GUI/Models/GUIObjectBuilder.cpp

@@ -37,16 +37,6 @@ SpecularInstrumentItem* createSpecularInstrumentItem(InstrumentModel* model,
                                                      const QString& name);
 } // namespace
 
-SessionItem* GUI::Model::ObjectBuilder::populateSampleModelFromSim(SampleModel* sampleModel,
-                                                                   MaterialModel* materialModel,
-                                                                   const ISimulation& simulation)
-{
-    std::unique_ptr<ISimulation> sim(simulation.clone());
-    sim->prepareSimulation();
-    SessionItem* item = populateSampleModel(sampleModel, materialModel, *sim->sample());
-    return item;
-}
-
 SessionItem* GUI::Model::ObjectBuilder::populateSampleModel(SampleModel* sampleModel,
                                                             MaterialModel* materialModel,
                                                             const MultiLayer& sample,

GUI/Models/GUIObjectBuilder.h

@@ -32,9 +32,6 @@ class ExternalProperty;
 
 namespace GUI::Model::ObjectBuilder {
 
-SessionItem* populateSampleModelFromSim(SampleModel* sampleModel, MaterialModel* materialModel,
-                                        const ISimulation& simulation);
-
 SessionItem* populateSampleModel(SampleModel* sampleModel, MaterialModel* materialModel,
                                  const MultiLayer& sample, const QString& sample_name = "");
 

Tests/Functional/GUI/Std/Check.cpp

@@ -34,8 +34,8 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/,
     MaterialModel materialModel;
 
     // populating GUI models from domain
-    GUI::Model::ObjectBuilder::populateSampleModelFromSim(&sampleModel, &materialModel,
-                                                          direct_simulation);
+    GUI::Model::ObjectBuilder::populateSampleModel(&sampleModel, &materialModel,
+                                                   *direct_simulation.sample());
     GUI::Model::ObjectBuilder::populateInstrumentModel(&instrumentModel, direct_simulation);
     GUI::Model::ObjectBuilder::populateDocumentModel(&documentModel, direct_simulation);