From 42ee87c88ff82e5b5a3d4d82d805eb0c8b5c9247 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Nov 2016 11:54:50 +0100 Subject: [PATCH] Rename areas to result_areas Because we have 'areas', 'disallowed_areas', 'self._disallowed_areas', 'disallowed_polygons', and so on. This should reduce the confusion a bit. Contributes to issue CURA-2625. --- cura/BuildVolume.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 54788ceb08..aed1af769b 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -447,7 +447,7 @@ class BuildVolume(SceneNode): disallowed_polygons.extend(prime_polygons) # Extend every area already in the disallowed_areas with the skirt size. - areas = self._computeDisallowedAreasStatic() + result_areas = self._computeDisallowedAreasStatic() # Check if the prime tower area intersects with any of the other areas. # If this is the case, add it to the error area's so it can be drawn in red. @@ -456,18 +456,18 @@ class BuildVolume(SceneNode): if prime_tower_area: # Using Minkowski of 0 fixes the prime tower area so it's rendered correctly prime_tower_area = prime_tower_area.getMinkowskiHull(Polygon.approximatedCircle(0)) - for area in areas: + for area in result_areas: if prime_tower_area.intersectsPolygon(area) is not None: prime_tower_collision = True break if not prime_tower_collision: - areas.append(prime_tower_area) + result_areas.append(prime_tower_area) else: self._error_areas.append(prime_tower_area) # The buildplate has errors if either prime tower or prime has a colission. self._has_errors = prime_tower_collision or prime_collision - self._disallowed_areas = areas + self._disallowed_areas = result_areas ## Computes the disallowed areas that are statically placed in the machine. #