diff options
| author | Tim Kuipers <t.kuipers@ultimaker.com> | 2022-03-10 14:09:54 +0300 |
|---|---|---|
| committer | Tim Kuipers <t.kuipers@ultimaker.com> | 2022-03-10 14:09:54 +0300 |
| commit | 933f6941272b39a623d6491570bdcad197d42d4d (patch) | |
| tree | 501c976d26e60b3565d262414caa3d5a434f1383 /resources/definitions/fdmprinter.def.json | |
| parent | 4f66ea4cc6d8e7a5271b2ab87f9f548e3caf60b6 (diff) | |
Remove max line width settings and make min line width settings childs of a single parent
Diffstat (limited to 'resources/definitions/fdmprinter.def.json')
| -rw-r--r-- | resources/definitions/fdmprinter.def.json | 67 |
1 files changed, 26 insertions, 41 deletions
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 245da2d6a8..d622ab8e1d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1092,32 +1092,32 @@ "default_value": "inward_distributed", "limit_to_extruder": "wall_0_extruder_nr" }, - "max_odd_wall_line_width": + "min_wall_line_width": { - "label": "Maximum Wall Line Width of Middle Walls", - "description": "TODO.", + "label": "Minimum Wall Line Width", + "description": "TODO. For thin structures. Max odd is 2x min even, max even is Outer wall line width + .5x min odd.", "unit": "mm", - "minimum_value": "max(wall_line_width_0, wall_line_width_x)", - "maximum_value": "2 * min(wall_line_width_0, wall_line_width_x)", - "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", - "maximum_value_warning": "2 * machine_nozzle_size", - "default_value": 0.6, - "value": "wall_line_width * 1.5", + "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)", + "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)", + "minimum_value_warning_old": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", + "maximum_value_warning_old": "2 * machine_nozzle_size", + "default_value": 0.3, + "value": "machine_nozzle_size * .75", "type": "float", "settable_per_mesh": true, "children": { "min_even_wall_line_width": { - "label": "Minimum Wall Line Width of Even Walls", + "label": "Minimum Even Wall Line Width", "description": "TODO.", "unit": "mm", - "minimum_value": ".5 * max(wall_line_width_0, wall_line_width_x)", - "maximum_value": "min(wall_line_width_0, wall_line_width_x)", - "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", - "maximum_value_warning": "2 * machine_nozzle_size", + "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)", + "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)", + "minimum_value_warning_old": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", + "maximum_value_warning_old": "2 * machine_nozzle_size", "default_value": 0.3, - "value": "max_odd_wall_line_width / 2", + "value": "min_wall_line_width", "type": "float", "settable_per_mesh": true, "children": @@ -1128,40 +1128,24 @@ "type": "float", "unit": "%", "default_value": 90, - "value": "100 * (2 * min_even_wall_line_width - wall_line_width_0) / wall_line_width_0", + "value": "max(1, min(99, 100 * (2 * min_even_wall_line_width - wall_line_width_0) / wall_line_width_0))", + "value_explicit": "100 * (2 * min_even_wall_line_width - wall_line_width_0) / (wall_line_width_0 + wall_line_width_x - wall_line_width_0)", "minimum_value": "1", "maximum_value": "99" } } - } - } - }, - "max_even_wall_line_width": - { - "label": "Maximum Wall Line Width of Even Walls", - "description": "TODO.", - "unit": "mm", - "minimum_value": "max(wall_line_width_0, wall_line_width_x)", - "maximum_value": "2 * min(wall_line_width_0, wall_line_width_x)", - "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", - "maximum_value_warning": "2 * machine_nozzle_size", - "default_value": 0.6, - "value": "wall_line_width * 1.5", - "type": "float", - "settable_per_mesh": true, - "children": - { + }, "min_odd_wall_line_width": { - "label": "Minimum Wall Line Width of Odd Walls", + "label": "Minimum Odd Wall Line Width", "description": "TODO.", "unit": "mm", - "minimum_value": ".5 * max(wall_line_width_0, wall_line_width_x)", - "maximum_value": "min(wall_line_width_0, wall_line_width_x)", - "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", - "maximum_value_warning": "2 * machine_nozzle_size", + "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)", + "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)", + "minimum_value_warning_old": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", + "maximum_value_warning_old": "2 * machine_nozzle_size", "default_value": 0.3, - "value": "max_even_wall_line_width * 2 - 2 * wall_line_width_0", + "value": "min_wall_line_width", "type": "float", "settable_per_mesh": true, "children": @@ -1172,7 +1156,8 @@ "type": "float", "unit": "%", "default_value": 80, - "value": "100 * min_odd_wall_line_width / wall_line_width_x", + "value": "max(1, min(99, 100 * min_odd_wall_line_width / wall_line_width_x))", + "value_explicit": "100 * (2 * wall_line_width_0 + min_odd_wall_line_width - 2 * wall_line_width_0) / (2 * wall_line_width_0 + wall_line_width_x - 2 * wall_line_width_0)", "minimum_value": "1", "maximum_value": "99" } |