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

Remove wall_extruder_nr from fdmprinter

Browse Source 
CURA-4145

 - Remove "wall_extruder_nr"
 - Remove all "limit_to_extruder" for all parent wall settings
 - Change settings that used to depend on the wall extruder to get
   value from the inner wall extruder
This commit is contained in:
Lipu Fei 2017-08-14 13:21:24 +02:00
parent cc26d52af3
commit 2a695517f7
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/definitions/fdmprinter.def.json
View File

@ -665,7 +665,6 @@
"value": "line_width", "value": "line_width",
"default_value": 0.4, "default_value": 0.4,
"type": "float", "type": "float",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -863,19 +862,6 @@
"description": "Shell", "description": "Shell",
"type": "category", "type": "category",
"children": "children":
{
"wall_extruder_nr":
{
"label": "Wall Extruder",
"description": "The extruder train used for printing the walls. This is used in multi-extrusion.",
"type": "optional_extruder",
"default_value": "-1",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": true,
"settable_globally": true,
"enabled": "machine_extruder_count > 1",
"children":
{ {
"wall_0_extruder_nr": "wall_0_extruder_nr":
{ {
@ -883,7 +869,6 @@
"description": "The extruder train used for printing the outer wall. This is used in multi-extrusion.", "description": "The extruder train used for printing the outer wall. This is used in multi-extrusion.",
"type": "optional_extruder", "type": "optional_extruder",
"default_value": "-1", "default_value": "-1",
"value": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
@ -896,14 +881,11 @@
"description": "The extruder train used for printing the inner walls. This is used in multi-extrusion.", "description": "The extruder train used for printing the inner walls. This is used in multi-extrusion.",
"type": "optional_extruder", "type": "optional_extruder",
"default_value": "-1", "default_value": "-1",
"value": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
"settable_globally": true, "settable_globally": true,
"enabled": "machine_extruder_count > 1" "enabled": "machine_extruder_count > 1"
}
}
}, },
"wall_thickness": "wall_thickness":
{ {
@ -915,7 +897,7 @@
"minimum_value_warning": "line_width", "minimum_value_warning": "line_width",
"maximum_value_warning": "10 * line_width", "maximum_value_warning": "10 * line_width",
"type": "float", "type": "float",
"limit_to_extruder": "wall_extruder_nr", "limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -929,7 +911,7 @@
"maximum_value_warning": "10", "maximum_value_warning": "10",
"type": "int", "type": "int",
"value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0", "value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0",
"limit_to_extruder": "wall_extruder_nr", "limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1166,7 +1148,7 @@
"description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"limit_to_extruder": "wall_extruder_nr", "limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -2043,7 +2025,6 @@
"maximum_value_warning": "150", "maximum_value_warning": "150",
"default_value": 30, "default_value": 30,
"value": "speed_print / 2", "value": "speed_print / 2",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -2396,7 +2377,6 @@
"default_value": 3000, "default_value": 3000,
"value": "acceleration_print", "value": "acceleration_print",
"enabled": "resolveOrValue('acceleration_enabled')", "enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -2702,7 +2682,6 @@
"default_value": 20, "default_value": 20,
"value": "jerk_print", "value": "jerk_print",
"enabled": "resolveOrValue('jerk_enabled')", "enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {