From 2eae1cdf228048a8c5603ca43d54f7c5be8fa1e0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 24 Apr 2017 14:28:10 +0200 Subject: [PATCH] Move support roof settings above support bottom settings This was deemed the most logical ordering. Contributes to issue CURA-3491. --- resources/definitions/fdmprinter.def.json | 268 +++++++++++----------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1ae26bc40f..3cc47b2633 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -760,22 +760,6 @@ "settable_per_extruder": true, "children": { - "support_bottom_line_width": - { - "label": "Support Floor Line Width", - "description": "Width of a single support floor line.", - "unit": "mm", - "default_value": 0.4, - "minimum_value": "0.001", - "minimum_value_warning": "0.4 * machine_nozzle_size", - "maximum_value_warning": "2 * machine_nozzle_size", - "type": "float", - "enabled": "support_enable and support_bottom_enable", - "limit_to_extruder": "support_bottom_extruder_nr", - "value": "support_interface_line_width", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "support_roof_line_width": { "label": "Support Roof Line Width", @@ -791,6 +775,22 @@ "value": "support_interface_line_width", "settable_per_mesh": false, "settable_per_extruder": true + }, + "support_bottom_line_width": + { + "label": "Support Floor Line Width", + "description": "Width of a single support floor line.", + "unit": "mm", + "default_value": 0.4, + "minimum_value": "0.001", + "minimum_value_warning": "0.4 * machine_nozzle_size", + "maximum_value_warning": "2 * machine_nozzle_size", + "type": "float", + "enabled": "support_enable and support_bottom_enable", + "limit_to_extruder": "support_bottom_extruder_nr", + "value": "support_interface_line_width", + "settable_per_mesh": false, + "settable_per_extruder": true } } }, @@ -1972,22 +1972,6 @@ "settable_per_extruder": true, "children": { - "speed_support_bottom": - { - "label": "Support Floor Speed", - "description": "The speed at which the floor of support is printed. Printing it at lower speed can improve adhesion of support on top of your model.", - "unit": "mm/s", - "type": "float", - "default_value": 40, - "minimum_value": "0.1", - "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", - "maximum_value_warning": "150", - "enabled": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", - "limit_to_extruder": "support_bottom_extruder_nr", - "value": "speed_support_interface", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "speed_support_roof": { "label": "Support Roof Speed", @@ -2003,6 +1987,22 @@ "value": "speed_support_interface", "settable_per_mesh": false, "settable_per_extruder": true + }, + "speed_support_bottom": + { + "label": "Support Floor Speed", + "description": "The speed at which the floor of support is printed. Printing it at lower speed can improve adhesion of support on top of your model.", + "unit": "mm/s", + "type": "float", + "default_value": 40, + "minimum_value": "0.1", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", + "maximum_value_warning": "150", + "enabled": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", + "limit_to_extruder": "support_bottom_extruder_nr", + "value": "speed_support_interface", + "settable_per_mesh": false, + "settable_per_extruder": true } } } @@ -2293,22 +2293,6 @@ "settable_per_extruder": true, "children": { - "acceleration_support_bottom": - { - "label": "Support Floor Acceleration", - "description": "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model.", - "unit": "mm/s²", - "type": "float", - "default_value": 3000, - "value": "acceleration_support_interface", - "minimum_value": "0.1", - "minimum_value_warning": "100", - "maximum_value_warning": "10000", - "enabled": "resolveOrValue('acceleration_enabled') and extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", - "limit_to_extruder": "support_bottom_extruder_nr", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "acceleration_support_roof": { "label": "Support Roof Acceleration", @@ -2324,6 +2308,22 @@ "limit_to_extruder": "support_roof_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true + }, + "acceleration_support_bottom": + { + "label": "Support Floor Acceleration", + "description": "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model.", + "unit": "mm/s²", + "type": "float", + "default_value": 3000, + "value": "acceleration_support_interface", + "minimum_value": "0.1", + "minimum_value_warning": "100", + "maximum_value_warning": "10000", + "enabled": "resolveOrValue('acceleration_enabled') and extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", + "limit_to_extruder": "support_bottom_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true } } } @@ -2567,22 +2567,6 @@ "settable_per_extruder": true, "children": { - "jerk_support_bottom": - { - "label": "Support Floor Jerk", - "description": "The maximum instantaneous velocity change with which the floors of support are printed.", - "unit": "mm/s", - "type": "float", - "default_value": 20, - "value": "jerk_support_interface", - "minimum_value": "0.1", - "minimum_value_warning": "5", - "maximum_value_warning": "50", - "enabled": "resolveOrValue('jerk_enabled') and extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", - "limit_to_extruder": "support_bottom_extruder_nr", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "jerk_support_roof": { "label": "Support Roof Jerk", @@ -2598,6 +2582,22 @@ "limit_to_extruder": "support_roof_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true + }, + "jerk_support_bottom": + { + "label": "Support Floor Jerk", + "description": "The maximum instantaneous velocity change with which the floors of support are printed.", + "unit": "mm/s", + "type": "float", + "default_value": 20, + "value": "jerk_support_interface", + "minimum_value": "0.1", + "minimum_value_warning": "5", + "maximum_value_warning": "50", + "enabled": "resolveOrValue('jerk_enabled') and extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", + "limit_to_extruder": "support_bottom_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true } } } @@ -3042,10 +3042,10 @@ "settable_per_extruder": false, "children": { - "support_bottom_extruder_nr": + "support_roof_extruder_nr": { - "label": "Support Floor Extruder", - "description": "The extruder train to use for printing the floors of the support. This is used in multi-extrusion.", + "label": "Support Roof Extruder", + "description": "The extruder train to use for printing the roofs of the support. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", "value": "support_interface_extruder_nr", @@ -3053,10 +3053,10 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "support_roof_extruder_nr": + "support_bottom_extruder_nr": { - "label": "Support Roof Extruder", - "description": "The extruder train to use for printing the roofs of the support. This is used in multi-extrusion.", + "label": "Support Floor Extruder", + "description": "The extruder train to use for printing the floors of the support. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", "value": "support_interface_extruder_nr", @@ -3297,17 +3297,6 @@ "settable_per_mesh": true, "children": { - "support_bottom_enable": - { - "label": "Enable Support Floor", - "description": "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support.", - "type": "bool", - "default_value": false, - "value": "support_interface_enable", - "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "support_enable", - "settable_per_mesh": true - }, "support_roof_enable": { "label": "Enable Support Roof", @@ -3318,6 +3307,17 @@ "limit_to_extruder": "support_roof_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true + }, + "support_bottom_enable": + { + "label": "Enable Support Floor", + "description": "Generate a dense slab of material between the bottom of the support and the model. This will create a skin between the model and support.", + "type": "bool", + "default_value": false, + "value": "support_interface_enable", + "limit_to_extruder": "support_bottom_extruder_nr", + "enabled": "support_enable", + "settable_per_mesh": true } } }, @@ -3395,38 +3395,6 @@ "settable_per_extruder": true, "children": { - "support_bottom_density": - { - "label": "Support Floor Density", - "description": "The density of the floors of the support structure. A higher value results in better adhesion of the support on top of the model.", - "unit": "%", - "type": "float", - "default_value": 100, - "minimum_value": "0", - "maximum_value": "100", - "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", - "settable_per_mesh": false, - "settable_per_extruder": true, - "children": - { - "support_bottom_line_distance": - { - "label": "Support Floor Line Distance", - "description": "Distance between the printed support floor lines. This setting is calculated by the Support Floor Density, but can be adjusted separately.", - "unit": "mm", - "type": "float", - "default_value": 0.4, - "minimum_value": "0", - "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": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", - "settable_per_mesh": false, - "settable_per_extruder": true - } - } - }, "support_roof_density": { "label": "Support Roof Density", @@ -3458,6 +3426,38 @@ "settable_per_extruder": true } } + }, + "support_bottom_density": + { + "label": "Support Floor Density", + "description": "The density of the floors of the support structure. A higher value results in better adhesion of the support on top of the model.", + "unit": "%", + "type": "float", + "default_value": 100, + "minimum_value": "0", + "maximum_value": "100", + "limit_to_extruder": "support_bottom_extruder_nr", + "enabled": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", + "settable_per_mesh": false, + "settable_per_extruder": true, + "children": + { + "support_bottom_line_distance": + { + "label": "Support Floor Line Distance", + "description": "Distance between the printed support floor lines. This setting is calculated by the Support Floor Density, but can be adjusted separately.", + "unit": "mm", + "type": "float", + "default_value": 0.4, + "minimum_value": "0", + "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": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", + "settable_per_mesh": false, + "settable_per_extruder": true + } + } } } }, @@ -3482,27 +3482,6 @@ "settable_per_extruder": true, "children": { - "support_bottom_pattern": - { - "label": "Support Floor Pattern", - "description": "The pattern with which the floors of the support are printed.", - "type": "enum", - "options": - { - "lines": "Lines", - "grid": "Grid", - "triangles": "Triangles", - "concentric": "Concentric", - "concentric_3d": "Concentric 3D", - "zigzag": "Zig Zag" - }, - "default_value": "concentric", - "value": "support_interface_pattern", - "limit_to_extruder": "support_bottom_extruder_nr", - "enabled": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "support_roof_pattern": { "label": "Support Roof Pattern", @@ -3523,6 +3502,27 @@ "enabled": "extruderValue(support_bottom_extruder_nr, 'support_roof_enable') and support_enable", "settable_per_mesh": false, "settable_per_extruder": true + }, + "support_bottom_pattern": + { + "label": "Support Floor Pattern", + "description": "The pattern with which the floors of the support are printed.", + "type": "enum", + "options": + { + "lines": "Lines", + "grid": "Grid", + "triangles": "Triangles", + "concentric": "Concentric", + "concentric_3d": "Concentric 3D", + "zigzag": "Zig Zag" + }, + "default_value": "concentric", + "value": "support_interface_pattern", + "limit_to_extruder": "support_bottom_extruder_nr", + "enabled": "extruderValue(support_bottom_extruder_nr, 'support_bottom_enable') and support_enable", + "settable_per_mesh": false, + "settable_per_extruder": true } } },