Browse Source

Fixed push free for one at a time

Jaime van Kessel 9 years ago
parent
commit
dfe4b348b4
3 changed files with 5 additions and 2 deletions
  1. 0 1
      cura/CuraApplication.py
  2. 1 1
      cura/OneAtATimeIterator.py
  3. 4 0
      cura/PlatformPhysics.py

+ 0 - 1
cura/CuraApplication.py

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

+ 1 - 1
cura/OneAtATimeIterator.py

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

+ 4 - 0
cura/PlatformPhysics.py

@@ -114,6 +114,10 @@ class PlatformPhysics:
                         head_hull = node.callDecoration("getConvexHullHead")
                         if head_hull:
                             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:
                             overlap = node.callDecoration("getConvexHull").intersectsPolygon(other_node.callDecoration("getConvexHull"))
                     except: