GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix adding prime locations to final disallowed areas

Browse Source 
They were added to several intermediary variables, but not to the final result.

Contributes to issue CURA-2625.
This commit is contained in:
Ghostkeeper 2016-11-11 15:10:39 +01:00
parent ccccf62bf7
commit 45db315f77
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/BuildVolume.py
View File

@ -378,6 +378,8 @@ class BuildVolume(SceneNode):
self._error_areas = [] self._error_areas = []
result_areas = self._computeDisallowedAreasStatic()
machine_width = self._global_container_stack.getProperty("machine_width", "value") machine_width = self._global_container_stack.getProperty("machine_width", "value")
machine_depth = self._global_container_stack.getProperty("machine_depth", "value") machine_depth = self._global_container_stack.getProperty("machine_depth", "value")
@ -402,6 +404,7 @@ class BuildVolume(SceneNode):
prime_polygon = Polygon.approximatedCircle(PRIME_CLEARANCE) prime_polygon = Polygon.approximatedCircle(PRIME_CLEARANCE)
prime_polygon = prime_polygon.translate(prime_x, prime_y) prime_polygon = prime_polygon.translate(prime_x, prime_y)
prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(0))
collision = False 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.
@ -424,10 +427,7 @@ class BuildVolume(SceneNode):
else: else:
self._error_areas.append(prime_polygon) self._error_areas.append(prime_polygon)
disallowed_polygons.extend(prime_polygons) result_areas.extend(prime_polygons)
# Extend every area already in the disallowed_areas with the skirt size.
result_areas = self._computeDisallowedAreasStatic()
# Add prime tower location as disallowed area. # Add prime tower location as disallowed area.
prime_tower_collision = False prime_tower_collision = False