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

Rename areas to result_areas

Browse source 
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.
This commit is contained in:
Ghostkeeper 2016-11-11 11:54:50 +01:00
parent 77a6c459d8
commit 42ee87c88f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/BuildVolume.py
View file

@ -447,7 +447,7 @@ class BuildVolume(SceneNode):
disallowed_polygons.extend(prime_polygons) disallowed_polygons.extend(prime_polygons)
# Extend every area already in the disallowed_areas with the skirt size. # 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. # 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. # 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: if prime_tower_area:
# Using Minkowski of 0 fixes the prime tower area so it's rendered correctly # Using Minkowski of 0 fixes the prime tower area so it's rendered correctly
prime_tower_area = prime_tower_area.getMinkowskiHull(Polygon.approximatedCircle(0)) 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: if prime_tower_area.intersectsPolygon(area) is not None:
prime_tower_collision = True prime_tower_collision = True
break break
if not prime_tower_collision: if not prime_tower_collision:
areas.append(prime_tower_area) result_areas.append(prime_tower_area)
else: else:
self._error_areas.append(prime_tower_area) self._error_areas.append(prime_tower_area)
# The buildplate has errors if either prime tower or prime has a colission. # 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 = 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. ## Computes the disallowed areas that are statically placed in the machine.
# #