3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Partly revert sugested changes for '()'s because line-breaks. [CURA-5864]

Browse source
This commit is contained in:
Remco Burema 2019-02-14 15:01:32 +01:00
parent f1b6e527be
commit 2f5e973836
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/BuildVolume.py
View file

@ -746,8 +746,8 @@ class BuildVolume(SceneNode):
break break
if prime_tower_collision: #Already found a collision. if prime_tower_collision: #Already found a collision.
break break
if ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable") and if (ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable") and
ExtruderManager.getInstance().getResolveOrValue("adhesion_type") != "raft": ExtruderManager.getInstance().getResolveOrValue("adhesion_type") != "raft"):
prime_tower_areas[extruder_id][i_area] = prime_tower_area.getMinkowskiHull( prime_tower_areas[extruder_id][i_area] = prime_tower_area.getMinkowskiHull(
Polygon.approximatedCircle(disallowed_border_size)) Polygon.approximatedCircle(disallowed_border_size))
if not prime_tower_collision: if not prime_tower_collision:
@ -789,8 +789,8 @@ class BuildVolume(SceneNode):
prime_tower_x = prime_tower_x - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left. prime_tower_x = prime_tower_x - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left.
prime_tower_y = prime_tower_y + machine_depth / 2 prime_tower_y = prime_tower_y + machine_depth / 2
if ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable") and if (ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable") and
ExtruderManager.getInstance().getResolveOrValue("adhesion_type") != "raft": ExtruderManager.getInstance().getResolveOrValue("adhesion_type") != "raft"):
brim_size = ( brim_size = (
extruder.getProperty("brim_line_count", "value") * extruder.getProperty("brim_line_count", "value") *
extruder.getProperty("skirt_brim_line_width", "value") / 100.0 * extruder.getProperty("skirt_brim_line_width", "value") / 100.0 *