GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 20:15:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Jaime van Kessel 2017-04-07 16:52:19 +02:00
parent 670de52ec9
commit c94b05e0f4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cura/Arrange.py
View File

@ -21,7 +21,7 @@ LocationSuggestion = namedtuple("LocationSuggestion", ["x", "y", "penalty_points
class Arrange: class Arrange:
build_volume = None build_volume = None
def __init__(self, x, y, offset_x, offset_y, scale=1): def __init__(self, x, y, offset_x, offset_y, scale= 1.0):
self.shape = (y, x) self.shape = (y, x)
self._priority = numpy.zeros((x, y), dtype=numpy.int32) self._priority = numpy.zeros((x, y), dtype=numpy.int32)
self._priority_unique_values = [] self._priority_unique_values = []
@ -48,7 +48,8 @@ class Arrange:
# Only count sliceable objects # Only count sliceable objects
if node_.callDecoration("isSliceable"): if node_.callDecoration("isSliceable"):
fixed_nodes.append(node_) fixed_nodes.append(node_)
# place all objects fixed nodes
# Place all objects fixed nodes
for fixed_node in fixed_nodes: for fixed_node in fixed_nodes:
vertices = fixed_node.callDecoration("getConvexHull") vertices = fixed_node.callDecoration("getConvexHull")
points = copy.deepcopy(vertices._points) points = copy.deepcopy(vertices._points)
@ -146,8 +147,8 @@ class Arrange:
start_idx = start_idx_list[0][0] start_idx = start_idx_list[0][0]
else: else:
start_idx = 0 start_idx = 0
for prio in self._priority_unique_values[start_idx::step]: for priority in self._priority_unique_values[start_idx::step]:
tryout_idx = numpy.where(self._priority == prio) tryout_idx = numpy.where(self._priority == priority)
for idx in range(len(tryout_idx[0])): for idx in range(len(tryout_idx[0])):
x = tryout_idx[0][idx] x = tryout_idx[0][idx]
y = tryout_idx[1][idx] y = tryout_idx[1][idx]
@ -157,8 +158,8 @@ 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 != 999999:
return LocationSuggestion(x = projected_x, y = projected_y, penalty_points = penalty_points, priority = prio) return LocationSuggestion(x = projected_x, y = projected_y, penalty_points = penalty_points, priority = priority)
return LocationSuggestion(x = None, y = None, penalty_points = None, priority = prio) # No suitable location found :-( return LocationSuggestion(x = None, y = None, penalty_points = None, priority = priority) # No suitable location found :-(
## Place the object. ## Place the object.
# Marks the locations in self._occupied and self._priority # Marks the locations in self._occupied and self._priority