From 4754fd51ad09b33c436d0ac0bba34975c3438268 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Sat, 1 Jul 2017 18:22:52 +0200 Subject: [PATCH 01/11] feat: topmost skin: Roofing settings (CURA-3940) --- resources/definitions/fdmprinter.def.json | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index dca938854a..c2f281574b 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -699,6 +699,20 @@ } } }, + "topmost_skin_line_width": + { + "label": "Roofing Line Width", + "description": "Width of a single line of the areas at the top of the print.", + "unit": "mm", + "minimum_value": "0.001", + "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size", + "maximum_value_warning": "2 * machine_nozzle_size", + "default_value": 0.4, + "type": "float", + "value": "line_width", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, "skin_line_width": { "label": "Top/Bottom Line Width", @@ -932,6 +946,46 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, + "topmost_skin_extruder_nr": + { + "label": "Roofing Extruder", + "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", + "type": "optional_extruder", + "default_value": "-1", + "value": "-1", + "settable_per_mesh": true, + "settable_per_extruder": false, + "settable_per_meshgroup": true, + "settable_globally": true, + "enabled": "machine_extruder_count > 1" + }, + "topmost_skin_layer_count": + { + "label": "Roofing Layers", + "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.", + "default_value": 1, + "minimum_value": "0", + "maximum_value_warning": "top_layers - 1", + "type": "int", + "value": "0 if infill_sparse_density == 100 else 1", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, + "topmost_skin_pattern": + { + "label": "Roofing Pattern", + "description": "The pattern of the top most layers.", + "type": "enum", + "options": + { + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default_value": "lines", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, "top_bottom_extruder_nr": { "label": "Top/Bottom Extruder", @@ -2010,6 +2064,20 @@ } } }, + "speed_topmost_skin": + { + "label": "Roofing Speed", + "description": "The speed at which roofing layers are printed.", + "unit": "mm/s", + "type": "float", + "minimum_value": "0.1", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", + "maximum_value_warning": "150", + "default_value": 25, + "value": "speed_print / 60 * 25", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, "speed_topbottom": { "label": "Top/Bottom Speed", @@ -2350,6 +2418,21 @@ } } }, + "acceleration_topmost_skin": + { + "label": "Roofing Acceleration", + "description": "The acceleration with which roofing layers are printed.", + "unit": "mm/s²", + "type": "float", + "minimum_value": "0.1", + "minimum_value_warning": "100", + "maximum_value_warning": "10000", + "default_value": 3000, + "value": "acceleration_print", + "enabled": "resolveOrValue('acceleration_enabled')", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, "acceleration_topbottom": { "label": "Top/Bottom Acceleration", @@ -2639,6 +2722,20 @@ } } }, + "jerk_topmost_skin": + { + "label": "Roofing Jerk", + "description": "The maximum instantaneous velocity change with which roofing layers are printed.", + "unit": "mm/s", + "type": "float", + "minimum_value": "0.1", + "maximum_value_warning": "50", + "default_value": 20, + "value": "jerk_print", + "enabled": "resolveOrValue('jerk_enabled')", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, "jerk_topbottom": { "label": "Top/Bottom Jerk", From c91d11fde31ba45bb699b7c359fbded473c6056d Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Sat, 1 Jul 2017 18:23:19 +0200 Subject: [PATCH 02/11] fix: make ironing inherit from topmost_skin rather than top_bottom (CURA-3940) --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c2f281574b..60c5225cc0 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2099,7 +2099,7 @@ "type": "float", "unit": "mm/s", "default_value": 20.0, - "value": "speed_topbottom * 20 / 30", + "value": "speed_topmost_skin * 20 / 30", "minimum_value": "0.001", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "100", @@ -2458,7 +2458,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "default_value": 3000, - "value": "acceleration_topbottom", + "value": "acceleration_topmost_skin", "enabled": "resolveOrValue('acceleration_enabled') and ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true @@ -2759,7 +2759,7 @@ "minimum_value": "0.1", "maximum_value_warning": "50", "default_value": 20, - "value": "jerk_topbottom", + "value": "jerk_topmost_skin", "enabled": "resolveOrValue('jerk_enabled') and ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true From 89cafc867eeb27a281159d8638e87e1a87c66c91 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Jul 2017 14:46:10 +0200 Subject: [PATCH 03/11] cleanup: remove superfluous value equal to default_value (CURA-3940) --- resources/definitions/fdmprinter.def.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 60c5225cc0..dcd3284b36 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -868,7 +868,6 @@ "description": "The extruder train used for printing the walls. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", - "value": "-1", "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, @@ -952,7 +951,6 @@ "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", - "value": "-1", "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, @@ -992,7 +990,6 @@ "description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", - "value": "-1", "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, @@ -1298,7 +1295,6 @@ "description": "The extruder train used for printing infill. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", - "value": "-1", "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, From 7b56ba41b1f77605b3d42f73010cd6b1a9d2aad3 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Jul 2017 14:53:28 +0200 Subject: [PATCH 04/11] fix: topmost_skin_extruder_nr enabled function (CURA-3940) --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index dcd3284b36..4ba269679e 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -955,7 +955,7 @@ "settable_per_extruder": false, "settable_per_meshgroup": true, "settable_globally": true, - "enabled": "machine_extruder_count > 1" + "enabled": "machine_extruder_count > 1 and topmost_skin_layer_count > 0 and top_layers > 0" }, "topmost_skin_layer_count": { From 9dcb2c918ee50194a4c3bb0b81e2eae5128bb070 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Jul 2017 14:54:48 +0200 Subject: [PATCH 05/11] fix: disable topmost skin settings if there is no top skin (CURA-3940) --- resources/definitions/fdmprinter.def.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4ba269679e..537093bf51 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -711,7 +711,8 @@ "type": "float", "value": "line_width", "limit_to_extruder": "topmost_skin_extruder_nr", - "settable_per_mesh": true + "settable_per_mesh": true, + "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" }, "skin_line_width": { @@ -967,7 +968,8 @@ "type": "int", "value": "0 if infill_sparse_density == 100 else 1", "limit_to_extruder": "topmost_skin_extruder_nr", - "settable_per_mesh": true + "settable_per_mesh": true, + "enabled": "top_layers > 0" }, "topmost_skin_pattern": { @@ -982,7 +984,8 @@ }, "default_value": "lines", "limit_to_extruder": "topmost_skin_extruder_nr", - "settable_per_mesh": true + "settable_per_mesh": true, + "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" }, "top_bottom_extruder_nr": { @@ -2072,7 +2075,8 @@ "default_value": 25, "value": "speed_print / 60 * 25", "limit_to_extruder": "topmost_skin_extruder_nr", - "settable_per_mesh": true + "settable_per_mesh": true, + "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" }, "speed_topbottom": { @@ -2425,7 +2429,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_print", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and topmost_skin_layer_count > 0 and top_layers > 0", "limit_to_extruder": "topmost_skin_extruder_nr", "settable_per_mesh": true }, @@ -2728,7 +2732,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_print", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and topmost_skin_layer_count > 0 and top_layers > 0", "limit_to_extruder": "topmost_skin_extruder_nr", "settable_per_mesh": true }, From 26ac70d2bd80593614d63bb0cb506b68127b35ea Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 17 Jul 2017 15:16:11 +0200 Subject: [PATCH 06/11] feat: topmost_skin_angles (CURA-3940) --- resources/definitions/fdmprinter.def.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 537093bf51..0854d34305 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -987,6 +987,16 @@ "settable_per_mesh": true, "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" }, + "topmost_skin_angles": + { + "label": "Roofing Line Directions", + "description": "A list of integer line directions to use when the roofing layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", + "type": "[int]", + "default_value": "[ ]", + "enabled": "topmost_skin_pattern != 'concentric'", + "limit_to_extruder": "topmost_skin_extruder_nr", + "settable_per_mesh": true + }, "top_bottom_extruder_nr": { "label": "Top/Bottom Extruder", From 141543d7ca897caaa9305955a6c9bd6f5936776e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 17 Jul 2017 15:32:57 +0200 Subject: [PATCH 07/11] don't enable roofing by default (CURA-3940) --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0854d34305..98122e9879 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -962,7 +962,7 @@ { "label": "Roofing Layers", "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.", - "default_value": 1, + "default_value": 0, "minimum_value": "0", "maximum_value_warning": "top_layers - 1", "type": "int", From 83f6dec28d703d586f33f399de5c14c68a78f31e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 17 Jul 2017 15:51:36 +0200 Subject: [PATCH 08/11] rename roofing settings: topmost_skin => roofing (CURA-3940) --- resources/definitions/fdmprinter.def.json | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 98122e9879..4f0cf3b04a 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -699,7 +699,7 @@ } } }, - "topmost_skin_line_width": + "roofing_line_width": { "label": "Roofing Line Width", "description": "Width of a single line of the areas at the top of the print.", @@ -710,9 +710,9 @@ "default_value": 0.4, "type": "float", "value": "line_width", - "limit_to_extruder": "topmost_skin_extruder_nr", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, - "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" + "enabled": "roofing_layer_count > 0 and top_layers > 0" }, "skin_line_width": { @@ -946,7 +946,7 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "topmost_skin_extruder_nr": + "roofing_extruder_nr": { "label": "Roofing Extruder", "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", @@ -956,9 +956,9 @@ "settable_per_extruder": false, "settable_per_meshgroup": true, "settable_globally": true, - "enabled": "machine_extruder_count > 1 and topmost_skin_layer_count > 0 and top_layers > 0" + "enabled": "machine_extruder_count > 1 and roofing_layer_count > 0 and top_layers > 0" }, - "topmost_skin_layer_count": + "roofing_layer_count": { "label": "Roofing Layers", "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.", @@ -967,11 +967,11 @@ "maximum_value_warning": "top_layers - 1", "type": "int", "value": "0 if infill_sparse_density == 100 else 1", - "limit_to_extruder": "topmost_skin_extruder_nr", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "top_layers > 0" }, - "topmost_skin_pattern": + "roofing_pattern": { "label": "Roofing Pattern", "description": "The pattern of the top most layers.", @@ -983,18 +983,18 @@ "zigzag": "Zig Zag" }, "default_value": "lines", - "limit_to_extruder": "topmost_skin_extruder_nr", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, - "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" + "enabled": "roofing_layer_count > 0 and top_layers > 0" }, - "topmost_skin_angles": + "roofing_angles": { "label": "Roofing Line Directions", "description": "A list of integer line directions to use when the roofing layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", "type": "[int]", "default_value": "[ ]", - "enabled": "topmost_skin_pattern != 'concentric'", - "limit_to_extruder": "topmost_skin_extruder_nr", + "enabled": "roofing_pattern != 'concentric'", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true }, "top_bottom_extruder_nr": @@ -2073,7 +2073,7 @@ } } }, - "speed_topmost_skin": + "speed_roofing": { "label": "Roofing Speed", "description": "The speed at which roofing layers are printed.", @@ -2084,9 +2084,9 @@ "maximum_value_warning": "150", "default_value": 25, "value": "speed_print / 60 * 25", - "limit_to_extruder": "topmost_skin_extruder_nr", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, - "enabled": "topmost_skin_layer_count > 0 and top_layers > 0" + "enabled": "roofing_layer_count > 0 and top_layers > 0" }, "speed_topbottom": { @@ -2109,7 +2109,7 @@ "type": "float", "unit": "mm/s", "default_value": 20.0, - "value": "speed_topmost_skin * 20 / 30", + "value": "speed_roofing * 20 / 30", "minimum_value": "0.001", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "100", @@ -2428,7 +2428,7 @@ } } }, - "acceleration_topmost_skin": + "acceleration_roofing": { "label": "Roofing Acceleration", "description": "The acceleration with which roofing layers are printed.", @@ -2439,8 +2439,8 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_print", - "enabled": "resolveOrValue('acceleration_enabled') and topmost_skin_layer_count > 0 and top_layers > 0", - "limit_to_extruder": "topmost_skin_extruder_nr", + "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true }, "acceleration_topbottom": @@ -2468,7 +2468,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "default_value": 3000, - "value": "acceleration_topmost_skin", + "value": "acceleration_roofing", "enabled": "resolveOrValue('acceleration_enabled') and ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true @@ -2732,7 +2732,7 @@ } } }, - "jerk_topmost_skin": + "jerk_roofing": { "label": "Roofing Jerk", "description": "The maximum instantaneous velocity change with which roofing layers are printed.", @@ -2742,8 +2742,8 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_print", - "enabled": "resolveOrValue('jerk_enabled') and topmost_skin_layer_count > 0 and top_layers > 0", - "limit_to_extruder": "topmost_skin_extruder_nr", + "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0", + "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true }, "jerk_topbottom": @@ -2769,7 +2769,7 @@ "minimum_value": "0.1", "maximum_value_warning": "50", "default_value": 20, - "value": "jerk_topmost_skin", + "value": "jerk_roofing", "enabled": "resolveOrValue('jerk_enabled') and ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true From d5be43d45ddf2f6a986e9399dd64bf522c8aabe4 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 20 Jul 2017 15:42:04 +0200 Subject: [PATCH 09/11] roofing: inherit from topbottom (CURA-3940) --- resources/definitions/fdmprinter.def.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 27fd838aa6..6f46d62c66 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -709,7 +709,7 @@ "maximum_value_warning": "2 * machine_nozzle_size", "default_value": 0.4, "type": "float", - "value": "line_width", + "value": "skin_line_width", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "roofing_layer_count > 0 and top_layers > 0" @@ -952,6 +952,7 @@ "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", + "value": "top_bottom_extruder_nr", "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, @@ -983,6 +984,7 @@ "zigzag": "Zig Zag" }, "default_value": "lines", + "value": "top_bottom_pattern", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "roofing_layer_count > 0 and top_layers > 0" @@ -993,6 +995,7 @@ "description": "A list of integer line directions to use when the roofing layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", "type": "[int]", "default_value": "[ ]", + "value": "skin_angles", "enabled": "roofing_pattern != 'concentric'", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true @@ -2083,7 +2086,7 @@ "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", "default_value": 25, - "value": "speed_print / 60 * 25", + "value": "speed_topbottom", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "roofing_layer_count > 0 and top_layers > 0" @@ -2438,7 +2441,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "default_value": 3000, - "value": "acceleration_print", + "value": "acceleration_topbottom", "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true @@ -2741,7 +2744,7 @@ "minimum_value": "0.1", "maximum_value_warning": "50", "default_value": 20, - "value": "jerk_print", + "value": "jerk_topbottom", "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true From 5f97d2cbde1d7fa6d99263a97e9bdb27f0c3384e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 21 Jul 2017 15:53:05 +0200 Subject: [PATCH 10/11] fix: account for roofing extruder when checking which extruder is used (CURA-4069, CURA-3940) --- cura/Settings/ExtruderManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index e490d94c16..1c254f5cfc 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -448,6 +448,7 @@ class ExtruderManager(QObject): limit_to_extruder_feature_list = ["wall_extruder_nr", "wall_0_extruder_nr", "wall_x_extruder_nr", + "roofing_extruder_nr", "top_bottom_extruder_nr", "infill_extruder_nr", ] From 506a0a48f4e720ad2e2f90cf411707a6994b0679 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 26 Jul 2017 14:26:24 +0200 Subject: [PATCH 11/11] Reword: roofing -> top surface infill CURA-3940 --- resources/definitions/fdmprinter.def.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c5e4a8f98d..53a346f4d6 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -701,7 +701,7 @@ }, "roofing_line_width": { - "label": "Roofing Line Width", + "label": "Top Surface Infill Line Width", "description": "Width of a single line of the areas at the top of the print.", "unit": "mm", "minimum_value": "0.001", @@ -948,7 +948,7 @@ }, "roofing_extruder_nr": { - "label": "Roofing Extruder", + "label": "Top Surface Infill Extruder", "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", @@ -961,7 +961,7 @@ }, "roofing_layer_count": { - "label": "Roofing Layers", + "label": "Top Surface Infill Layers", "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.", "default_value": 0, "minimum_value": "0", @@ -974,7 +974,7 @@ }, "roofing_pattern": { - "label": "Roofing Pattern", + "label": "Top Surface Infill Pattern", "description": "The pattern of the top most layers.", "type": "enum", "options": @@ -991,8 +991,8 @@ }, "roofing_angles": { - "label": "Roofing Line Directions", - "description": "A list of integer line directions to use when the roofing layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", + "label": "Top Surface Infill Line Directions", + "description": "A list of integer line directions to use when the top surface infill layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", "type": "[int]", "default_value": "[ ]", "value": "skin_angles",