3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Take manufacturer from XML profile if available

Browse source 
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
This commit is contained in:
Ghostkeeper 2017-08-11 11:13:23 +02:00
parent e1266ceb1f
commit b03847447f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -229,7 +229,10 @@ class XmlMaterialProfile(InstanceContainer):
product = definition_id product = definition_id
builder.start("machine") builder.start("machine")
builder.start("machine_identifier", { "manufacturer": definition.getMetaDataEntry("manufacturer", ""), "product": product}) builder.start("machine_identifier", {
"manufacturer": container.getMetaDataEntry("machine_manufacturer", definition.getMetaDataEntry("manufacturer", "Unknown")),
"product": product
})
builder.end("machine_identifier") builder.end("machine_identifier")
for instance in container.findInstances(): for instance in container.findInstances():
@ -540,6 +543,8 @@ class XmlMaterialProfile(InstanceContainer):
definition = definitions[0] definition = definitions[0]
machine_manufacturer = identifier.get("manufacturer", definition.getMetaDataEntry("manufacturer", "Unknown")) #If the XML material doesn't specify a manufacturer, use the one in the actual printer definition.
if machine_compatibility: if machine_compatibility:
new_material_id = self.id + "_" + machine_id new_material_id = self.id + "_" + machine_id
@ -551,6 +556,7 @@ class XmlMaterialProfile(InstanceContainer):
new_material.setDefinition(definition) new_material.setDefinition(definition)
# Don't use setMetadata, as that overrides it for all materials with same base file # Don't use setMetadata, as that overrides it for all materials with same base file
new_material.getMetaData()["compatible"] = machine_compatibility new_material.getMetaData()["compatible"] = machine_compatibility
new_material.getMetaData()["machine_manufacturer"] = machine_manufacturer
new_material.setCachedValues(cached_machine_setting_properties) new_material.setCachedValues(cached_machine_setting_properties)
@ -597,6 +603,7 @@ class XmlMaterialProfile(InstanceContainer):
new_hotend_material.addMetaDataEntry("variant", variant_containers[0].id) new_hotend_material.addMetaDataEntry("variant", variant_containers[0].id)
# Don't use setMetadata, as that overrides it for all materials with same base file # Don't use setMetadata, as that overrides it for all materials with same base file
new_hotend_material.getMetaData()["compatible"] = hotend_compatibility new_hotend_material.getMetaData()["compatible"] = hotend_compatibility
new_hotend_material.getMetaData()["machine_manufacturer"] = machine_manufacturer
cached_hotend_setting_properties = cached_machine_setting_properties.copy() cached_hotend_setting_properties = cached_machine_setting_properties.copy()
cached_hotend_setting_properties.update(hotend_setting_values) cached_hotend_setting_properties.update(hotend_setting_values)