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

Rename setting skirt_line_width to skirt_brim_line_width

Browse source 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
This commit is contained in:
Ghostkeeper 2016-07-22 17:00:30 +02:00
parent 5e2f1688b4
commit d4f96ab62d
No known key found for this signature in database
GPG key ID: 701948C5954A7385
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/BuildVolume.py
View file

@ -364,9 +364,9 @@ class BuildVolume(SceneNode):
if adhesion_type == "skirt": if adhesion_type == "skirt":
skirt_distance = container_stack.getProperty("skirt_gap", "value") skirt_distance = container_stack.getProperty("skirt_gap", "value")
skirt_line_count = container_stack.getProperty("skirt_line_count", "value") skirt_line_count = container_stack.getProperty("skirt_line_count", "value")
skirt_size = skirt_distance + (skirt_line_count * container_stack.getProperty("skirt_line_width", "value")) skirt_size = skirt_distance + (skirt_line_count * container_stack.getProperty("skirt_brim_line_width", "value"))
elif adhesion_type == "brim": elif adhesion_type == "brim":
skirt_size = container_stack.getProperty("brim_line_count", "value") * container_stack.getProperty("skirt_line_width", "value") skirt_size = container_stack.getProperty("brim_line_count", "value") * container_stack.getProperty("skirt_brim_line_width", "value")
elif adhesion_type == "raft": elif adhesion_type == "raft":
skirt_size = container_stack.getProperty("raft_margin", "value") skirt_size = container_stack.getProperty("raft_margin", "value")
@ -381,5 +381,5 @@ class BuildVolume(SceneNode):
def _clamp(self, value, min_value, max_value): def _clamp(self, value, min_value, max_value):
return max(min(value, max_value), min_value) return max(min(value, max_value), min_value)
_skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "xy_offset"] _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "xy_offset"]
_raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap"] _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap"]

4
plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py
View file

@ -31,6 +31,7 @@ _setting_name_translations = {
"remove_overlapping_walls_enabled": "travel_compensate_overlapping_walls_enabled", "remove_overlapping_walls_enabled": "travel_compensate_overlapping_walls_enabled",
"remove_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled", "remove_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled",
"retraction_hop": "retraction_hop_enabled", "retraction_hop": "retraction_hop_enabled",
"skirt_line_width": "skirt_brim_line_width",
"skirt_speed": "skirt_brim_speed", "skirt_speed": "skirt_brim_speed",
"speed_support_lines": "speed_support_infill" "speed_support_lines": "speed_support_infill"
} }
@ -158,6 +159,9 @@ class VersionUpgrade21to22(VersionUpgrade):
elif key == "retraction_hop": #Setting key was changed. elif key == "retraction_hop": #Setting key was changed.
del settings[key] del settings[key]
settings["retraction_hop_enabled"] = value settings["retraction_hop_enabled"] = value
elif key == "skirt_line_width": #Setting key was changed.
del settings[key]
settings["skirt_brim_line_width"] = value
elif key == "skirt_speed": #Setting key was changed. elif key == "skirt_speed": #Setting key was changed.
del settings[key] del settings[key]
settings["skirt_brim_speed"] = value settings["skirt_brim_speed"] = value

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

@ -603,10 +603,10 @@
"value": "line_width", "value": "line_width",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"skirt_line_width": "skirt_brim_line_width":
{ {
"label": "Skirt Line Width", "label": "Skirt/Brim Line Width",
"description": "Width of a single skirt line.", "description": "Width of a single skirt or brim line.",
"unit": "mm", "unit": "mm",
"minimum_value": "0.0001", "minimum_value": "0.0001",
"minimum_value_warning": "0.2", "minimum_value_warning": "0.2",
@ -2557,7 +2557,7 @@
"default_value": 20, "default_value": 20,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "300", "maximum_value_warning": "300",
"value": "math.ceil(brim_width / skirt_line_width)", "value": "math.ceil(brim_width / skirt_brim_line_width)",
"enabled": "adhesion_type == \"brim\"", "enabled": "adhesion_type == \"brim\"",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true