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

Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

Browse source
This commit is contained in:
Tamara Hogenhout 2015-09-08 13:35:12 +02:00
commit 6c7536a167
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/CuraApplication.py
View file

@ -325,7 +325,6 @@ class CuraApplication(QtApplication):
continue #Grouped nodes don't need resetting as their parent (the group) is resetted) continue #Grouped nodes don't need resetting as their parent (the group) is resetted)
nodes.append(node) nodes.append(node)
print(nodes)
if nodes: if nodes:
op = GroupedOperation() op = GroupedOperation()
for node in nodes: for node in nodes:

2
cura/OneAtATimeIterator.py
View file

@ -59,7 +59,7 @@ class OneAtATimeIterator(Iterator.Iterator):
# We have no more nodes to check, so quit looking. # We have no more nodes to check, so quit looking.
todo_node_list = None todo_node_list = None
self._node_stack = new_order self._node_stack = new_order
print(self._node_stack)
return return
todo_node_list.append(_objectOrder(new_order, new_todo_list)) todo_node_list.append(_objectOrder(new_order, new_todo_list))
self._node_stack = [] #No result found! self._node_stack = [] #No result found!

4
cura/PlatformPhysics.py
View file

@ -114,6 +114,10 @@ class PlatformPhysics:
head_hull = node.callDecoration("getConvexHullHead") head_hull = node.callDecoration("getConvexHullHead")
if head_hull: if head_hull:
overlap = head_hull.intersectsPolygon(other_node.callDecoration("getConvexHull")) overlap = head_hull.intersectsPolygon(other_node.callDecoration("getConvexHull"))
if not overlap:
other_head_hull = other_node.callDecoration("getConvexHullHead")
if other_head_hull:
overlap = node.callDecoration("getConvexHull").intersectsPolygon(other_head_hull)
else: else:
overlap = node.callDecoration("getConvexHull").intersectsPolygon(other_node.callDecoration("getConvexHull")) overlap = node.callDecoration("getConvexHull").intersectsPolygon(other_node.callDecoration("getConvexHull"))
except: except: