diff options
author | Jaime van Kessel <nallath@gmail.com> | 2017-04-07 17:16:38 +0300 |
---|---|---|
committer | Jaime van Kessel <nallath@gmail.com> | 2017-04-07 17:16:38 +0300 |
commit | f42efcb7e03f683bedd6d17108fab488db9a2b0d (patch) | |
tree | dbfdf11da2c6bb2a2f35df8a7b518b021e900391 /cura/Arrange.py | |
parent | 04eca9073a3ba60d91f38ca84ab496c764688abd (diff) |
Removed count from findNodePlacement
CURA-3239
Diffstat (limited to 'cura/Arrange.py')
-rwxr-xr-x | cura/Arrange.py | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/cura/Arrange.py b/cura/Arrange.py index 9ba1f67396..225e512c2f 100755 --- a/cura/Arrange.py +++ b/cura/Arrange.py @@ -69,31 +69,26 @@ class Arrange: # \param node # \param offset_shape_arr ShapeArray with offset, used to find location # \param hull_shape_arr ShapeArray without offset, for placing the shape - # \param count Number of objects - def findNodePlacements(self, node, offset_shape_arr, hull_shape_arr, count = 1, step = 1): - nodes = [] - for i in range(count): - new_node = copy.deepcopy(node) - best_spot = self.bestSpot( - offset_shape_arr, start_prio = self._start_priority, step = step) - x, y = best_spot.x, best_spot.y - self._start_priority = best_spot.priority - # Ensure that the object is above the build platform - new_node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator) - if new_node.getBoundingBox(): - center_y = new_node.getWorldPosition().y - new_node.getBoundingBox().bottom - else: - center_y = 0 - - if x is not None: # We could find a place - new_node.setPosition(Vector(x, center_y, y)) - self.place(x, y, hull_shape_arr) # place the object in arranger - else: - Logger.log("d", "Could not find spot!") - new_node.setPosition(Vector(200, center_y, 100 - i * 20)) - - nodes.append(new_node) - return nodes + def findNodePlacement(self, node, offset_shape_arr, hull_shape_arr, step = 1): + new_node = copy.deepcopy(node) + best_spot = self.bestSpot( + offset_shape_arr, start_prio = self._start_priority, step = step) + x, y = best_spot.x, best_spot.y + self._start_priority = best_spot.priority + # Ensure that the object is above the build platform + new_node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator) + if new_node.getBoundingBox(): + center_y = new_node.getWorldPosition().y - new_node.getBoundingBox().bottom + else: + center_y = 0 + + if x is not None: # We could find a place + new_node.setPosition(Vector(x, center_y, y)) + self.place(x, y, hull_shape_arr) # place the object in arranger + else: + Logger.log("d", "Could not find spot!") + new_node.setPosition(Vector(200, center_y, 100)) + return new_node ## Fill priority, center is best. Lower value is better # This is a strategy for the arranger. |