From dfe4b348b458d6b211c6967c4d419c81d18ab73b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Sep 2015 13:31:16 +0200 Subject: [PATCH] Fixed push free for one at a time --- cura/CuraApplication.py | 1 - cura/OneAtATimeIterator.py | 2 +- cura/PlatformPhysics.py | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 74cf9d8beb..8622d3c244 100644 --- a/cura/CuraApplication.py +++ b/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: diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index 0be14e8703..64f25c6b64 100644 --- a/cura/OneAtATimeIterator.py +++ b/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! diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index bf2860d7d6..8b0b641b4e 100644 --- a/cura/PlatformPhysics.py +++ b/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: