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

Implement "hardware compatible" for XmlMaterialProfile

Browse source 
CURA-2138
This commit is contained in:
fieldOfView 2016-08-23 22:09:56 +02:00
parent 35fedbdad6
commit eb176847be
1 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

62
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -265,6 +265,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
self.setDefinition(UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter")[0]) self.setDefinition(UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter")[0])
global_compatibility = True
global_setting_values = {} global_setting_values = {}
settings = data.iterfind("./um:settings/um:setting", self.__namespaces) settings = data.iterfind("./um:settings/um:setting", self.__namespaces)
for entry in settings: for entry in settings:
@ -272,6 +273,9 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
if key in self.__material_property_setting_map: if key in self.__material_property_setting_map:
self.setProperty(self.__material_property_setting_map[key], "value", entry.text, self._definition) self.setProperty(self.__material_property_setting_map[key], "value", entry.text, self._definition)
global_setting_values[self.__material_property_setting_map[key]] = entry.text global_setting_values[self.__material_property_setting_map[key]] = entry.text
elif key in self.__unmapped_settings:
if key == "hardware compatible":
global_compatibility = entry.text.lower() not in ["no", "false", "0"]
else: else:
Logger.log("d", "Unsupported material setting %s", key) Logger.log("d", "Unsupported material setting %s", key)
@ -279,12 +283,16 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
machines = data.iterfind("./um:settings/um:machine", self.__namespaces) machines = data.iterfind("./um:settings/um:machine", self.__namespaces)
for machine in machines: for machine in machines:
machine_compatibility = global_compatibility
machine_setting_values = {} machine_setting_values = {}
settings = machine.iterfind("./um:setting", self.__namespaces) settings = machine.iterfind("./um:setting", self.__namespaces)
for entry in settings: for entry in settings:
key = entry.get("key") key = entry.get("key")
if key in self.__material_property_setting_map: if key in self.__material_property_setting_map:
machine_setting_values[self.__material_property_setting_map[key]] = entry.text machine_setting_values[self.__material_property_setting_map[key]] = entry.text
elif key in self.__unmapped_settings:
if key == "hardware compatible":
machine_compatibility = entry.text.lower() not in ["no", "false", "0"]
else: else:
Logger.log("d", "Unsupported material setting %s", key) Logger.log("d", "Unsupported material setting %s", key)
@ -302,21 +310,22 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
definition = definitions[0] definition = definitions[0]
new_material = XmlMaterialProfile(self.id + "_" + machine_id) if machine_compatibility:
new_material.setName(self.getName()) new_material = XmlMaterialProfile(self.id + "_" + machine_id)
new_material.setMetaData(copy.deepcopy(self.getMetaData())) new_material.setName(self.getName())
new_material.setDefinition(definition) new_material.setMetaData(copy.deepcopy(self.getMetaData()))
new_material.addMetaDataEntry("base_file", self.id) new_material.setDefinition(definition)
new_material.addMetaDataEntry("base_file", self.id)
for key, value in global_setting_values.items(): for key, value in global_setting_values.items():
new_material.setProperty(key, "value", value, definition) new_material.setProperty(key, "value", value, definition)
for key, value in machine_setting_values.items(): for key, value in machine_setting_values.items():
new_material.setProperty(key, "value", value, definition) new_material.setProperty(key, "value", value, definition)
new_material._dirty = False new_material._dirty = False
UM.Settings.ContainerRegistry.getInstance().addContainer(new_material) UM.Settings.ContainerRegistry.getInstance().addContainer(new_material)
hotends = machine.iterfind("./um:hotend", self.__namespaces) hotends = machine.iterfind("./um:hotend", self.__namespaces)
for hotend in hotends: for hotend in hotends:
@ -333,12 +342,27 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
Logger.log("d", "No variants found with ID or name %s for machine %s", hotend_id, definition.id) Logger.log("d", "No variants found with ID or name %s for machine %s", hotend_id, definition.id)
continue continue
hotend_compatibility = machine_compatibility
hotend_setting_values = {}
settings = hotend.iterfind("./um:setting", self.__namespaces)
for entry in settings:
key = entry.get("key")
if key in self.__material_property_setting_map:
hotend_setting_values[self.__material_property_setting_map[key]] = entry.text
elif key in self.__unmapped_settings:
if key == "hardware compatible":
hotend_compatibility = entry.text.lower() not in ["no", "false", "0"]
else:
Logger.log("d", "Unsupported material setting %s", key)
if not hotend_compatibility:
continue
new_hotend_material = XmlMaterialProfile(self.id + "_" + machine_id + "_" + hotend_id.replace(" ", "_")) new_hotend_material = XmlMaterialProfile(self.id + "_" + machine_id + "_" + hotend_id.replace(" ", "_"))
new_hotend_material.setName(self.getName()) new_hotend_material.setName(self.getName())
new_hotend_material.setMetaData(copy.deepcopy(self.getMetaData())) new_hotend_material.setMetaData(copy.deepcopy(self.getMetaData()))
new_hotend_material.setDefinition(definition) new_hotend_material.setDefinition(definition)
new_hotend_material.addMetaDataEntry("base_file", self.id) new_hotend_material.addMetaDataEntry("base_file", self.id)
new_hotend_material.addMetaDataEntry("variant", variant_containers[0].id) new_hotend_material.addMetaDataEntry("variant", variant_containers[0].id)
for key, value in global_setting_values.items(): for key, value in global_setting_values.items():
@ -347,13 +371,8 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
for key, value in machine_setting_values.items(): for key, value in machine_setting_values.items():
new_hotend_material.setProperty(key, "value", value, definition) new_hotend_material.setProperty(key, "value", value, definition)
settings = hotend.iterfind("./um:setting", self.__namespaces) for key, value in hotend_setting_values.items():
for entry in settings: new_hotend_material.setProperty(key, "value", value, definition)
key = entry.get("key")
if key in self.__material_property_setting_map:
new_hotend_material.setProperty(self.__material_property_setting_map[key], "value", entry.text, definition)
else:
Logger.log("d", "Unsupported material setting %s", key)
new_hotend_material._dirty = False new_hotend_material._dirty = False
UM.Settings.ContainerRegistry.getInstance().addContainer(new_hotend_material) UM.Settings.ContainerRegistry.getInstance().addContainer(new_hotend_material)
@ -382,8 +401,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
"processing temperature graph": "material_flow_temp_graph", "processing temperature graph": "material_flow_temp_graph",
"print cooling": "cool_fan_speed", "print cooling": "cool_fan_speed",
"retraction amount": "retraction_amount", "retraction amount": "retraction_amount",
"retraction speed": "retraction_speed", "retraction speed": "retraction_speed"
} }
__unmapped_settings = [
"hardware compatible"
]
# Map XML file product names to internal ids # Map XML file product names to internal ids
# TODO: Move this to definition's metadata # TODO: Move this to definition's metadata