More accurate update of material properties on MaterialModel change

GUI/coregui/Models/SampleModel.cpp

@@ -16,9 +16,13 @@
 
 #include "SampleModel.h"
 #include "LayerItem.h"
+#include "ParticleItem.h"
 #include "MultiLayerItem.h"
 #include "MaterialProperty.h"
 #include "MaterialSvc.h"
+#include "MaterialUtils.h"
+#include <QDebug>
+
 
 SampleModel::SampleModel(QObject *parent)
     : SessionModel(SessionXML::SampleModelTag, parent)
@@ -55,17 +59,17 @@ void SampleModel::exploreForMaterials(const QModelIndex &parentIndex)
     for (int i_row = 0; i_row < rowCount(parentIndex); ++i_row) {
         QModelIndex itemIndex = index(i_row, 0, parentIndex);
         if (SessionItem *item = itemForIndex(itemIndex)) {
-            if (item->modelType() == Constants::LayerType
-                || item->modelType() == Constants::ParticleType) {
-                MaterialProperty material_property =
-                        item->getItemValue(LayerItem::P_MATERIAL).value<MaterialProperty>();
-                if(!MaterialSvc::getMaterial(material_property)) {
-                    item->setItemValue(LayerItem::P_MATERIAL, MaterialProperty().getVariant());
-                } else {
-                    // we pretend here that MaterialProperty changed to update IView colors
-                    item->getItem(LayerItem::P_MATERIAL)->emitDataChanged();
-                }
+
+            QString materialTag = MaterialUtils::materialTag(*item);
+
+            if(materialTag.size()) {
+                // TODO take care of the case, when material doesn't exist anymore and
+                // we should delete identifier on Layer, Particle side.
+
+                // we pretend here that MaterialProperty changed to update IView colors
+                item->getItem(materialTag)->emitDataChanged();
             }
+
         }
         exploreForMaterials(itemIndex);
     }

GUI/coregui/Models/TransformToDomain.cpp

@@ -64,7 +64,8 @@ std::unique_ptr<IMaterial> TransformToDomain::createDomainMaterial(const Session
     }
     if (!material_property.isDefined())
         throw GUIHelpers::Error(
-            "TransformToDomain::createDomainMaterial() -> Error. Unknown item to create material");
+            "TransformToDomain::createDomainMaterial() -> Error. Can't create material "
+            "for item '"+item.displayName()+"'.");
 
     return MaterialUtils::createDomainMaterial(material_property);
 }

GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp

@@ -24,6 +24,8 @@
 #include "MaterialModel.h"
 #include "MaterialSvc.h"
 #include "RefractiveIndexItem.h"
+#include "ParticleItem.h"
+#include "LayerItem.h"
 #include <QDebug>
 
 
@@ -73,3 +75,16 @@ MaterialUtils::createDomainMaterial(const MaterialProperty &material_property)
 
     return materialItem->createMaterial();
 }
+
+//! Returns material tag for given item. Returns empty string, if item doesn't have materials.
+
+QString MaterialUtils::materialTag(const SessionItem &item)
+{
+    QString result;
+    if (item.modelType() == Constants::ParticleType) {
+        result = ParticleItem::P_MATERIAL;
+    } else if (item.modelType() == Constants::LayerType) {
+        result = LayerItem::P_MATERIAL;
+    }
+    return result;
+}

GUI/coregui/Views/MaterialEditor/MaterialUtils.h

@@ -34,6 +34,8 @@ BA_CORE_API_ MaterialProperty getDefaultMaterialProperty();
 BA_CORE_API_ ColorProperty suggestMaterialColorProperty(const QString &name);
 BA_CORE_API_ std::unique_ptr<IMaterial> createDomainMaterial(
         const MaterialProperty &material_property);
+
+BA_CORE_API_ QString materialTag(const SessionItem &item);
 }