diff --git a/GUI/Models/GUIObjectBuilder.cpp b/GUI/Models/GUIObjectBuilder.cpp index f297cd9d6daa27d319a5b0624e889f34b5b1527f..643d2da92d0d5d76ed81f3f5cded053e528a5652 100644 --- a/GUI/Models/GUIObjectBuilder.cpp +++ b/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, diff --git a/GUI/Models/GUIObjectBuilder.h b/GUI/Models/GUIObjectBuilder.h index b45774d55d14240ccc5f2ecb45d9142d8d768d40..dba6da4c1f01b62c20cdbe5d94b431c01d461cf2 100644 --- a/GUI/Models/GUIObjectBuilder.h +++ b/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 = ""); diff --git a/Tests/Functional/GUI/Std/Check.cpp b/Tests/Functional/GUI/Std/Check.cpp index 61813f103c88a7d28303013e3e14b7bfa4703b29..826d4e781855d5c8e9725c2a5dafdcee0d2bc333 100644 --- a/Tests/Functional/GUI/Std/Check.cpp +++ b/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);