3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

WIP: Fix material lookup problems and update definition files

Browse source
This commit is contained in:
Lipu Fei 2018-02-14 16:08:21 +01:00
parent 730cbb25bf
commit c469ebbf9f
19 changed files with 51 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cura/Machines/MaterialManager.py
View file

@ -249,15 +249,15 @@ class MaterialManager(QObject):
# 1. variant-specific material # 1. variant-specific material
# 2. machine-specific material # 2. machine-specific material
# 3. generic material (for fdmprinter) # 3. generic material (for fdmprinter)
material_node = None nodes_to_check = [variant_node, machine_node,
if variant_node is not None: machine_variant_material_map.get(self._default_machine_definition_id)]
if root_material_id in variant_node.material_map:
material_node = variant_node.material_map.get(root_material_id)
# Fallback: machine-specific materials, including "fdmprinter" material_node = None
if material_node is None: for node in nodes_to_check:
if machine_node is not None: if node is not None:
material_node = machine_node.material_map.get(root_material_id) material_node = node.material_map.get(root_material_id)
if material_node:
break
return material_node return material_node

3
cura/Machines/QualityManager.py
View file

@ -320,7 +320,7 @@ class QualityManager(QObject):
# No suitable quality found: not supported # No suitable quality found: not supported
Logger.log("d", "Cannot find quality with machine [%s], variant name [%s], and materials [%s].", Logger.log("d", "Cannot find quality with machine [%s], variant name [%s], and materials [%s].",
machine_definition_id, variant_name, ", ".join(root_material_id_list)) machine_definition_id, variant_name, ", ".join(root_material_id_list))
continue
else: else:
# In this case, we only have a specific material but NOT a variant # In this case, we only have a specific material but NOT a variant
if has_material: if has_material:
@ -332,7 +332,6 @@ class QualityManager(QObject):
# No suitable quality found: not supported # No suitable quality found: not supported
Logger.log("d", "Cannot find quality with machine [%s], variant name [%s], and materials [%s].", Logger.log("d", "Cannot find quality with machine [%s], variant name [%s], and materials [%s].",
machine_definition_id, variant_name, ", ".join(root_material_id_list)) machine_definition_id, variant_name, ", ".join(root_material_id_list))
continue
node_to_check = material_node node_to_check = material_node
if not node_to_check: if not node_to_check:

2
resources/definitions/anycubic_i3_mega.def.json
View file

@ -12,7 +12,7 @@
"platform": "anycubic_i3_mega_platform.stl", "platform": "anycubic_i3_mega_platform.stl",
"has_materials": false, "has_materials": false,
"has_machine_quality": true, "has_machine_quality": true,
"preferred_quality": "*normal*" "preferred_quality_type": "normal"
}, },
"overrides": "overrides":

20
resources/definitions/builder_premium_large.def.json
View file

@ -12,16 +12,14 @@
"platform": "builder_premium_platform.stl", "platform": "builder_premium_platform.stl",
"platform_offset": [-126, -36, 117], "platform_offset": [-126, -36, 117],
"has_machine_quality": true, "has_machine_quality": true,
"preferred_quality": "*Normal*", "preferred_quality_type": "normal",
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "builder_premium_large_rear", "0": "builder_premium_large_rear",
"1": "builder_premium_large_front" "1": "builder_premium_large_front"
} }
}, },
"overrides": { "overrides": {
"machine_name": { "default_value": "Builder Premium Large" }, "machine_name": { "default_value": "Builder Premium Large" },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
@ -36,7 +34,7 @@
"default_material_print_temperature": { "value": "215" }, "default_material_print_temperature": { "value": "215" },
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
"material_standby_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" },
"switch_extruder_retraction_speeds": {"default_value": 15 }, "switch_extruder_retraction_speeds": {"default_value": 15 },
"switch_extruder_retraction_speed": {"default_value": 15 }, "switch_extruder_retraction_speed": {"default_value": 15 },
"switch_extruder_prime_speed": {"default_value": 15 }, "switch_extruder_prime_speed": {"default_value": 15 },
@ -58,9 +56,9 @@
"prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 }, "prime_tower_min_volume": { "default_value": 50 },
"dual_pre_wipe": { "default_value": false }, "dual_pre_wipe": { "default_value": false },
"prime_blob_enable": { "enabled": true }, "prime_blob_enable": { "enabled": true },
"acceleration_enabled": { "value": "True" }, "acceleration_enabled": { "value": "True" },
"acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_layer_0": { "value": "acceleration_topbottom" },
"acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
@ -71,7 +69,7 @@
"acceleration_travel": { "value": "acceleration_print" }, "acceleration_travel": { "value": "acceleration_print" },
"acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
"acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
"cool_min_layer_time": { "default_value": 10 }, "cool_min_layer_time": { "default_value": 10 },
@ -84,9 +82,9 @@
"jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
"jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
"jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
"wall_thickness": { "value": "1.2" }, "wall_thickness": { "value": "1.2" },
"retraction_amount": { "default_value": 3 }, "retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 15 }, "retraction_speed": { "default_value": 15 },
"retraction_retract_speed": { "default_value": 15 }, "retraction_retract_speed": { "default_value": 15 },
@ -113,4 +111,4 @@
}, },
"machine_extruder_count": { "default_value": 2 } "machine_extruder_count": { "default_value": 2 }
} }
} }

20
resources/definitions/builder_premium_medium.def.json
View file

@ -12,16 +12,14 @@
"platform": "builder_premium_platform.stl", "platform": "builder_premium_platform.stl",
"platform_offset": [-126, -36, 117], "platform_offset": [-126, -36, 117],
"has_machine_quality": true, "has_machine_quality": true,
"preferred_quality": "*Normal*", "preferred_quality_type": "normal",
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "builder_premium_medium_rear", "0": "builder_premium_medium_rear",
"1": "builder_premium_medium_front" "1": "builder_premium_medium_front"
} }
}, },
"overrides": { "overrides": {
"machine_name": { "default_value": "Builder Premium Medium" }, "machine_name": { "default_value": "Builder Premium Medium" },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
@ -36,7 +34,7 @@
"default_material_print_temperature": { "value": "215" }, "default_material_print_temperature": { "value": "215" },
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
"material_standby_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" },
"switch_extruder_retraction_speeds": {"default_value": 15 }, "switch_extruder_retraction_speeds": {"default_value": 15 },
"switch_extruder_retraction_speed": {"default_value": 15 }, "switch_extruder_retraction_speed": {"default_value": 15 },
"switch_extruder_prime_speed": {"default_value": 15 }, "switch_extruder_prime_speed": {"default_value": 15 },
@ -58,9 +56,9 @@
"prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 }, "prime_tower_min_volume": { "default_value": 50 },
"dual_pre_wipe": { "default_value": false }, "dual_pre_wipe": { "default_value": false },
"prime_blob_enable": { "enabled": true }, "prime_blob_enable": { "enabled": true },
"acceleration_enabled": { "value": "True" }, "acceleration_enabled": { "value": "True" },
"acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_layer_0": { "value": "acceleration_topbottom" },
"acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
@ -71,7 +69,7 @@
"acceleration_travel": { "value": "acceleration_print" }, "acceleration_travel": { "value": "acceleration_print" },
"acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
"acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
"cool_min_layer_time": { "default_value": 10 }, "cool_min_layer_time": { "default_value": 10 },
@ -84,9 +82,9 @@
"jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
"jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
"jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
"wall_thickness": { "value": "1.2" }, "wall_thickness": { "value": "1.2" },
"retraction_amount": { "default_value": 3 }, "retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 15 }, "retraction_speed": { "default_value": 15 },
"retraction_retract_speed": { "default_value": 15 }, "retraction_retract_speed": { "default_value": 15 },
@ -113,4 +111,4 @@
}, },
"machine_extruder_count": { "default_value": 2 } "machine_extruder_count": { "default_value": 2 }
} }
} }

20
resources/definitions/builder_premium_small.def.json
View file

@ -11,16 +11,14 @@
"platform": "builder_premium_platform.stl", "platform": "builder_premium_platform.stl",
"platform_offset": [-126, -36, 117], "platform_offset": [-126, -36, 117],
"has_machine_quality": true, "has_machine_quality": true,
"preferred_quality": "*Normal*", "preferred_quality_type": "normal",
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "builder_premium_small_rear", "0": "builder_premium_small_rear",
"1": "builder_premium_small_front" "1": "builder_premium_small_front"
} }
}, },
"overrides": { "overrides": {
"machine_name": { "default_value": "Builder Premium Small" }, "machine_name": { "default_value": "Builder Premium Small" },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
@ -35,7 +33,7 @@
"default_material_print_temperature": { "value": "215" }, "default_material_print_temperature": { "value": "215" },
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
"material_standby_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" },
"switch_extruder_retraction_speeds": {"default_value": 15 }, "switch_extruder_retraction_speeds": {"default_value": 15 },
"switch_extruder_retraction_speed": {"default_value": 15 }, "switch_extruder_retraction_speed": {"default_value": 15 },
"switch_extruder_prime_speed": {"default_value": 15 }, "switch_extruder_prime_speed": {"default_value": 15 },
@ -57,9 +55,9 @@
"prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 }, "prime_tower_min_volume": { "default_value": 50 },
"dual_pre_wipe": { "default_value": false }, "dual_pre_wipe": { "default_value": false },
"prime_blob_enable": { "enabled": true }, "prime_blob_enable": { "enabled": true },
"acceleration_enabled": { "value": "True" }, "acceleration_enabled": { "value": "True" },
"acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_layer_0": { "value": "acceleration_topbottom" },
"acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
@ -70,7 +68,7 @@
"acceleration_travel": { "value": "acceleration_print" }, "acceleration_travel": { "value": "acceleration_print" },
"acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
"acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
"cool_min_layer_time": { "default_value": 10 }, "cool_min_layer_time": { "default_value": 10 },
@ -83,9 +81,9 @@
"jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
"jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
"jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
"wall_thickness": { "value": "1.2" }, "wall_thickness": { "value": "1.2" },
"retraction_amount": { "default_value": 3 }, "retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 15 }, "retraction_speed": { "default_value": 15 },
"retraction_retract_speed": { "default_value": 15 }, "retraction_retract_speed": { "default_value": 15 },
@ -112,4 +110,4 @@
}, },
"machine_extruder_count": { "default_value": 2 } "machine_extruder_count": { "default_value": 2 }
} }
} }

5
resources/definitions/cartesio.def.json
View file

@ -15,9 +15,8 @@
"has_variants": true, "has_variants": true,
"variants_name": "Nozzle size", "variants_name": "Nozzle size",
"preferred_variant": "*0.8*", "preferred_variant_name": "0.8 mm",
"preferred_material": "*pla*", "preferred_quality_type": "normal",
"preferred_quality": "*normal*",
"machine_extruder_trains": "machine_extruder_trains":
{ {

2
resources/definitions/creality_cr10.def.json
View file

@ -7,7 +7,7 @@
"author": "Michael Wildermuth", "author": "Michael Wildermuth",
"manufacturer": "Creality3D", "manufacturer": "Creality3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"preferred_quality": "*Draft*" "preferred_quality_type": "draft"
}, },
"overrides": { "overrides": {
"machine_width": { "machine_width": {

4
resources/definitions/fabtotum.def.json
View file

@ -13,8 +13,8 @@
"has_machine_quality": true, "has_machine_quality": true,
"has_variants": true, "has_variants": true,
"variants_name": "Head", "variants_name": "Head",
"preferred_variant": "*lite04*", "preferred_variant_name": "Lite 0.4 mm",
"preferred_material": "*fabtotum_pla*", "preferred_material": "fabtotum_pla",
"supports_usb_connection": false "supports_usb_connection": false
}, },

1
resources/definitions/fdmprinter.def.json
View file

@ -12,7 +12,6 @@
"visible": false, "visible": false,
"has_materials": true, "has_materials": true,
"preferred_material": "generic_pla", "preferred_material": "generic_pla",
"preferred_quality": "*normal*",
"preferred_quality_type": "normal", "preferred_quality_type": "normal",
"machine_extruder_trains": "machine_extruder_trains":
{ {

4
resources/definitions/gmax15plus.def.json
View file

@ -12,9 +12,7 @@
"platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl",
"has_variants": true, "has_variants": true,
"variants_name": "Hotend", "variants_name": "Hotend",
"preferred_variant": "*0.5mm E3D (Default)*" "preferred_variant_name": "0.5mm E3D (Default)"
}, },
"overrides": { "overrides": {

4
resources/definitions/gmax15plus_dual.def.json
View file

@ -12,11 +12,11 @@
"platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl",
"has_variants": true, "has_variants": true,
"variants_name": "Hotend", "variants_name": "Hotend",
"preferred_variant": "*0.5mm E3D (Default)*", "preferred_variant_name": "0.5mm E3D (Default)",
"machine_extruder_trains": { "machine_extruder_trains": {
"0": "gmax15plus_dual_extruder_0", "0": "gmax15plus_dual_extruder_0",
"1": "gmax15plus_dual_extruder_1" "1": "gmax15plus_dual_extruder_1"
} }
}, },
"overrides": { "overrides": {

5
resources/definitions/imade3d_jellybox.def.json
View file

@ -9,9 +9,8 @@
"platform": "imade3d_jellybox_platform.stl", "platform": "imade3d_jellybox_platform.stl",
"platform_offset": [ 0, -0.3, 0], "platform_offset": [ 0, -0.3, 0],
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"preferred_variant": "*0.4*", "preferred_variant_name": "0.4 mm",
"preferred_material": "*generic_pla*", "preferred_quality_type": "fast",
"preferred_quality": "*fast*",
"has_materials": true, "has_materials": true,
"has_variants": true, "has_variants": true,
"has_machine_materials": true, "has_machine_materials": true,

2
resources/definitions/malyan_m200.def.json
View file

@ -11,7 +11,7 @@
"platform": "malyan_m200_platform.stl", "platform": "malyan_m200_platform.stl",
"has_machine_quality": true, "has_machine_quality": true,
"has_materials": true, "has_materials": true,
"preferred_quality": "*normal*", "preferred_quality_type": "normal",
"supports_usb_connection": true, "supports_usb_connection": true,
"visible": true, "visible": true,
"first_start_actions": ["MachineSettingsAction"], "first_start_actions": ["MachineSettingsAction"],

2
resources/definitions/monoprice_select_mini_v2.def.json
View file

@ -10,7 +10,7 @@
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"has_machine_quality": true, "has_machine_quality": true,
"has_materials": true, "has_materials": true,
"preferred_quality": "*normal*", "preferred_quality_type": "normal",
"visible": true "visible": true
}, },

2
resources/definitions/tevo_blackwidow.def.json
View file

@ -11,7 +11,7 @@
"has_materials": false, "has_materials": false,
"has_machine_quality": true, "has_machine_quality": true,
"platform": "tevo_blackwidow.stl", "platform": "tevo_blackwidow.stl",
"preferred_quality": "*normal*" "preferred_quality_type": "normal"
}, },
"overrides": "overrides":
{ {

1
resources/definitions/ultimaker2_plus.def.json
View file

@ -9,7 +9,6 @@
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Plusbackplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
"preferred_variant": "*0.4*",
"preferred_variant_name": "0.4 mm", "preferred_variant_name": "0.4 mm",
"has_variants": true, "has_variants": true,
"has_materials": true, "has_materials": true,

2
resources/definitions/ultimaker3.def.json
View file

@ -15,9 +15,7 @@
"has_machine_materials": true, "has_machine_materials": true,
"has_variant_materials": true, "has_variant_materials": true,
"has_variants": true, "has_variants": true,
"preferred_variant": "*aa04*",
"preferred_variant_name": "AA 0.4", "preferred_variant_name": "AA 0.4",
"preferred_quality": "*Normal*",
"preferred_quality_type": "normal", "preferred_quality_type": "normal",
"variants_name": "Print core", "variants_name": "Print core",
"machine_extruder_trains": "machine_extruder_trains":

2
resources/definitions/ultimaker3_extended.def.json
View file

@ -16,7 +16,7 @@
"has_variant_materials": true, "has_variant_materials": true,
"has_materials": true, "has_materials": true,
"has_variants": true, "has_variants": true,
"preferred_variant": "*aa04*", "preferred_variant_name": "AA 0.4",
"variants_name": "Print core", "variants_name": "Print core",
"machine_extruder_trains": "machine_extruder_trains":
{ {