mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 08:17:49 -06:00
XML material profile merging is now far less naive.
It's still a work in progress, as it doesn't succeed in all cases just yet. CURA-2108
This commit is contained in:
parent
389cea2fcc
commit
ad22cf4861
1 changed files with 36 additions and 10 deletions
|
@ -277,24 +277,50 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
|
||||||
self._combineElement(result, second)
|
self._combineElement(result, second)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def _createKey(self, element):
|
||||||
|
key = element.tag.split("}")[-1]
|
||||||
|
if "key" in element.attrib:
|
||||||
|
key += " key:" + element.attrib["key"]
|
||||||
|
if "manufacturer" in element.attrib:
|
||||||
|
key += " manufacturer:" + element.attrib["manufacturer"]
|
||||||
|
if "product" in element.attrib:
|
||||||
|
key += " product:" + element.attrib["product"]
|
||||||
|
if key == "machine":
|
||||||
|
for item in element:
|
||||||
|
if "machine_identifier" in item.tag:
|
||||||
|
key += " " + item.attrib["product"]
|
||||||
|
return key
|
||||||
|
|
||||||
# Recursively merges XML elements. Updates either the text or children if another element is found in first.
|
# Recursively merges XML elements. Updates either the text or children if another element is found in first.
|
||||||
# If it does not exist, copies it from second.
|
# If it does not exist, copies it from second.
|
||||||
def _combineElement(self, first, second):
|
def _combineElement(self, first, second):
|
||||||
# Create a mapping from tag name to element.
|
# Create a mapping from tag name to element.
|
||||||
mapping = {el.tag: el for el in first}
|
|
||||||
for el in second:
|
mapping = {}
|
||||||
if len(el): # Check if element has children.
|
for element in first:
|
||||||
|
key = self._createKey(element)
|
||||||
|
mapping[key] = element
|
||||||
|
for element in second:
|
||||||
|
key = self._createKey(element)
|
||||||
|
if len(element): # Check if element has children.
|
||||||
try:
|
try:
|
||||||
self._combineElement(mapping[el.tag], el) # Multiple elements, handle those.
|
if "setting " in key:
|
||||||
|
# Setting can have points in it. In that case, delete all values and override them.
|
||||||
|
for child in list(mapping[key]):
|
||||||
|
mapping[key].remove(child)
|
||||||
|
for child in element:
|
||||||
|
mapping[key].append(child)
|
||||||
|
else:
|
||||||
|
self._combineElement(mapping[key], element) # Multiple elements, handle those.
|
||||||
except KeyError:
|
except KeyError:
|
||||||
mapping[el.tag] = el
|
mapping[key] = element
|
||||||
first.append(el)
|
first.append(element)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
mapping[el.tag].text = el.text
|
mapping[key].text = element.text
|
||||||
except KeyError: # Not in the mapping, so simply add it
|
except KeyError: # Not in the mapping, so simply add it
|
||||||
mapping[el.tag] = el
|
mapping[key] = element
|
||||||
first.append(el)
|
first.append(element)
|
||||||
|
|
||||||
## Overridden from InstanceContainer
|
## Overridden from InstanceContainer
|
||||||
def deserialize(self, serialized):
|
def deserialize(self, serialized):
|
||||||
|
@ -305,7 +331,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
|
||||||
|
|
||||||
# TODO: Add material verfication
|
# TODO: Add material verfication
|
||||||
self.addMetaDataEntry("status", "unknown")
|
self.addMetaDataEntry("status", "unknown")
|
||||||
#for inherit in data.findall("./um:inherits", self.__namespaces):
|
|
||||||
inherits = data.find("./um:inherits", self.__namespaces)
|
inherits = data.find("./um:inherits", self.__namespaces)
|
||||||
if inherits is not None:
|
if inherits is not None:
|
||||||
inherited = self._resolveInheritance(inherits.text)
|
inherited = self._resolveInheritance(inherits.text)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue