Material refactoring

• reduce SessionModel exposure
• reduce SessionModel usage
• avoid global access to material model
• minor changes

GUI/Model/Sample/ItemWithMaterial.cpp

@@ -42,20 +42,12 @@ void ItemWithMaterial::setMaterialUndefined()
 
 QColor ItemWithMaterial::materialColor() const
 {
-    const auto* const parentJob = GUI::Model::JobFunctions::findJobItem(this);
-    if (parentJob)
-        return parentJob->materialContainerItem()->findMaterialById(materialIdentifier())->color();
-
-    return GUI::MaterialUtil::findMaterial(materialIdentifier())->color();
+    return material()->color();
 }
 
 QString ItemWithMaterial::materialName() const
 {
-    const auto* const parentJob = GUI::Model::JobFunctions::findJobItem(this);
-    if (parentJob)
-        return parentJob->materialContainerItem()->findMaterialById(materialIdentifier())->name();
-
-    return GUI::MaterialUtil::findMaterial(materialIdentifier())->name();
+    return material()->name();
 }
 
 QString ItemWithMaterial::materialIdentifier() const
@@ -63,6 +55,15 @@ QString ItemWithMaterial::materialIdentifier() const
     return getItemValue(P_MATERIAL).toString();
 }
 
+MaterialItem* ItemWithMaterial::material() const
+{
+    const auto* const parentJob = GUI::Model::JobFunctions::findJobItem(this);
+    if (parentJob)
+        return parentJob->materialContainerItem()->findMaterialById(materialIdentifier());
+
+    return GUI::MaterialUtil::findMaterial(materialIdentifier());
+}
+
 ItemWithMaterial::ItemWithMaterial(const QString& model_type) : SessionItem(model_type)
 {
     addProperty(P_MATERIAL, GUI::MaterialUtil::defaultMaterialIdentifier())
@@ -72,9 +73,5 @@ ItemWithMaterial::ItemWithMaterial(const QString& model_type) : SessionItem(mode
 
 std::unique_ptr<Material> ItemWithMaterial::domainMaterial() const
 {
-    const auto* parent_job = GUI::Model::JobFunctions::findJobItem(this);
-    const MaterialItemContainer* container =
-        parent_job ? parent_job->materialContainerItem() : nullptr;
-    return container ? GUI::MaterialUtil::createDomainMaterial(materialIdentifier(), *container)
-                     : GUI::MaterialUtil::createDomainMaterial(materialIdentifier());
+    return material()->createMaterial();
 }