Merge branch 'main' into CURA-7812-decrease-Qml-singletons

This commit is contained in:
Saumya Jain 2024-01-11 09:25:13 +01:00 committed by GitHub
commit db19f53943
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 166 additions and 80 deletions

View file

@ -112,7 +112,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_enable": { "value": true },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_roof_enable": { "value": true },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },

View file

@ -114,7 +114,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },
"support_xy_overrides_z": { "value": "'xy_overrides_z'" },

View file

@ -154,7 +154,6 @@
"support_infill_rate": { "value": "20" },
"support_interface_enable": { "value": "True" },
"support_interface_height": { "value": "1" },
"support_interface_skip_height": { "value": "layer_height" },
"support_join_distance": { "value": "1" },
"support_offset": { "value": "1.5" },
"support_pattern": { "default_value": "zigzag" },

View file

@ -108,7 +108,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -97,7 +97,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },

View file

@ -5423,20 +5423,6 @@
}
}
},
"support_interface_skip_height":
{
"label": "Support Interface Resolution",
"description": "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface.",
"unit": "mm",
"type": "float",
"default_value": 0.2,
"value": "layer_height",
"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_meshes_present)",
"settable_per_mesh": true
},
"support_interface_density":
{
"label": "Support Interface Density",

View file

@ -92,7 +92,6 @@
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_line_width": { "value": "line_width - 0.1" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -112,7 +112,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 0 },
"support_xy_distance": { "value": "wall_line_width_0 * 3" },

View file

@ -133,7 +133,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -70,7 +70,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -88,7 +88,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -88,7 +88,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -109,7 +109,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -119,7 +119,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -70,7 +70,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -111,7 +111,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" },
"support_xy_distance": { "value": "wall_line_width_0 * 3" },

View file

@ -68,7 +68,6 @@
"support_interface_density": { "value": 33.333 },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -99,7 +99,6 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_interface_skip_height": { "value": 0.2 },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },

View file

@ -3548,14 +3548,6 @@ msgctxt "support_bottom_height description"
msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests."
msgstr ""
msgctxt "support_interface_skip_height label"
msgid "Support Interface Resolution"
msgstr ""
msgctxt "support_interface_skip_height description"
msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
msgstr ""
msgctxt "support_interface_density label"
msgid "Support Interface Density"
msgstr ""

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.30
support_offset = 0.8
support_z_distance = 0.4
wall_thickness = 1.6

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.20
support_offset = 0.8
support_z_distance = 0.3
wall_thickness = 1.6

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.06
support_offset = 0.8
support_z_distance = 0.12
wall_thickness = 1.6

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.10
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 1.6

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.45
support_interface_pattern = zigzag
support_interface_skip_height = 0.15
support_offset = 0.8
support_z_distance = 0.25
wall_thickness = 1.6

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.30
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.40
support_interface_pattern = zigzag
support_interface_skip_height = 0.20
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.06
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.10
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

View file

@ -33,7 +33,6 @@ support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.45
support_interface_pattern = zigzag
support_interface_skip_height = 0.15
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 60
support_interface_enable = True
support_interface_height = 0.96
support_interface_pattern = grid
support_interface_skip_height = 0.12
support_roof_density = 60
support_type = everywhere
support_wall_count = 1

View file

@ -65,7 +65,6 @@ support_interface_density = 60
support_interface_enable = True
support_interface_height = 0.6
support_interface_pattern = grid
support_interface_skip_height = 0.2
support_roof_density = 60
support_type = everywhere
support_wall_count = 1

View file

@ -100,7 +100,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 0.6
support_interface_pattern = lines
support_interface_skip_height = 0.2
support_pattern = zigzag
support_roof_density = 70
support_type = everywhere

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -65,7 +65,6 @@ support_interface_density = 70
support_interface_enable = True
support_interface_height = 2
support_interface_pattern = concentric
support_interface_skip_height = 0.1
support_type = everywhere
support_use_towers = False
support_xy_distance = 0.8

View file

@ -293,7 +293,6 @@ support_bottom_wall_count
support_interface_height
support_roof_height
support_bottom_height
support_interface_skip_height
support_interface_density
support_roof_density
support_bottom_density

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles

View file

@ -21,7 +21,6 @@ support_interface_density = 100
support_interface_enable = True
support_interface_height = =layer_height * 5
support_interface_pattern = concentric
support_interface_skip_height = =layer_height
support_join_distance = 3
support_offset = 3
support_pattern = triangles