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

Fix to grouped one at a time

Browse source
This commit is contained in:
Jaime van Kessel 2015-07-24 10:55:59 +02:00
parent 03ca7142d5
commit 453047df1f
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/OneAtATimeIterator.py
View file

@ -35,7 +35,6 @@ class OneAtATimeIterator(Iterator.Iterator):
for a in range(0,len(node_list)): for a in range(0,len(node_list)):
for b in range(0,len(node_list)): for b in range(0,len(node_list)):
if a != b and self._hit_map[a][b] and self._hit_map[b][a]: if a != b and self._hit_map[a][b] and self._hit_map[b][a]:
print("Derp")
return return
# Sort the original list so that items that block the most other objects are at the beginning. # Sort the original list so that items that block the most other objects are at the beginning.

10
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -120,7 +120,7 @@ class CuraEngineBackend(Backend):
children = node.getAllChildren() children = node.getAllChildren()
children.append(node) children.append(node)
for child_node in children: for child_node in children:
if type(child_node) is SceneNode and node.getMeshData() and node.getMeshData().getVertices() is not None: if type(child_node) is SceneNode and child_node.getMeshData() and child_node.getMeshData().getVertices() is not None:
temp_list.append(child_node) temp_list.append(child_node)
object_groups.append(temp_list) object_groups.append(temp_list)
else: else:
@ -169,12 +169,12 @@ class CuraEngineBackend(Backend):
#print("Iterator time! ", OneAtATimeIterator(self._scene.getRoot())) #print("Iterator time! ", OneAtATimeIterator(self._scene.getRoot()))
#for item in OneAtATimeIterator(self._scene.getRoot()): #for item in OneAtATimeIterator(self._scene.getRoot()):
# print(item) # print(item)
center = Vector() print("Start sending objects to engine")
for group in object_groups: for group in object_groups:
print("Start sending group")
group_message = slice_message.object_lists.add() group_message = slice_message.object_lists.add()
for object in group: for object in group:
center += object.getPosition() print("Added object to group")
mesh_data = object.getMeshData().getTransformed(object.getWorldTransformation()) mesh_data = object.getMeshData().getTransformed(object.getWorldTransformation())
obj = group_message.objects.add() obj = group_message.objects.add()
@ -192,7 +192,7 @@ class CuraEngineBackend(Backend):
#obj.indices = meshData.getIndicesAsByteArray() #obj.indices = meshData.getIndicesAsByteArray()
self._scene.releaseLock() self._scene.releaseLock()
print("sending slice message") print("Message completed. Sending...")
self._socket.sendMessage(slice_message) self._socket.sendMessage(slice_message)
def _onSceneChanged(self, source): def _onSceneChanged(self, source):