3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 15:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge support_tree_wall_count into support_wall_count

Browse source 
So now the two settings are used as one.

Contributes to issue CURA-7077.
This commit is contained in:
Ghostkeeper 2019-12-23 16:04:37 +01:00
parent dbda415bba
commit 50f64ca696
No known key found for this signature in database
GPG key ID: 37E2020986774393
2 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py
View file

@ -7,7 +7,8 @@ from UM.VersionUpgrade import VersionUpgrade
# are overwritten, the key wins. If only the key or the value is overwritten, # are overwritten, the key wins. If only the key or the value is overwritten,
# that value is used in the key. # that value is used in the key.
_merged_settings = { _merged_settings = {
"machine_head_with_fans_polygon": "machine_head_polygon" "machine_head_with_fans_polygon": "machine_head_polygon",
"support_wall_count": "support_tree_wall_count"
} }
class VersionUpgrade44to45(VersionUpgrade): class VersionUpgrade44to45(VersionUpgrade):

19
resources/definitions/fdmprinter.def.json
View file

@ -4232,7 +4232,7 @@
"minimum_value_warning": "1 if support_pattern == 'concentric' else 0", "minimum_value_warning": "1 if support_pattern == 'concentric' else 0",
"maximum_value_warning": "3", "maximum_value_warning": "3",
"type": "int", "type": "int",
"value": "1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0", "value": "1 if support_tree_enable else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
"enabled": "support_enable", "enabled": "support_enable",
"limit_to_extruder": "support_infill_extruder_nr", "limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -6198,24 +6198,7 @@
"limit_to_extruder": "support_infill_extruder_nr", "limit_to_extruder": "support_infill_extruder_nr",
"enabled": "support_tree_enable", "enabled": "support_tree_enable",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true,
"children":
{
"support_tree_wall_count":
{
"label": "Tree Support Wall Line Count",
"description": "The number of walls of the branches of tree support. Thicker walls take longer to print but don't fall over as easily.",
"type": "int",
"minimum_value": "0",
"minimum_value_warning": "1",
"default_value": 1,
"value": "round(support_tree_wall_thickness / support_line_width)",
"limit_to_extruder": "support_infill_extruder_nr",
"enabled": "support_tree_enable",
"settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}
}
}, },
"slicing_tolerance": "slicing_tolerance":
{ {