Make JobItem::T_MATERIAL_CONTAINER private

GUI/Models/JobItem.cpp

@@ -274,11 +274,17 @@ RealDataItem* JobItem::realDataItem()
     return dynamic_cast<RealDataItem*>(getItem(JobItem::T_REALDATA));
 }
 
-const MaterialItemContainer* JobItem::materialContainerItem() const
+MaterialItemContainer* JobItem::materialContainerItem() const
 {
     return static_cast<MaterialItemContainer*>(getItem(JobItem::T_MATERIAL_CONTAINER));
 }
 
+MaterialItemContainer* JobItem::createMaterialContainer()
+{
+    return model()->insertItem<MaterialItemContainer>
+        (this, -1, T_MATERIAL_CONTAINER);
+}
+
 Data1DViewItem* JobItem::dataItemView()
 {
     return dynamic_cast<Data1DViewItem*>(getItem(JobItem::T_DATAVIEW));

GUI/Models/JobItem.h

@@ -45,9 +45,9 @@ private:
     static const QString P_PROGRESS;
     static const QString P_PRESENTATION_TYPE;
     static const QString T_SAMPLE;
+    static const QString T_MATERIAL_CONTAINER;
 
 public:
-    static const QString T_MATERIAL_CONTAINER;
     static const QString T_INSTRUMENT;
     static const QString T_OUTPUT;
     static const QString T_REALDATA;
@@ -107,7 +107,8 @@ public:
     FitParameterContainerItem* fitParameterContainerItem();
     RealDataItem* realDataItem();
 
-    const MaterialItemContainer* materialContainerItem() const;
+    MaterialItemContainer* materialContainerItem() const;
+    MaterialItemContainer* createMaterialContainer();
 
     Data1DViewItem* dataItemView();
 

GUI/Models/JobModelFunctions.cpp

@@ -89,8 +89,7 @@ void JobModelFunctions::setupJobItemSampleData(JobItem* jobItem, const MultiLaye
     multilayer->setItemName("MultiLayer");
 
     // copying materials
-    auto container = jobItem->model()->insertItem<MaterialItemContainer>(
-        jobItem, -1, JobItem::T_MATERIAL_CONTAINER);
+    MaterialItemContainer* container = jobItem->createMaterialContainer();
 
     std::map<MaterialItem*, QString> materials;
     for (auto property_item : multilayer->materialPropertyItems()) {
@@ -177,8 +176,7 @@ void JobModelFunctions::setupJobItemForFit(JobItem* jobItem, const RealDataItem*
 
 void JobModelFunctions::muteMagnetizationData(JobItem* jobItem)
 {
-    MaterialItemContainer* container =
-        static_cast<MaterialItemContainer*>(jobItem->getItem(JobItem::T_MATERIAL_CONTAINER));
+    MaterialItemContainer* container = jobItem->materialContainerItem();
     for (MaterialItem* material : container->getMaterials())
         material->hideMagnetization();
 

GUI/Models/ParameterTreeUtils.cpp

@@ -17,6 +17,7 @@
 #include "GUI/Models/FitParameterHelper.h"
 #include "GUI/Models/GroupItem.h"
 #include "GUI/Models/JobItem.h"
+#include "GUI/Models/MaterialItemContainer.h"
 #include "GUI/Models/ModelPath.h"
 #include "GUI/Models/MultiLayerItem.h"
 #include "GUI/Models/ParameterTreeItems.h"
@@ -89,7 +90,7 @@ void ParameterTreeUtils::createParameterTree(JobItem* jobItem)
     auto container = jobItem->model()->insertItem<ParameterContainerItem>(
         jobItem, -1, JobItem::T_PARAMETER_TREE);
 
-    populateParameterContainer(container, jobItem->getItem(JobItem::T_MATERIAL_CONTAINER));
+    populateParameterContainer(container, jobItem->materialContainerItem());
 
     populateParameterContainer(container, jobItem->sampleItem());