rm GUISampleBuilder::createMaterialFromDomain

GUI/Model/FromDomain/GUISampleBuilder.cpp

@@ -105,34 +105,13 @@ MultiLayerItem* GUISampleBuilder::createMultiLayerItem(const MultiLayer& sample,
     return m_sampleItem;
 }
 
-MaterialItem* GUISampleBuilder::createMaterialFromDomain(const Material* material)
+void GUISampleBuilder::copyParticleItem(ParticleItem* particleItem, const Particle* particle)
 {
     MaterialItems& matItems = m_sampleItem->materialItems();
-    QString materialName = QString::fromStdString(material->materialName());
-
-    if (auto* materialItem = matItems.materialFromName(materialName))
-        return materialItem;
-
-    complex_t material_data = material->materialData();
-    MaterialItem* materialItem(nullptr);
-    if (material->typeID() == MATERIAL_TYPES::RefractiveMaterial) {
-        materialItem = matItems.addRefractiveMaterial(
-            materialName, material_data.real(), material_data.imag());
-    } else if (material->typeID() == MATERIAL_TYPES::MaterialBySLD) {
-        materialItem = matItems.addSLDMaterial(
-            materialName, material_data.real(), material_data.imag());
-    } else
-        ASSERT(0);
-
-    materialItem->setMagnetization(material->magnetization());
-    return materialItem;
-}
 
-void GUISampleBuilder::copyParticleItem(ParticleItem* particleItem, const Particle* particle)
-{
     particleItem->setAbundance(particle->abundance());
     particleItem->setPosition(particle->particlePosition());
-    particleItem->setMaterial(createMaterialFromDomain(particle->material()));
+    setMaterial(matItems, particleItem, particle);
     FromDomain::setRotation(particleItem, particle->rotation());
     FromDomain::setFormFactor(particleItem, particle->formfactor_at_bottom());
 }

GUI/Model/FromDomain/GUISampleBuilder.h

@@ -37,8 +37,6 @@ public:
     MultiLayerItem* createMultiLayerItem(const MultiLayer& sample, const QString& nodeName = "");
 
 private:
-    MaterialItem* createMaterialFromDomain(const Material* material);
-
     void copyParticle(const IParticle* particle,
                       std::function<void(ItemWithParticles*)> addToParent);
     void copyParticleItem(ParticleItem* particleItem, const Particle* particle);