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

Fixed multiplyObject group. CURA-3239

Browse source
This commit is contained in:
Jack Ha 2017-04-03 11:12:20 +02:00
parent bd874a62ac
commit e866c03b50
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Arrange.py
View file

@ -143,7 +143,7 @@ class Arrange:
Logger.log("d", "Current buildplate: \n%s" % str(arranger._occupied[::10, ::10])) Logger.log("d", "Current buildplate: \n%s" % str(arranger._occupied[::10, ::10]))
return arranger return arranger
## Find placement for a node and place it ## Find placement for a node (using offset shape) and place it (using hull shape)
# #
def findNodePlacements(self, node, offset_shape_arr, hull_shape_arr, count = 1, step = 1): def findNodePlacements(self, node, offset_shape_arr, hull_shape_arr, count = 1, step = 1):
# offset_shape_arr, hull_shape_arr, arranger -> nodes, arranger # offset_shape_arr, hull_shape_arr, arranger -> nodes, arranger

12
cura/CuraApplication.py
View file

@ -856,17 +856,17 @@ class CuraApplication(QtApplication):
if not node and object_id != 0: # Workaround for tool handles overlapping the selected object if not node and object_id != 0: # Workaround for tool handles overlapping the selected object
node = Selection.getSelectedObject(0) node = Selection.getSelectedObject(0)
root = self.getController().getScene().getRoot()
arranger = Arrange.create(scene_root = root)
offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = min_offset)
nodes = arranger.findNodePlacements(node, offset_shape_arr, hull_shape_arr, count = count)
if nodes:
current_node = node current_node = node
# Find the topmost group # Find the topmost group
while current_node.getParent() and current_node.getParent().callDecoration("isGroup"): while current_node.getParent() and current_node.getParent().callDecoration("isGroup"):
current_node = current_node.getParent() current_node = current_node.getParent()
root = self.getController().getScene().getRoot()
arranger = Arrange.create(scene_root = root)
offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(current_node, min_offset = min_offset)
nodes = arranger.findNodePlacements(current_node, offset_shape_arr, hull_shape_arr, count = count)
if nodes:
op = GroupedOperation() op = GroupedOperation()
for new_node in nodes: for new_node in nodes:
op.addOperation(AddSceneNodeOperation(new_node, current_node.getParent())) op.addOperation(AddSceneNodeOperation(new_node, current_node.getParent()))