mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-09-09 00:07:52 -06:00
Merge branch 'PP-126_set_horizontal_expansion' of github.com:Ultimaker/Cura
This commit is contained in:
commit
f0bfe4f3a2
33 changed files with 693 additions and 722 deletions
|
@ -67,6 +67,9 @@
|
||||||
},
|
},
|
||||||
"bottom_layers": {
|
"bottom_layers": {
|
||||||
"value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))"
|
"value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))"
|
||||||
|
},
|
||||||
|
"xy_offset": {
|
||||||
|
"value": "-layer_height * 0.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
|
@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
||||||
|
|
|
@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
|
@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
|
@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
|
@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,5 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
|
@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
|
||||||
top_bottom_thickness = =wall_thickness
|
top_bottom_thickness = =wall_thickness
|
||||||
|
|
||||||
wall_thickness = =line_width * 3
|
wall_thickness = =line_width * 3
|
||||||
xy_offset = =-layer_height * 0.2
|
|
||||||
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue