Skip to content
Snippets Groups Projects
Commit df2b9940 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rm usage of cloned ISimulation to create sample model

parent 6bb440e1
No related branches found
No related tags found
1 merge request!208Remove usage of cloned ISimulation for sample model creation
Pipeline #41606 passed
...@@ -37,16 +37,6 @@ SpecularInstrumentItem* createSpecularInstrumentItem(InstrumentModel* model, ...@@ -37,16 +37,6 @@ SpecularInstrumentItem* createSpecularInstrumentItem(InstrumentModel* model,
const QString& name); const QString& name);
} // namespace } // 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, SessionItem* GUI::Model::ObjectBuilder::populateSampleModel(SampleModel* sampleModel,
MaterialModel* materialModel, MaterialModel* materialModel,
const MultiLayer& sample, const MultiLayer& sample,
......
...@@ -32,9 +32,6 @@ class ExternalProperty; ...@@ -32,9 +32,6 @@ class ExternalProperty;
namespace GUI::Model::ObjectBuilder { namespace GUI::Model::ObjectBuilder {
SessionItem* populateSampleModelFromSim(SampleModel* sampleModel, MaterialModel* materialModel,
const ISimulation& simulation);
SessionItem* populateSampleModel(SampleModel* sampleModel, MaterialModel* materialModel, SessionItem* populateSampleModel(SampleModel* sampleModel, MaterialModel* materialModel,
const MultiLayer& sample, const QString& sample_name = ""); const MultiLayer& sample, const QString& sample_name = "");
......
...@@ -34,8 +34,8 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/, ...@@ -34,8 +34,8 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/,
MaterialModel materialModel; MaterialModel materialModel;
// populating GUI models from domain // populating GUI models from domain
GUI::Model::ObjectBuilder::populateSampleModelFromSim(&sampleModel, &materialModel, GUI::Model::ObjectBuilder::populateSampleModel(&sampleModel, &materialModel,
direct_simulation); *direct_simulation.sample());
GUI::Model::ObjectBuilder::populateInstrumentModel(&instrumentModel, direct_simulation); GUI::Model::ObjectBuilder::populateInstrumentModel(&instrumentModel, direct_simulation);
GUI::Model::ObjectBuilder::populateDocumentModel(&documentModel, direct_simulation); GUI::Model::ObjectBuilder::populateDocumentModel(&documentModel, direct_simulation);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment