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

Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864]

Browse source
This commit is contained in:
Remco Burema 2019-02-13 14:09:37 +01:00
parent ad8c269012
commit a601e0878c
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/BuildVolume.py
View file

@ -746,7 +746,8 @@ class BuildVolume(SceneNode):
break
if prime_tower_collision: #Already found a collision.
break
if ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable"):
if (ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable") and
ExtruderManager.getInstance().getResolveOrValue("adhesion_type") != 'raft'):
prime_tower_areas[extruder_id][i_area] = prime_tower_area.getMinkowskiHull(
Polygon.approximatedCircle(disallowed_border_size))
if not prime_tower_collision:
@ -788,7 +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_y = prime_tower_y + machine_depth / 2
if ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable"):
if (ExtruderManager.getInstance().getResolveOrValue("prime_tower_brim_enable") and
ExtruderManager.getInstance().getResolveOrValue("adhesion_type") != 'raft'):
brim_size = (
extruder.getProperty("brim_line_count", "value") *
extruder.getProperty("skirt_brim_line_width", "value") / 100.0 *
@ -1036,7 +1038,9 @@ class BuildVolume(SceneNode):
# We don't create an additional line for the extruder we're printing the skirt with.
bed_adhesion_size -= skirt_brim_line_width * initial_layer_line_width_factor / 100.0
elif adhesion_type == "brim" or self._global_container_stack.getProperty("prime_tower_brim_enable", "value"):
elif (adhesion_type == "brim" or
(self._global_container_stack.getProperty("prime_tower_brim_enable", "value") and
self._global_container_stack.getProperty("adhesion_type", "value") != 'raft')):
brim_line_count = self._global_container_stack.getProperty("brim_line_count", "value")
bed_adhesion_size = skirt_brim_line_width * brim_line_count * initial_layer_line_width_factor / 100.0