From 41c8371b86912d1ec734b2be1c64eacbee2024b8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Nov 2016 13:09:17 +0100 Subject: [PATCH] Compute _has_errors only from _error_areas This way we need fewer intermediary variables. It's also more robust and somewhat more elegant. Contributes to issue CURA-2625. --- cura/BuildVolume.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 4cb9ac3604..e0b93c1b82 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -384,7 +384,6 @@ class BuildVolume(SceneNode): disallowed_polygons = [] # Check if prime positions intersect with disallowed areas - prime_collision = False for area in self._global_container_stack.getProperty("machine_disallowed_areas", "value"): poly = Polygon(numpy.array(area, numpy.float32)) @@ -424,7 +423,6 @@ class BuildVolume(SceneNode): prime_polygons.append(prime_polygon) else: self._error_areas.append(prime_polygon) - prime_collision = collision or prime_collision disallowed_polygons.extend(prime_polygons) @@ -446,8 +444,7 @@ class BuildVolume(SceneNode): else: self._error_areas.extend(prime_tower_areas) - # The buildplate has errors if either prime tower or prime has a colission. - self._has_errors = prime_tower_collision or prime_collision + self._has_errors = len(self._error_areas) > 0 self._disallowed_areas = result_areas ## Computes the disallowed areas for objects that are printed.