Merge branch 'CURA-7318_Ironing_offsets_with_half_a_skin_line_width'

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

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()