From 3b533c653d7c9d1c0c1871db076d2472fb4bc932 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 16 Jul 2015 13:47:57 +0200 Subject: [PATCH 1/2] settings refactor: line widths together with layer height in the same category --- resources/settings/fdmprinter.json | 213 +++++++++++++++-------------- 1 file changed, 114 insertions(+), 99 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index f5b5ee21a7..e42aa36677 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -31,7 +31,7 @@ }, "categories": { "layer_height": { - "label": "Layer Height", + "label": "Line dimensions", "visible": true, "icon": "category_layer_height", "settings": { @@ -55,6 +55,118 @@ "min_value_warning": 0.04, "max_value_warning": 0.32, "visible": false + }, + "line_width": { + "label": "Line Width", + "description": "Width of a single line. Each line will be printed with this width in mind. Generally the width of each line should correspond to the width of your nozzle, but for the outer wall and top/bottom surface smaller line widths may be chosen, for higher quality.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false, + "inherit_function": "machine_nozzle_size", + + "children": { + "wall_line_width": { + "label": "Wall Line Width", + "description": "Width of a single shell line. Each line of the shell will be printed with this width in mind.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false, + "inherit_function": "max(machine_nozzle_size, (wall_thickness / (int(wall_thickness / (machine_nozzle_size - 0.0001) + 1))) if (wall_thickness / (int(wall_thickness / (machine_nozzle_size - 0.0001))) > machine_nozzle_size * 1.5) else (wall_thickness / int(wall_thickness / (machine_nozzle_size - 0.0001))))", + + "children": { + "wall_line_width_0": { + "label": "Outer Wall Line Width", + "description": "Width of the outermost shell line. By printing a thinner outermost wall line you can print higher details with a larger nozzle.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false + }, + "wall_line_width_x": { + "label": "Other Walls Line Width", + "description": "Width of a single shell line for all shell lines except the outermost one.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false + } + } + }, + "skirt_line_width": { + "label": "Skirt line width", + "description": "Width of a single skirt line.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false + }, + "skin_line_width": { + "label": "Top/bottom line width", + "description": "Width of a single top/bottom printed line, used to fill up the top/bottom areas of a print.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false + }, + "infill_line_width": { + "label": "Infill line width", + "description": "Width of the inner infill printed lines.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false + }, + "support_line_width": { + "label": "Support line width", + "description": "Width of the printed support structures lines.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5.0, + "default": 0.4, + "type": "float", + "visible": false, + "active_if" : { + "setting": "support_enable", + "value": true + } + }, + "support_roof_line_width": { + "label": "Support Hammock line width", + "description": "Width of a single hammock line, used to fill the roof of the support.", + "unit": "mm", + "default": 0.4, + "type": "float", + "visible": false, + "active_if" : { + "setting": "support_roof_enable", + "value": true + } + } + } } } }, @@ -93,104 +205,7 @@ "type": "int", "visible": false, "inherit_function": "max(1, (int(parent_value / (machine_nozzle_size - 0.0001) + 1) if (parent_value / max(1, int(parent_value / (machine_nozzle_size - 0.0001))) > machine_nozzle_size) * 1.5 else int(parent_value / (machine_nozzle_size - 0.0001))))" - }, - "wall_line_width": { - "label": "Wall Line Width", - "description": "Width of a single shell line. Each line of the shell will be printed with this width in mind.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false, - "inherit_function": "max(machine_nozzle_size, (parent_value / (int(parent_value / (machine_nozzle_size - 0.0001) + 1))) if (parent_value / (int(parent_value / (machine_nozzle_size - 0.0001))) > machine_nozzle_size * 1.5) else (parent_value / int(parent_value / (machine_nozzle_size - 0.0001))))", - - "children": { - "wall_line_width_0": { - "label": "Outer Wall Line Width", - "description": "Width of the outermost shell line. By printing a thinner outermost wall line you can print higher details with a larger nozzle.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false - }, - "wall_line_width_x": { - "label": "Other Walls Line Width", - "description": "Width of a single shell line for all shell lines except the outermost one.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false - }, - "skirt_line_width": { - "label": "Skirt line width", - "description": "Width of a single skirt line.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false - }, - "skin_line_width": { - "label": "Top/bottom line width", - "description": "Width of a single top/bottom printed line, used to fill up the top/bottom areas of a print.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false - }, - "infill_line_width": { - "label": "Infill line width", - "description": "Width of the inner infill printed lines.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false - }, - "support_line_width": { - "label": "Support line width", - "description": "Width of the printed support structures lines.", - "unit": "mm", - "min_value": 0.0, - "min_value_warning": 0.2, - "max_value_warning": 5.0, - "default": 0.4, - "type": "float", - "visible": false, - "active_if" : { - "setting": "support_enable", - "value": true - } - }, - "support_roof_line_width": { - "label": "Support Hammock line width", - "description": "Width of a single hammock line, used to fill the roof of the support.", - "unit": "mm", - "default": 0.4, - "type": "float", - "visible": false, - "active_if" : { - "setting": "support_roof_enable", - "value": true - } - } - } - } + } } }, "alternate_extra_perimeter": { From 49592ddf876fbcf64d400ebd9673cb27a468dab1 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 16 Jul 2015 13:48:44 +0200 Subject: [PATCH 2/2] rename setting initial layer thickness to initial layer height --- resources/settings/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index e42aa36677..dec67ad720 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -46,8 +46,8 @@ "max_value_warning": 0.32 }, "layer_height_0": { - "label": "Initial Layer Thickness", - "description": "The layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier.", + "label": "Initial Layer Height", + "description": "The layer height of the bottom layer. A thicker bottom layer makes sticking to the bed easier.", "unit": "mm", "type": "float", "default": 0.3,