3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 23:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Prime positions now also intersect with oneother

Browse source 
CURA-2375
This commit is contained in:
Jaime van Kessel 2016-09-28 15:14:38 +02:00
parent bf1cfe9e7e
commit 3de4d4987c
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura/BuildVolume.py
View file

@ -386,22 +386,28 @@ class BuildVolume(SceneNode):
[prime_x - PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE], [prime_x - PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE],
]) ])
prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(0)) prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(0))
prime_tower_collision = False prime_collision = False
# Check if prime polygon is intersecting with any of the other disallowed areas. # Check if prime polygon is intersecting with any of the other disallowed areas.
# Note that we check the prime area without bed adhesion. # Note that we check the prime area without bed adhesion.
for poly in disallowed_polygons: for poly in disallowed_polygons:
if prime_polygon.intersectsPolygon(poly) is not None: if prime_polygon.intersectsPolygon(poly) is not None:
prime_tower_collision = True prime_collision = True
break break
if not prime_tower_collision: # Also collide with other prime positions
for poly in prime_polygons:
if prime_polygon.intersectsPolygon(poly) is not None:
prime_collision = True
break
if not prime_collision:
# Prime area is valid. Add as normal. # Prime area is valid. Add as normal.
# Once it's added like this, it will recieve a bed adhesion offset, just like the others. # Once it's added like this, it will recieve a bed adhesion offset, just like the others.
prime_polygons.append(prime_polygon) prime_polygons.append(prime_polygon)
else: else:
self._error_areas.append(prime_polygon) self._error_areas.append(prime_polygon)
prime_collision = prime_collision or prime_tower_collision prime_collision = prime_collision
disallowed_polygons.extend(prime_polygons) disallowed_polygons.extend(prime_polygons)