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

Read setting_version from version attribute on root

Browse source 
As per the new specification for v1.3 of the spec.

Contributes to issue CURA-3427.
This commit is contained in:
Ghostkeeper 2017-05-12 16:57:36 +02:00
parent 05f2cd1680
commit 365f7cad4c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -27,10 +27,13 @@ class XmlMaterialProfile(InstanceContainer):
# Since the two may increment independently we need a way to say which
# versions of the XML specification are compatible with our setting data
# version numbers.
def xmlVersionToSettingVersion(self, xml_version):
if xml_version == 1: #Only one known version and it happens to be the same as our current setting_version.
#
# \param xml_version: The version number found in an XML file.
# \return The corresponding setting_version.
def xmlVersionToSettingVersion(self, xml_version: str) -> int:
if xml_version == "1.3":
return 1
return 0
return 0 #Older than 1.3.
def getInheritedFiles(self):
return self._inherited_files
@ -414,13 +417,13 @@ class XmlMaterialProfile(InstanceContainer):
meta_data["type"] = "material"
meta_data["base_file"] = self.id
meta_data["status"] = "unknown" # TODO: Add material verfication
meta_data["setting_version"] = self.getVersionFromSerialized(serialized)
inherits = data.find("./um:inherits", self.__namespaces)
if inherits is not None:
inherited = self._resolveInheritance(inherits.text)
data = self._mergeXML(inherited, data)
meta_data["setting_version"] = self.xmlVersionToSettingVersion(data.attrib["version"])
metadata = data.iterfind("./um:metadata/*", self.__namespaces)
for entry in metadata:
tag_name = _tag_without_namespace(entry)