3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed count from findNodePlacement

Browse source 
CURA-3239
This commit is contained in:
Jaime van Kessel 2017-04-07 16:16:38 +02:00
parent 04eca9073a
commit f42efcb7e0
3 changed files with 25 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

43
cura/Arrange.py
View file

@ -69,31 +69,26 @@ class Arrange:
# \param node # \param node
# \param offset_shape_arr ShapeArray with offset, used to find location # \param offset_shape_arr ShapeArray with offset, used to find location
# \param hull_shape_arr ShapeArray without offset, for placing the shape # \param hull_shape_arr ShapeArray without offset, for placing the shape
# \param count Number of objects def findNodePlacement(self, node, offset_shape_arr, hull_shape_arr, step = 1):
def findNodePlacements(self, node, offset_shape_arr, hull_shape_arr, count = 1, step = 1): new_node = copy.deepcopy(node)
nodes = [] best_spot = self.bestSpot(
for i in range(count): offset_shape_arr, start_prio = self._start_priority, step = step)
new_node = copy.deepcopy(node) x, y = best_spot.x, best_spot.y
best_spot = self.bestSpot( self._start_priority = best_spot.priority
offset_shape_arr, start_prio = self._start_priority, step = step) # Ensure that the object is above the build platform
x, y = best_spot.x, best_spot.y new_node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator)
self._start_priority = best_spot.priority if new_node.getBoundingBox():
# Ensure that the object is above the build platform center_y = new_node.getWorldPosition().y - new_node.getBoundingBox().bottom
new_node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator) else:
if new_node.getBoundingBox(): center_y = 0
center_y = new_node.getWorldPosition().y - new_node.getBoundingBox().bottom
else:
center_y = 0
if x is not None: # We could find a place if x is not None: # We could find a place
new_node.setPosition(Vector(x, center_y, y)) new_node.setPosition(Vector(x, center_y, y))
self.place(x, y, hull_shape_arr) # place the object in arranger self.place(x, y, hull_shape_arr) # place the object in arranger
else: else:
Logger.log("d", "Could not find spot!") Logger.log("d", "Could not find spot!")
new_node.setPosition(Vector(200, center_y, 100 - i * 20)) new_node.setPosition(Vector(200, center_y, 100))
return new_node
nodes.append(new_node)
return nodes
## Fill priority, center is best. Lower value is better ## Fill priority, center is best. Lower value is better
# This is a strategy for the arranger. # This is a strategy for the arranger.

14
cura/CuraApplication.py
View file

@ -1280,18 +1280,14 @@ class CuraApplication(QtApplication):
node.addDecorator(ConvexHullDecorator()) node.addDecorator(ConvexHullDecorator())
if node.callDecoration("isSliceable"): if node.callDecoration("isSliceable"):
# find node location # Find node location
offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = min_offset) offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = min_offset)
# step is for skipping tests to make it a lot faster. it also makes the outcome somewhat rougher
nodes = arranger.findNodePlacements(node, offset_shape_arr, hull_shape_arr, count = 1, step = 10)
for new_node in nodes: # Step is for skipping tests to make it a lot faster. it also makes the outcome somewhat rougher
op = AddSceneNodeOperation(new_node, scene.getRoot()) node = arranger.findNodePlacement(node, offset_shape_arr, hull_shape_arr, step = 10)
op.push()
else:
op = AddSceneNodeOperation(node, scene.getRoot())
op.push()
op = AddSceneNodeOperation(node, scene.getRoot())
op.push()
scene.sceneChanged.emit(node) scene.sceneChanged.emit(node)
def addNonSliceableExtension(self, extension): def addNonSliceableExtension(self, extension):

2
cura/MultiplyObjectsJob.py
View file

@ -52,7 +52,7 @@ class MultiplyObjectsJob(Job):
for i in range(self._count): for i in range(self._count):
# We do place the nodes one by one, as we want to yield in between. # We do place the nodes one by one, as we want to yield in between.
nodes.extend(arranger.findNodePlacements(current_node, offset_shape_arr, hull_shape_arr, count = 1)) nodes.append(arranger.findNodePlacement(current_node, offset_shape_arr, hull_shape_arr))
Job.yieldThread() Job.yieldThread()
status_message.setProgress((i + 1) / self._count * 100) status_message.setProgress((i + 1) / self._count * 100)