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

Fix setting_version in metadata for XMLMaterial

Browse source 
CURA-4053
This commit is contained in:
Lipu Fei 2017-07-17 13:40:10 +02:00
parent 63b71b8661
commit ecdf0bbe33
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -433,10 +433,12 @@ class XmlMaterialProfile(InstanceContainer):
inherited = self._resolveInheritance(inherits.text) inherited = self._resolveInheritance(inherits.text)
data = self._mergeXML(inherited, data) data = self._mergeXML(inherited, data)
# set setting_version in metadata
if "version" in data.attrib: if "version" in data.attrib:
meta_data["setting_version"] = self.xmlVersionToSettingVersion(data.attrib["version"]) meta_data["setting_version"] = self.xmlVersionToSettingVersion(data.attrib["version"])
else: else:
meta_data["setting_version"] = self.xmlVersionToSettingVersion("1.2") #1.2 and lower didn't have that version number there yet. meta_data["setting_version"] = self.xmlVersionToSettingVersion("1.2") #1.2 and lower didn't have that version number there yet.
metadata = data.iterfind("./um:metadata/*", self.__namespaces) metadata = data.iterfind("./um:metadata/*", self.__namespaces)
for entry in metadata: for entry in metadata:
tag_name = _tag_without_namespace(entry) tag_name = _tag_without_namespace(entry)
@ -455,6 +457,11 @@ class XmlMaterialProfile(InstanceContainer):
meta_data["material"] = material.text meta_data["material"] = material.text
meta_data["color_name"] = color.text meta_data["color_name"] = color.text
continue continue
# setting_version is derived from the "version" tag in the schema earlier, so don't set it here
if tag_name == "setting_version":
continue
meta_data[tag_name] = entry.text meta_data[tag_name] = entry.text
if tag_name in self.__material_metadata_setting_map: if tag_name in self.__material_metadata_setting_map: