From 649cc4a881f81d352b195d6ec0c57d0bcb107471 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 9 Jul 2020 17:17:40 +0200 Subject: [PATCH 1/6] Replace support_tree_enable by a support_structure enum CURA-6711 --- cura/Settings/ExtruderManager.py | 2 +- resources/definitions/fdmprinter.def.json | 17 +++++++++++------ resources/setting_visibility/expert.cfg | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 67c582ad5e..1e9199d525 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -289,7 +289,7 @@ class ExtruderManager(QObject): return global_stack.getProperty("adhesion_extruder_nr", "value") # No adhesion? Well maybe there is still support brim. - if (global_stack.getProperty("support_enable", "value") or global_stack.getProperty("support_tree_enable", "value")) and global_stack.getProperty("support_brim_enable", "value"): + if (global_stack.getProperty("support_enable", "value") or global_stack.getProperty("support_structure", "value") == "tree") and global_stack.getProperty("support_brim_enable", "value"): return global_stack.getProperty("support_infill_extruder_nr", "value") # REALLY no adhesion? Use the first used extruder. diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d7fa82a2c2..c1346a3c3c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6207,13 +6207,18 @@ "description": "Features that haven't completely been fleshed out yet.", "children": { - "support_tree_enable": + "support_structure": { - "label": "Tree Support", - "description": "Generate a tree-like support with branches that support your print. This may reduce material usage and print time, but greatly increases slicing time.", - "type": "bool", - "default_value": false, - "settable_per_mesh": true, + "label": "Support Structure", + "description": "Generate a tree-like support ", + "type": "enum", + "options": + { + "normal": "Normal", + "tree": "Tree" + }, + "default_value": "normal", + "settable_per_mesh": false, "settable_per_extruder": false }, "support_tree_angle": diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index a5619ae784..895137eacd 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -349,7 +349,7 @@ smooth_spiralized_contours relative_extrusion [experimental] -support_tree_enable +support_structure support_tree_angle support_tree_branch_distance support_tree_branch_diameter From 00cc9ee9f52c88e3b6fe2142c3000ea804566edd Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 10 Jul 2020 11:22:25 +0200 Subject: [PATCH 2/6] Replace support_tree_enable by a support_structure in fdmprinter CURA-6711 --- resources/definitions/fdmprinter.def.json | 162 +++++++++++----------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c1346a3c3c..0ae94ede03 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -887,7 +887,7 @@ "maximum_value_warning": "3 * machine_nozzle_size", "default_value": 0.4, "type": "float", - "enabled": "(support_enable or support_tree_enable or support_meshes_present)", + "enabled": "(support_enable or support_meshes_present)", "value": "line_width", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, @@ -903,7 +903,7 @@ "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size", "type": "float", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_interface_enable", + "enabled": "(support_enable or support_meshes_present) and support_interface_enable", "limit_to_extruder": "support_interface_extruder_nr", "value": "line_width", "settable_per_mesh": false, @@ -920,7 +920,7 @@ "minimum_value_warning": "0.4 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size", "type": "float", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_roof_enable", + "enabled": "(support_enable or support_meshes_present) and support_roof_enable", "limit_to_extruder": "support_roof_extruder_nr", "value": "extruderValue(support_roof_extruder_nr, 'support_interface_line_width')", "settable_per_mesh": false, @@ -936,7 +936,7 @@ "minimum_value_warning": "0.4 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size", "type": "float", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_bottom_enable", + "enabled": "(support_enable or support_meshes_present) and support_bottom_enable", "limit_to_extruder": "support_bottom_extruder_nr", "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_line_width')", "settable_per_mesh": false, @@ -2847,7 +2847,7 @@ "maximum_value_warning": "150", "default_value": 60, "value": "speed_print", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": false, "limit_to_extruder": "support_extruder_nr", "settable_per_extruder": true, @@ -2864,7 +2864,7 @@ "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", "value": "speed_support", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -2879,7 +2879,7 @@ "minimum_value": "0.1", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_interface_extruder_nr", "value": "speed_support / 1.5", "settable_per_mesh": false, @@ -2896,7 +2896,7 @@ "minimum_value": "0.1", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_roof_extruder_nr", "value": "extruderValue(support_roof_extruder_nr, 'speed_support_interface')", "settable_per_mesh": false, @@ -2912,7 +2912,7 @@ "minimum_value": "0.1", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_bottom_extruder_nr", "value": "extruderValue(support_bottom_extruder_nr, 'speed_support_interface')", "settable_per_mesh": false, @@ -3187,7 +3187,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_print", - "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_meshes_present)", "settable_per_mesh": false, "limit_to_extruder": "support_extruder_nr", "settable_per_extruder": true, @@ -3204,7 +3204,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_meshes_present)", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -3220,7 +3220,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "enabled": "resolveOrValue('acceleration_enabled') and support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('acceleration_enabled') and support_interface_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_interface_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true, @@ -3237,7 +3237,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "enabled": "acceleration_enabled and support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "acceleration_enabled and support_roof_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_roof_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -3253,7 +3253,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "enabled": "acceleration_enabled and support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "acceleration_enabled and support_bottom_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_bottom_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -3472,7 +3472,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_print", - "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "support_extruder_nr", @@ -3488,7 +3488,7 @@ "value": "jerk_support", "minimum_value": "0", "maximum_value_warning": "50", - "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_meshes_present)", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -3503,7 +3503,7 @@ "value": "jerk_support", "minimum_value": "0", "maximum_value_warning": "50", - "enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_interface_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true, @@ -3519,7 +3519,7 @@ "value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')", "minimum_value": "0", "maximum_value_warning": "50", - "enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_roof_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -3534,7 +3534,7 @@ "value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')", "minimum_value": "0", "maximum_value_warning": "50", - "enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and (support_enable or support_meshes_present)", "limit_to_extruder": "support_bottom_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -3778,7 +3778,7 @@ "description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure.", "type": "bool", "default_value": true, - "enabled": "retraction_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "retraction_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -4108,7 +4108,7 @@ "type": "extruder", "default_value": "0", "value": "int(defaultExtruderPosition())", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false, "children": { @@ -4119,7 +4119,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -4130,7 +4130,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -4141,7 +4141,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false, "children": @@ -4153,7 +4153,7 @@ "type": "extruder", "default_value": "0", "value": "support_interface_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -4164,7 +4164,7 @@ "type": "extruder", "default_value": "0", "value": "support_interface_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false } @@ -4184,7 +4184,7 @@ }, "default_value": "everywhere", "resolve": "'everywhere' if 'everywhere' in extruderValues('support_type') else 'buildplate'", - "enabled": "support_enable or support_tree_enable", + "enabled": "support_enable", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -4199,7 +4199,7 @@ "maximum_value_warning": "80", "default_value": 50, "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", - "enabled": "support_enable or support_tree_enable", + "enabled": "support_enable", "settable_per_mesh": true }, "support_pattern": @@ -4218,7 +4218,7 @@ "gyroid": "Gyroid" }, "default_value": "zigzag", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -4232,8 +4232,8 @@ "minimum_value_warning": "1 if support_pattern == 'concentric' else 0", "maximum_value_warning": "0 if (support_skip_some_zags and support_pattern == 'zigzag') else 3", "type": "int", - "value": "1 if support_tree_enable else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "value": "1 if support_structure=='tree' else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)", + "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -4245,7 +4245,7 @@ "type": "bool", "default_value": false, "value": "support_pattern == 'cross' or support_pattern == 'gyroid'", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')", + "enabled": "(support_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -4256,7 +4256,7 @@ "description": "Connect the ZigZags. This will increase the strength of the zig zag support structure.", "type": "bool", "default_value": true, - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_pattern == 'zigzag'", + "enabled": "(support_enable or support_meshes_present) and support_pattern == 'zigzag'", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -4270,8 +4270,8 @@ "minimum_value": "0", "maximum_value_warning": "100", "default_value": 15, - "value": "15 if support_enable else 0 if support_tree_enable else 15", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15", + "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4286,7 +4286,7 @@ "minimum_value": "0", "minimum_value_warning": "support_line_width", "default_value": 2.66, - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "value": "0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, @@ -4301,7 +4301,7 @@ "minimum_value": "0", "minimum_value_warning": "support_line_width", "default_value": 2.66, - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "value": "support_line_distance", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, @@ -4315,7 +4315,7 @@ "description": "A list of integer line directions to use. 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 default angle 0 degrees.", "type": "[int]", "default_value": "[ ]", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_pattern != 'concentric' and support_infill_rate > 0", + "enabled": "(support_enable or support_meshes_present) and support_pattern != 'concentric' and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -4326,7 +4326,7 @@ "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.", "type": "bool", "default_value": false, - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -4340,7 +4340,7 @@ "default_value": 8.0, "minimum_value": "0.0", "maximum_value_warning": "50.0", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_brim_enable", + "enabled": "(support_enable or support_meshes_present) and support_brim_enable", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "support_infill_extruder_nr", @@ -4355,7 +4355,7 @@ "minimum_value": "0", "maximum_value_warning": "50 / skirt_brim_line_width", "value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_brim_enable", + "enabled": "(support_enable or support_meshes_present) and support_brim_enable", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "support_infill_extruder_nr" @@ -4372,7 +4372,7 @@ "maximum_value_warning": "machine_nozzle_size", "default_value": 0.1, "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": true, "children": { @@ -4385,7 +4385,7 @@ "maximum_value_warning": "machine_nozzle_size", "default_value": 0.1, "type": "float", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", "settable_per_mesh": true @@ -4401,7 +4401,7 @@ "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0", "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr", "type": "float", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and resolveOrValue('support_type') == 'everywhere'", + "enabled": "(support_enable or support_meshes_present) and resolveOrValue('support_type') == 'everywhere'", "settable_per_mesh": true } } @@ -4416,7 +4416,7 @@ "maximum_value_warning": "1.5 * machine_nozzle_tip_outer_diameter", "default_value": 0.7, "limit_to_extruder": "support_infill_extruder_nr", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": true }, "support_xy_overrides_z": @@ -4525,7 +4525,7 @@ "maximum_value_warning": "0.75 * machine_nozzle_size", "maximum_value": "resolveOrValue('layer_height') * 8", "value": "resolveOrValue('layer_height')", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0", + "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false }, @@ -4538,7 +4538,7 @@ "minimum_value": "0", "maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'zigzag' or support_pattern == 'concentric') else 5", "maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0", + "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false }, @@ -4551,7 +4551,7 @@ "default_value": 1, "minimum_value": "0.0001", "minimum_value_warning": "3 * resolveOrValue('layer_height')", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0 and gradual_support_infill_steps > 0", + "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0 and gradual_support_infill_steps > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false }, @@ -4575,7 +4575,7 @@ "type": "bool", "default_value": false, "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": true, "children": { @@ -4587,7 +4587,7 @@ "default_value": false, "value": "extruderValue(support_roof_extruder_nr, 'support_interface_enable')", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": true }, "support_bottom_enable": @@ -4598,7 +4598,7 @@ "default_value": false, "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_enable')", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": true } } @@ -4614,7 +4614,7 @@ "minimum_value_warning": "0.2 + layer_height", "maximum_value_warning": "10", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true, "children": { @@ -4630,7 +4630,7 @@ "maximum_value_warning": "10", "value": "extruderValue(support_roof_extruder_nr, 'support_interface_height')", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true }, "support_bottom_height": @@ -4645,7 +4645,7 @@ "minimum_value_warning": "min(support_bottom_distance + layer_height, support_bottom_stair_step_height)", "maximum_value_warning": "10", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true } } @@ -4659,7 +4659,7 @@ "minimum_value": "0", "maximum_value_warning": "support_interface_height", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true }, "support_interface_density": @@ -4672,7 +4672,7 @@ "minimum_value": "0", "maximum_value_warning": "100", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true, "children": @@ -4687,7 +4687,7 @@ "minimum_value": "0", "maximum_value": "100", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "value": "extruderValue(support_roof_extruder_nr, 'support_interface_density')", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4704,7 +4704,7 @@ "minimum_value_warning": "support_roof_line_width - 0.0001", "value": "0 if support_roof_density == 0 else (support_roof_line_width * 100) / support_roof_density * (2 if support_roof_pattern == 'grid' else (3 if support_roof_pattern == 'triangles' else 1))", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true } @@ -4720,7 +4720,7 @@ "minimum_value": "0", "maximum_value": "100", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_density')", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4737,7 +4737,7 @@ "minimum_value_warning": "support_bottom_line_width - 0.0001", "value": "0 if support_bottom_density == 0 else (support_bottom_line_width * 100) / support_bottom_density * (2 if support_bottom_pattern == 'grid' else (3 if support_bottom_pattern == 'triangles' else 1))", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true } @@ -4760,7 +4760,7 @@ }, "default_value": "concentric", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true, "children": @@ -4781,7 +4781,7 @@ "default_value": "concentric", "value": "extruderValue(support_roof_extruder_nr, 'support_interface_pattern')", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -4801,7 +4801,7 @@ "default_value": "concentric", "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_pattern')", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true } @@ -4817,7 +4817,7 @@ "minimum_value": "0", "minimum_value_warning": "minimum_support_area", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true, "children": { @@ -4832,7 +4832,7 @@ "minimum_value": "0", "minimum_value_warning": "minimum_support_area", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true }, "minimum_bottom_area": @@ -4846,7 +4846,7 @@ "minimum_value": "0", "minimum_value_warning": "minimum_support_area", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "settable_per_mesh": true } } @@ -4860,7 +4860,7 @@ "default_value": 0.0, "maximum_value": "extruderValue(support_extruder_nr, 'support_offset')", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_interface_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true, "children": @@ -4875,7 +4875,7 @@ "value": "extruderValue(support_roof_extruder_nr, 'support_interface_offset')", "maximum_value": "extruderValue(support_extruder_nr, 'support_offset')", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_roof_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -4889,7 +4889,7 @@ "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_offset')", "maximum_value": "extruderValue(support_extruder_nr, 'support_offset')", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true } @@ -4902,7 +4902,7 @@ "type": "[int]", "default_value": "[ ]", "limit_to_extruder": "support_interface_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_interface_enable and support_interface_pattern != 'concentric'", + "enabled": "(support_enable or support_meshes_present) and support_interface_enable and support_interface_pattern != 'concentric'", "settable_per_mesh": false, "settable_per_extruder": true, "children": @@ -4915,7 +4915,7 @@ "default_value": "[ ]", "value": "support_interface_angles", "limit_to_extruder": "support_roof_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_roof_enable and support_roof_pattern != 'concentric'", + "enabled": "(support_enable or support_meshes_present) and support_roof_enable and support_roof_pattern != 'concentric'", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -4927,7 +4927,7 @@ "default_value": "[ ]", "value": "support_interface_angles", "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_bottom_enable and support_bottom_pattern != 'concentric'", + "enabled": "(support_enable or support_meshes_present) and support_bottom_enable and support_bottom_pattern != 'concentric'", "settable_per_mesh": false, "settable_per_extruder": true } @@ -4939,7 +4939,7 @@ "description": "When enabled, the print cooling fan speed is altered for the skin regions immediately above the support.", "type": "bool", "default_value": false, - "enabled": "support_enable or support_tree_enable or support_meshes_present", + "enabled": "support_enable or support_meshes_present", "settable_per_mesh": false }, "support_supported_skin_fan_speed": @@ -4951,7 +4951,7 @@ "maximum_value": "100", "default_value": 100, "type": "float", - "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_fan_enable", + "enabled": "(support_enable or support_meshes_present) and support_fan_enable", "settable_per_mesh": false }, "support_use_towers": @@ -5198,7 +5198,7 @@ "description": "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions.", "type": "bool", "default_value": true, - "enabled": "resolveOrValue('adhesion_type') == 'brim' and (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "resolveOrValue('adhesion_type') == 'brim' and (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "support_infill_extruder_nr" @@ -5982,7 +5982,7 @@ "description": "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle.", "type": "bool", "default_value": true, - "enabled": "not (support_enable or support_tree_enable or support_meshes_present)", + "enabled": "not (support_enable or support_meshes_present)", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6232,7 +6232,7 @@ "maximum_value_warning": "60", "default_value": 40, "limit_to_extruder": "support_infill_extruder_nr", - "enabled": "support_tree_enable", + "enabled": "support_enable and support_structure=='tree'", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -6245,7 +6245,7 @@ "minimum_value": "0.001", "default_value": 1, "limit_to_extruder": "support_infill_extruder_nr", - "enabled": "support_tree_enable", + "enabled": "support_enable and support_structure=='tree'", "settable_per_mesh": true }, "support_tree_branch_diameter": @@ -6258,7 +6258,7 @@ "minimum_value_warning": "support_line_width * 2", "default_value": 2, "limit_to_extruder": "support_infill_extruder_nr", - "enabled": "support_tree_enable", + "enabled": "support_enable and support_structure=='tree'", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -6273,7 +6273,7 @@ "maximum_value_warning": "15", "default_value": 5, "limit_to_extruder": "support_infill_extruder_nr", - "enabled": "support_tree_enable", + "enabled": "support_enable and support_structure=='tree'", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -6289,7 +6289,7 @@ "default_value": 0.4, "value": "support_line_width / 2", "limit_to_extruder": "support_infill_extruder_nr", - "enabled": "support_tree_enable and support_tree_branch_diameter_angle > 0", + "enabled": "support_enable and support_structure=='tree' and support_tree_branch_diameter_angle > 0", "settable_per_mesh": false, "settable_per_extruder": true }, From e006bad297ef50d4408e192dece4f5fe78bc54c2 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 10 Jul 2020 11:23:28 +0200 Subject: [PATCH 3/6] Update infill_rate resolve value for support_structure CURA-6711 --- resources/definitions/maker_starter.def.json | 2 +- resources/definitions/renkforce_rf100.def.json | 2 +- resources/definitions/renkforce_rf100_v2.def.json | 2 +- resources/definitions/renkforce_rf100_xl.def.json | 2 +- resources/definitions/winbo_dragonl4.def.json | 2 +- resources/definitions/winbo_mini2.def.json | 2 +- resources/definitions/winbo_superhelper105.def.json | 2 +- resources/quality/katihal/alya3dp_normal.inst.cfg | 2 +- resources/quality/katihal/alyanx3dp_normal.inst.cfg | 2 +- resources/quality/katihal/kupido_normal.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_best.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_fast.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_normal.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 5b644da9c1..7eeb979410 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -81,7 +81,7 @@ "default_value": "ZigZag" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "adhesion_type": { "default_value": "raft" diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 520f7ef6f8..144877b247 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -201,7 +201,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 2715e5d227..1cea9779aa 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -201,7 +201,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index 4ad438fb08..68d6e98f61 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -189,7 +189,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_enable else 0 if support_tree_enable else 15" + "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 754a1a77a2..3a705c1cda 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -124,7 +124,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" }, + "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index c2d2d9b7f4..c34e90a980 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -124,7 +124,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" }, + "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 576398551b..7f3f7f0981 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -113,7 +113,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_enable else 0 if support_tree_enable else 8" }, + "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/quality/katihal/alya3dp_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg index f5e2a02df1..c4f2b70a46 100644 --- a/resources/quality/katihal/alya3dp_normal.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/katihal/alyanx3dp_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg index bb00f4da43..cee0f9be41 100644 --- a/resources/quality/katihal/alyanx3dp_normal.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/katihal/kupido_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg index e317749c79..ea10a3bad7 100644 --- a/resources/quality/katihal/kupido_normal.inst.cfg +++ b/resources/quality/katihal/kupido_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 50a989446a..49d2ac2952 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 5908c970c8..c989044381 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index a597f49798..2ea1e491c4 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 1fb088a157..a562c8b33b 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 3d10a863a6..e66a6d3083 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -92,7 +92,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 0f2dca2732..0a585918bf 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index d439050cc5..cecd33ae68 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 7fc7cbe9ff..020d9cfb2d 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 8584d01f01..bc3ce62dc8 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 6416837c03..5b5efb543d 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index 1c883bb991..731259ac24 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 14b045176d..972d48732b 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35) speed_wall_x = =math.ceil(speed_print * 30 / 35) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index 291c08a74e..624c54b0b0 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index a6e5b5f005..dde9c3c63a 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index e45bdd6850..3313d15591 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index f11d0d6d9c..740f0a692f 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 1928387f81..35652904d3 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -35,7 +35,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index 957a79363c..b393048bdb 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -35,7 +35,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index c2d665077e..e5a218d9b6 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -34,7 +34,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index 6a15615cfe..c6339d7a23 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -33,7 +33,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 90750c53d4..28c1d36adb 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -38,7 +38,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.55 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_top_distance = 0.55 support_xy_distance = 0.7 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index ebbfcbe990..8034db74f2 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55) speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_xy_distance = 0.7 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 0983ca3f88..4fb01eadb5 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index c8a8d58379..b2a8c8dcbc 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index db63dd1c7b..c5e5dade9b 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -31,7 +31,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index 4306f25bfd..2e4465b333 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -31,7 +31,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 5b8e937883..7465edb88f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index d795f4ee70..ef34f14589 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index ab8838357e..4bdc98c850 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index 21b9c3bf09..a2e53665c4 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index e2ad5a52ed..32cc10fdd3 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 2.0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index c321b50435..1f6e60d1a0 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 080ec6a6fb..32b0150fe2 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40) speed_wall_x = =math.ceil(speed_print * 38 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_xy_distance = 0.6 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index 37066bb371..18319d3f89 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =math.ceil(speed_print * 35 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_xy_distance = 0.65 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 9ad54b3dbf..55ef46cfb0 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 support_xy_distance = 0.7 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 4e54892ddc..a2d9cc44ce 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 35ccc57089..2f21ece950 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 22ad9c16c2..3ef7330429 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -32,6 +32,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 51ed81c003..096da32189 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 75b353c1e1..f07c7d9a28 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index fdac81730c..6638c9d3f2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -33,6 +33,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index cc7e8aaa98..9fea067b4a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index 8836231e41..68e6811341 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 5d2cd669f6..b449a884ab 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -33,6 +33,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 From bc34c8dd0b298e74270f15d5b0f72151c96255f3 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Mon, 13 Jul 2020 15:51:14 +0200 Subject: [PATCH 4/6] Version upgrade support_tree_enable -> support_structure CURA-6711 --- .../VersionUpgrade462to47/VersionUpgrade462to47.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py index ae7e421ab8..23352bf4e2 100644 --- a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py +++ b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py @@ -21,7 +21,8 @@ _removed_settings = { "spaghetti_max_height", "spaghetti_inset", "spaghetti_flow", - "spaghetti_infill_extra_volume" + "spaghetti_infill_extra_volume", + "support_tree_enable" } # type: Set[str] class VersionUpgrade462to47(VersionUpgrade): @@ -100,7 +101,13 @@ class VersionUpgrade462to47(VersionUpgrade): correction = " + skin_line_width * (1.0 - ironing_flow / 100) / 2" ironing_inset = "=(" + ironing_inset + ")" + correction parser["values"]["ironing_inset"] = ironing_inset - + + # Set support_structure if necessary + if "support_tree_enable" in parser["values"]: + if parseBool(parser["values"]["support_tree_enable"]): + parser["values"]["support_structure"] = "tree" + parser["values"]["support_enable"] = "True" + for removed in set(parser["values"].keys()).intersection(_removed_settings): del parser["values"][removed] From 617b07061dcaa0d624fc7066f2f3f19004a55f50 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 14 Jul 2020 09:44:40 +0200 Subject: [PATCH 5/6] Take support_enable into account when evaluating support_structure. Unsure whether this is necessary, but we decided to do this to make the evaluation logically equivalent to the existing code currently in master. CURA-6711 --- resources/definitions/fdmprinter.def.json | 4 ++-- resources/definitions/maker_starter.def.json | 2 +- resources/definitions/renkforce_rf100.def.json | 2 +- resources/definitions/renkforce_rf100_v2.def.json | 2 +- resources/definitions/renkforce_rf100_xl.def.json | 2 +- resources/definitions/winbo_dragonl4.def.json | 2 +- resources/definitions/winbo_mini2.def.json | 2 +- resources/definitions/winbo_superhelper105.def.json | 2 +- resources/quality/katihal/alya3dp_normal.inst.cfg | 2 +- resources/quality/katihal/alyanx3dp_normal.inst.cfg | 2 +- resources/quality/katihal/kupido_normal.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_best.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_fast.inst.cfg | 2 +- resources/quality/key3d/key3d_tyro_normal.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg | 2 +- resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg | 2 +- resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg | 2 +- .../quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg | 2 +- resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- 55 files changed, 56 insertions(+), 56 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0ae94ede03..74ccbfdc59 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4232,7 +4232,7 @@ "minimum_value_warning": "1 if support_pattern == 'concentric' else 0", "maximum_value_warning": "0 if (support_skip_some_zags and support_pattern == 'zigzag') else 3", "type": "int", - "value": "1 if support_structure=='tree' else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)", + "value": "1 if support_enable and support_structure == 'tree' else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)", "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, @@ -4270,7 +4270,7 @@ "minimum_value": "0", "maximum_value_warning": "100", "default_value": 15, - "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15", + "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15", "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 7eeb979410..6687ef25af 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -81,7 +81,7 @@ "default_value": "ZigZag" }, "support_infill_rate": { - "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" + "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" }, "adhesion_type": { "default_value": "raft" diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 144877b247..0f0c4eed97 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -201,7 +201,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" + "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 1cea9779aa..218e6e1feb 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -201,7 +201,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" + "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index 68d6e98f61..5ab40d7e7f 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -189,7 +189,7 @@ "value": "False" }, "support_infill_rate": { - "value": "15 if support_structure=='normal' else 0 if support_structure=='tree' else 15" + "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" }, "support_line_width": { "value": "0.6" diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 3a705c1cda..2798abffc2 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -124,7 +124,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, + "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index c34e90a980..a43948a49d 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -124,7 +124,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, + "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 7f3f7f0981..2da031cb99 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -113,7 +113,7 @@ "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, - "support_infill_rate": { "value": "8 if support_structure=='normal' else 0 if support_structure=='tree' else 8" }, + "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, diff --git a/resources/quality/katihal/alya3dp_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg index c4f2b70a46..6b19e9cb6d 100644 --- a/resources/quality/katihal/alya3dp_normal.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/katihal/alyanx3dp_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg index cee0f9be41..2263c26dd0 100644 --- a/resources/quality/katihal/alyanx3dp_normal.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/katihal/kupido_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg index ea10a3bad7..65e84ba66c 100644 --- a/resources/quality/katihal/kupido_normal.inst.cfg +++ b/resources/quality/katihal/kupido_normal.inst.cfg @@ -44,7 +44,7 @@ support_top_distance = 0.15 support_z_distance = 0.25 support_bottom_distance = 0.15 support_brim_width = 6 -support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 49d2ac2952..82d3e0c35e 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index c989044381..0d36b5a734 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 2ea1e491c4..cf31d10c4c 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index a562c8b33b..4eb37a08ea 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index e66a6d3083..787a05a58a 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -92,7 +92,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 0a585918bf..b1069c720b 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -96,7 +96,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index cecd33ae68..1f6defeded 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -95,7 +95,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 020d9cfb2d..ac1ffa5756 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index bc3ce62dc8..51d1cc8a7d 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =15 if support_structure=='normal' else 0 if support_structure=='tree' else 15 +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 5b5efb543d..41d3da0b5c 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -94,7 +94,7 @@ support_angle = 50 support_pattern = grid support_wall_count = 0 zig_zaggify_support = False -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index 731259ac24..d95fee27bd 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 972d48732b..4566244ac5 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35) speed_wall_x = =math.ceil(speed_print * 30 / 35) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index 624c54b0b0..1d87ceda10 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index dde9c3c63a..b4deb98a90 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index 3313d15591..17a165b536 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index 740f0a692f..4f01753057 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 35652904d3..b02baf975b 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -35,7 +35,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index b393048bdb..24af05ccff 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -35,7 +35,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index e5a218d9b6..e3ab83a99d 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -34,7 +34,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index c6339d7a23..75367a076c 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -33,7 +33,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 28c1d36adb..7b3cab2194 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -38,7 +38,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.55 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_top_distance = 0.55 support_xy_distance = 0.7 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index 8034db74f2..41fa7f975b 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55) speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_xy_distance = 0.7 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 4fb01eadb5..a239cd4d4b 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index b2a8c8dcbc..6e9da84593 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index c5e5dade9b..f41260d7b6 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -31,7 +31,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index 2e4465b333..0a5ee47618 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -31,7 +31,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 7465edb88f..81b54fc1e1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index ef34f14589..dd2652084d 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index 4bdc98c850..3e44a277e0 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index a2e53665c4..26db82487c 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 32cc10fdd3..fbc9eea457 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 2.0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index 1f6e60d1a0..5c2a49723c 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_structure=='normal' else 0 if support_structure=='tree' else 20 +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 32b0150fe2..e7eaefaf1b 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40) speed_wall_x = =math.ceil(speed_print * 38 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_xy_distance = 0.6 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index 18319d3f89..676149c595 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =math.ceil(speed_print * 35 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_xy_distance = 0.65 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 55ef46cfb0..d5e0e130d1 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_structure=='normal' else 0 if support_structure=='tree' else 25 +support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25 support_xy_distance = 0.7 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index a2d9cc44ce..6afc7b234c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 2f21ece950..5eea0599e2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 3ef7330429..230b44eda7 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -32,6 +32,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 096da32189..668f2b6168 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index f07c7d9a28..a6612c39ff 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 6638c9d3f2..8dc4cf7e67 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -33,6 +33,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 9fea067b4a..5a88d9fd35 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -37,4 +37,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index 68e6811341..cf92c54fdb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -36,4 +36,4 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index b449a884ab..5b696300c1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -33,6 +33,6 @@ support_angle = 45 support_join_distance = 5 support_offset = 2 support_pattern = triangles -support_infill_rate = =10 if support_structure=='normal' else 0 if support_structure=='tree' else 10 +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 top_bottom_thickness = 1 wall_thickness = 1 From 18cdce6ef0a3b616ad8d0b8a529594758c6ac9ea Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 15 Jul 2020 16:08:18 +0200 Subject: [PATCH 6/6] Add support_structure to custom visible settings if support_tree_enable is in that list CURA-6711 --- .../VersionUpgrade462to47/VersionUpgrade462to47.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py index cb2e17dae5..93edab4d58 100644 --- a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py +++ b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py @@ -40,10 +40,18 @@ class VersionUpgrade462to47(VersionUpgrade): # Update version number. parser["metadata"]["setting_version"] = "15" - # Remove deleted settings from the visible settings list. if "general" in parser and "visible_settings" in parser["general"]: - parser["general"]["visible_settings"] = ";".join( - set(parser["general"]["visible_settings"].split(";")).difference(_removed_settings)) + settings = set(parser["general"]["visible_settings"].split(";")) + + # add support_structure to the visible settings list if necessary + if "support_tree_enable" in parser["general"]["visible_settings"]: + settings.add("support_structure") + + # Remove deleted settings from the visible settings list. + settings.difference_update(_removed_settings) + + # serialize + parser["general"]["visible_settings"] = ";".join(settings) result = io.StringIO() parser.write(result)