3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Compute _has_errors only from _error_areas

Browse source 
This way we need fewer intermediary variables. It's also more robust and somewhat more elegant.

Contributes to issue CURA-2625.
This commit is contained in:
Ghostkeeper 2016-11-11 13:09:17 +01:00
parent cfc9a7b6cf
commit 41c8371b86
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/BuildVolume.py
View file

@ -384,7 +384,6 @@ class BuildVolume(SceneNode):
disallowed_polygons = [] disallowed_polygons = []
# Check if prime positions intersect with disallowed areas # Check if prime positions intersect with disallowed areas
prime_collision = False
for area in self._global_container_stack.getProperty("machine_disallowed_areas", "value"): for area in self._global_container_stack.getProperty("machine_disallowed_areas", "value"):
poly = Polygon(numpy.array(area, numpy.float32)) poly = Polygon(numpy.array(area, numpy.float32))
@ -424,7 +423,6 @@ class BuildVolume(SceneNode):
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 = collision or prime_collision
disallowed_polygons.extend(prime_polygons) disallowed_polygons.extend(prime_polygons)
@ -446,8 +444,7 @@ class BuildVolume(SceneNode):
else: else:
self._error_areas.extend(prime_tower_areas) self._error_areas.extend(prime_tower_areas)
# The buildplate has errors if either prime tower or prime has a colission. self._has_errors = len(self._error_areas) > 0
self._has_errors = prime_tower_collision or prime_collision
self._disallowed_areas = result_areas self._disallowed_areas = result_areas
## Computes the disallowed areas for objects that are printed. ## Computes the disallowed areas for objects that are printed.