Remove max line width settings and make min line width settings childs of a single parent

This commit is contained in:
Tim Kuipers 2022-03-10 12:09:54 +01:00
parent 4f66ea4cc6
commit 933f694127

View File

@ -1092,32 +1092,32 @@
"default_value": "inward_distributed", "default_value": "inward_distributed",
"limit_to_extruder": "wall_0_extruder_nr" "limit_to_extruder": "wall_0_extruder_nr"
}, },
"max_odd_wall_line_width": "min_wall_line_width":
{ {
"label": "Maximum Wall Line Width of Middle Walls", "label": "Minimum Wall Line Width",
"description": "TODO.", "description": "TODO. For thin structures. Max odd is 2x min even, max even is Outer wall line width + .5x min odd.",
"unit": "mm", "unit": "mm",
"minimum_value": "max(wall_line_width_0, wall_line_width_x)", "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
"maximum_value": "2 * min(wall_line_width_0, wall_line_width_x)", "maximum_value_warning": "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", "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": "2 * machine_nozzle_size", "maximum_value_warning_old": "2 * machine_nozzle_size",
"default_value": 0.6, "default_value": 0.3,
"value": "wall_line_width * 1.5", "value": "machine_nozzle_size * .75",
"type": "float", "type": "float",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
"min_even_wall_line_width": "min_even_wall_line_width":
{ {
"label": "Minimum Wall Line Width of Even Walls", "label": "Minimum Even Wall Line Width",
"description": "TODO.", "description": "TODO.",
"unit": "mm", "unit": "mm",
"minimum_value": ".5 * max(wall_line_width_0, wall_line_width_x)", "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
"maximum_value": "min(wall_line_width_0, wall_line_width_x)", "maximum_value_warning": "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", "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": "2 * machine_nozzle_size", "maximum_value_warning_old": "2 * machine_nozzle_size",
"default_value": 0.3, "default_value": 0.3,
"value": "max_odd_wall_line_width / 2", "value": "min_wall_line_width",
"type": "float", "type": "float",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
@ -1128,40 +1128,24 @@
"type": "float", "type": "float",
"unit": "%", "unit": "%",
"default_value": 90, "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", "minimum_value": "1",
"maximum_value": "99" "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": "min_odd_wall_line_width":
{ {
"label": "Minimum Wall Line Width of Odd Walls", "label": "Minimum Odd Wall Line Width",
"description": "TODO.", "description": "TODO.",
"unit": "mm", "unit": "mm",
"minimum_value": ".5 * max(wall_line_width_0, wall_line_width_x)", "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
"maximum_value": "min(wall_line_width_0, wall_line_width_x)", "maximum_value_warning": "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", "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": "2 * machine_nozzle_size", "maximum_value_warning_old": "2 * machine_nozzle_size",
"default_value": 0.3, "default_value": 0.3,
"value": "max_even_wall_line_width * 2 - 2 * wall_line_width_0", "value": "min_wall_line_width",
"type": "float", "type": "float",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
@ -1172,7 +1156,8 @@
"type": "float", "type": "float",
"unit": "%", "unit": "%",
"default_value": 80, "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", "minimum_value": "1",
"maximum_value": "99" "maximum_value": "99"
} }