diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 490d704d19..0eede82d2f 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -579,8 +579,9 @@ class XmlMaterialProfile(InstanceContainer):
meta_data[tag_name] = entry.text
- if tag_name in self.__material_metadata_setting_map:
- common_setting_values[self.__material_metadata_setting_map[tag_name]] = entry.text
+ for tag_name, value in meta_data.items():
+ if tag_name in self.__material_metadata_setting_map:
+ common_setting_values[self.__material_metadata_setting_map[tag_name]] = value
if "description" not in meta_data:
meta_data["description"] = ""
@@ -1222,7 +1223,9 @@ class XmlMaterialProfile(InstanceContainer):
"diameter": "material_diameter"
}
__material_metadata_setting_map = {
- "GUID": "material_guid"
+ "GUID": "material_guid",
+ "material": "material_type",
+ "brand": "material_brand",
}
# Map of recognised namespaces with a proper prefix.
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index a66c623826..b821f3d6c6 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -76,6 +76,22 @@
"type": "str",
"enabled": false
},
+ "material_type":
+ {
+ "label": "Material Type",
+ "description": "The type of material used.",
+ "default_value": "",
+ "type": "str",
+ "enabled": false
+ },
+ "material_brand":
+ {
+ "label": "Material Brand",
+ "description": "The brand of material used.",
+ "default_value": "",
+ "type": "str",
+ "enabled": false
+ },
"material_diameter":
{
"label": "Diameter",
@@ -6769,14 +6785,14 @@
"prime_tower_mode":
{
"label": "Prime Tower",
- "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Bucket: generate a bucket in which secondary materials are primed
- Sparse: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
+ "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Normal: generate a bucket in which secondary materials are primed
- Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
"type": "enum",
- "value": "'optimized' if all(material_type == extruderValues('material_type')[0] for material_type in extruderValues('material_type')) else 'optimized_consistent'",
+ "value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')",
"options":
{
"none": "None",
- "bucket": "Bucket",
- "sparse": "Sparse"
+ "normal": "Normal",
+ "interleaved": "Interleaved"
},
"default_value": "none",
"enabled": "extruders_enabled_count > 1",
@@ -6821,7 +6837,7 @@
"default_value": 5,
"minimum_value": "line_width",
"maximum_value_warning": "10.0",
- "enabled": "resolveOrValue('prime_tower_mode') == 'sparse' or resolveOrValue('prime_tower_mode') == 'bucket'",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"settable_per_mesh": false,
"settable_per_extruder": true
},