3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Minor refactor; Return None instead of weird 999999 if no suitable location was found

Browse source
This commit is contained in:
Jaime van Kessel 2017-04-12 15:01:39 +02:00
parent bfc8cc8a9e
commit 299ad624da
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Arrange.py
View file

@ -114,7 +114,7 @@ class Arrange:
self._priority_unique_values.sort() self._priority_unique_values.sort()
## Return the amount of "penalty points" for polygon, which is the sum of priority ## Return the amount of "penalty points" for polygon, which is the sum of priority
# 999999 if occupied # None if occupied
# \param x x-coordinate to check shape # \param x x-coordinate to check shape
# \param y y-coordinate # \param y y-coordinate
# \param shape_arr the ShapeArray object to place # \param shape_arr the ShapeArray object to place
@ -128,9 +128,9 @@ class Arrange:
offset_x:offset_x + shape_arr.arr.shape[1]] offset_x:offset_x + shape_arr.arr.shape[1]]
try: try:
if numpy.any(occupied_slice[numpy.where(shape_arr.arr == 1)]): if numpy.any(occupied_slice[numpy.where(shape_arr.arr == 1)]):
return 999999 return None
except IndexError: # out of bounds if you try to place an object outside except IndexError: # out of bounds if you try to place an object outside
return 999999 return None
prio_slice = self._priority[ prio_slice = self._priority[
offset_y:offset_y + shape_arr.arr.shape[0], offset_y:offset_y + shape_arr.arr.shape[0],
offset_x:offset_x + shape_arr.arr.shape[1]] offset_x:offset_x + shape_arr.arr.shape[1]]
@ -157,7 +157,7 @@ class Arrange:
# array to "world" coordinates # array to "world" coordinates
penalty_points = self.checkShape(projected_x, projected_y, shape_arr) penalty_points = self.checkShape(projected_x, projected_y, shape_arr)
if penalty_points != 999999: if penalty_points is not None:
return LocationSuggestion(x = projected_x, y = projected_y, penalty_points = penalty_points, priority = priority) return LocationSuggestion(x = projected_x, y = projected_y, penalty_points = penalty_points, priority = priority)
return LocationSuggestion(x = None, y = None, penalty_points = None, priority = priority) # No suitable location found :-( return LocationSuggestion(x = None, y = None, penalty_points = None, priority = priority) # No suitable location found :-(