GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 00:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-7318_Ironing_offsets_with_half_a_skin_line_width'

Browse Source
This commit is contained in:
Ghostkeeper 2020-05-25 11:48:05 +02:00
commit be9029b33e
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
View File

@ -64,7 +64,11 @@ class VersionUpgrade462to47(VersionUpgrade):
ironing_inset = parser["values"]["ironing_inset"]
if ironing_inset.startswith("="):
ironing_inset = ironing_inset[1:]
ironing_inset = "=(" + ironing_inset + ") + skin_line_width * (1.0 - ironing_flow) / 2"
if "ironing_pattern" in parser["values"] and parser["values"]["ironing_pattern"] == "concentric":
correction = " + ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2"
else: # If ironing_pattern doesn't exist, it means the default (zigzag) is selected
correction = " + skin_line_width * (1.0 - ironing_flow / 100) / 2"
ironing_inset = "=(" + ironing_inset + ")" + correction
parser["values"]["ironing_inset"] = ironing_inset
result = io.StringIO()

2
resources/definitions/fdmprinter.def.json
View File

@ -1575,7 +1575,7 @@
"type": "float",
"unit": "mm",
"default_value": 0.35,
"value": "wall_line_width_0 / 2 + skin_line_width * (1.0 - ironing_flow) / 2",
"value": "wall_line_width_0 / 2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)",
"minimum_value_warning": "0",
"maximum_value_warning": "wall_line_width_0",
"enabled": "ironing_enabled",

2
resources/definitions/hms434.def.json
View File

@ -104,7 +104,7 @@
"skin_outline_count": {"value": "0"},
"ironing_line_spacing": {"value": "line_width / 4 * 3"},
"ironing_flow": {"value": "0"},
"ironing_inset": {"value": "ironing_line_spacing + skin_line_width * (1.0 - ironing_flow) / 2"},
"ironing_inset": {"value": "ironing_line_spacing + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"},
"speed_ironing": {"value": "150"},
"infill_sparse_density": {"value": 30},

2
resources/definitions/skriware_2.def.json
View File

@ -345,7 +345,7 @@
"value": "0.8"
},
"ironing_inset": {
"value": "0.2 + skin_line_width * (1.0 - ironing_flow) / 2"
"value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"
},
"jerk_travel": {
"value": "10"