GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make machine identifiers consistent

Browse Source 
CURA-2136
This commit is contained in:
fieldOfView 2016-08-18 17:18:03 +02:00
parent 49c885923a
commit 86ead22143
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -293,7 +293,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
for identifier in identifiers: for identifier in identifiers:
machine_id = self.__product_id_map.get(identifier.get("product"), None) machine_id = self.__product_id_map.get(identifier.get("product"), None)
if machine_id is None: if machine_id is None:
Logger.log("w", "Cannot create material for unknown machine %s", machine_id) Logger.log("w", "Cannot create material for unknown machine %s", identifier.get("product"))
continue continue
definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id) definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id)
@ -374,6 +374,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
"print temperature": "material_print_temperature", "print temperature": "material_print_temperature",
"heated bed temperature": "material_bed_temperature", "heated bed temperature": "material_bed_temperature",
"standby temperature": "material_standby_temperature", "standby temperature": "material_standby_temperature",
"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",
@ -382,11 +383,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
# 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
__product_id_map = { __product_id_map = {
"Ultimaker2": "ultimaker2", "Ultimaker 2": "ultimaker2",
"Ultimaker2+": "ultimaker2_plus", "Ultimaker 2+": "ultimaker2_plus",
"Ultimaker2go": "ultimaker2_go", "Ultimaker 2 Go": "ultimaker2_go",
"Ultimaker2extended": "ultimaker2_extended", "Ultimaker 2 Extended": "ultimaker2_extended",
"Ultimaker2extended+": "ultimaker2_extended_plus", "Ultimaker 2 Extended+": "ultimaker2_extended_plus",
"Ultimaker Original": "ultimaker_original", "Ultimaker Original": "ultimaker_original",
"Ultimaker Original+": "ultimaker_original_plus" "Ultimaker Original+": "ultimaker_original_plus"
} }