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

Fix reading flow temperature graph from XML files

Browse source 
These have their own nice little subtags that we don't even parse.

Contributes to issue CURA-5034.
This commit is contained in:
Ghostkeeper 2018-06-12 16:12:03 +02:00
parent b2cd0ffc0f
commit d5878772e8
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -563,7 +563,16 @@ class XmlMaterialProfile(InstanceContainer):
for entry in settings: for entry in settings:
key = entry.get("key") key = entry.get("key")
if key in self.__material_settings_setting_map: if key in self.__material_settings_setting_map:
common_setting_values[self.__material_settings_setting_map[key]] = entry.text if key == "processing temperature graph": #This setting has no setting text but subtags.
graph_nodes = entry.iterfind("./um:point", self.__namespaces)
graph_points = []
for graph_node in graph_nodes:
flow = float(graph_node.get("flow"))
temperature = float(graph_node.get("temperature"))
graph_points.append([flow, temperature])
common_setting_values[self.__material_settings_setting_map[key]] = str(graph_points)
else:
common_setting_values[self.__material_settings_setting_map[key]] = entry.text
elif key in self.__unmapped_settings: elif key in self.__unmapped_settings:
if key == "hardware compatible": if key == "hardware compatible":
common_compatibility = self._parseCompatibleValue(entry.text) common_compatibility = self._parseCompatibleValue(entry.text)
@ -596,7 +605,16 @@ class XmlMaterialProfile(InstanceContainer):
for entry in settings: for entry in settings:
key = entry.get("key") key = entry.get("key")
if key in self.__material_settings_setting_map: if key in self.__material_settings_setting_map:
machine_setting_values[self.__material_settings_setting_map[key]] = entry.text if key == "processing temperature graph": #This setting has no setting text but subtags.
graph_nodes = entry.iterfind("./um:point", self.__namespaces)
graph_points = []
for graph_node in graph_nodes:
flow = float(graph_node.get("flow"))
temperature = float(graph_node.get("temperature"))
graph_points.append([flow, temperature])
machine_setting_values[self.__material_settings_setting_map[key]] = str(graph_points)
else:
machine_setting_values[self.__material_settings_setting_map[key]] = entry.text
elif key in self.__unmapped_settings: elif key in self.__unmapped_settings:
if key == "hardware compatible": if key == "hardware compatible":
machine_compatibility = self._parseCompatibleValue(entry.text) machine_compatibility = self._parseCompatibleValue(entry.text)
@ -713,7 +731,16 @@ class XmlMaterialProfile(InstanceContainer):
for entry in settings: for entry in settings:
key = entry.get("key") key = entry.get("key")
if key in self.__material_settings_setting_map: if key in self.__material_settings_setting_map:
hotend_setting_values[self.__material_settings_setting_map[key]] = entry.text if key == "processing temperature graph": #This setting has no setting text but subtags.
graph_nodes = entry.iterfind("./um:point", self.__namespaces)
graph_points = []
for graph_node in graph_nodes:
flow = float(graph_node.get("flow"))
temperature = float(graph_node.get("temperature"))
graph_points.append([flow, temperature])
hotend_setting_values[self.__material_settings_setting_map[key]] = str(graph_points)
else:
hotend_setting_values[self.__material_settings_setting_map[key]] = entry.text
elif key in self.__unmapped_settings: elif key in self.__unmapped_settings:
if key == "hardware compatible": if key == "hardware compatible":
hotend_compatibility = self._parseCompatibleValue(entry.text) hotend_compatibility = self._parseCompatibleValue(entry.text)