3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add support for deserialising namespaced Cura settings in XML materials

Browse source
This commit is contained in:
fieldOfView 2017-08-12 15:58:32 +02:00
parent 0528a03363
commit e163871360
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -123,6 +123,7 @@ class XmlMaterialProfile(InstanceContainer):
root = builder.start("fdmmaterial",
{"xmlns": "http://www.ultimaker.com/material",
"xmlns:cura": "http://www.ultimaker.com/cura",
"version": self.CurrentFdmMaterialVersion})
## Begin Metadata Block
@ -505,6 +506,13 @@ class XmlMaterialProfile(InstanceContainer):
common_compatibility = self._parseCompatibleValue(entry.text)
else:
Logger.log("d", "Unsupported material setting %s", key)
# Add namespaced Cura-specific settings
settings = data.iterfind("./um:settings/cura:setting", self.__namespaces)
for entry in settings:
key = entry.get("key")
common_setting_values[key] = entry.text
self._cached_values = common_setting_values # from InstanceContainer ancestor
meta_data["compatible"] = common_compatibility
@ -526,6 +534,12 @@ class XmlMaterialProfile(InstanceContainer):
else:
Logger.log("d", "Unsupported material setting %s", key)
# Add namespaced Cura-specific settings
settings = machine.iterfind("./cura:setting", self.__namespaces)
for entry in settings:
key = entry.get("key")
machine_setting_values[key] = entry.text
cached_machine_setting_properties = common_setting_values.copy()
cached_machine_setting_properties.update(machine_setting_values)
@ -592,6 +606,12 @@ class XmlMaterialProfile(InstanceContainer):
else:
Logger.log("d", "Unsupported material setting %s", key)
# Add namespaced Cura-specific settings
settings = hotend.iterfind("./cura:setting", self.__namespaces)
for entry in settings:
key = entry.get("key")
hotend_setting_values[key] = entry.text
new_hotend_id = self.id + "_" + machine_id + "_" + hotend_id.replace(" ", "_")
new_hotend_material = XmlMaterialProfile(new_hotend_id)
@ -671,7 +691,8 @@ class XmlMaterialProfile(InstanceContainer):
# Map of recognised namespaces with a proper prefix.
__namespaces = {
"um": "http://www.ultimaker.com/material"
"um": "http://www.ultimaker.com/material",
"cura": "http://www.ultimaker.com/cura"
}
## Helper function for pretty-printing XML because ETree is stupid