diff options
author | Simon Edwards <s.edwards@ultimaker.com> | 2016-06-22 17:51:56 +0300 |
---|---|---|
committer | Simon Edwards <s.edwards@ultimaker.com> | 2016-06-22 17:51:56 +0300 |
commit | 65a8cf1c4520351e8b9072b9dbf0b85581a5c855 (patch) | |
tree | 03c1a837d90a4d79cc3001859df6761b68192d67 /cura/ConvexHullDecorator.py | |
parent | 6548930d46ec8f0f956ff41e3250d0f2a4a83d28 (diff) |
'One at a time' printing was broken due to a regression in the convex hull decorator.
Contributes to CURA-1504
Diffstat (limited to 'cura/ConvexHullDecorator.py')
-rw-r--r-- | cura/ConvexHullDecorator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index 9fccd46988..4aa6584dc5 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -47,7 +47,7 @@ class ConvexHullDecorator(SceneNodeDecorator): hull = self._compute2DConvexHull() if self._global_stack and self._node: if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self._node.getParent().callDecoration("isGroup"): - hull = hull.getMinkowskiHull(Polygon(numpy.array(self._global_stack.getProperty("machine_head_polygon"), numpy.float32))) + hull = hull.getMinkowskiHull(Polygon(numpy.array(self._global_stack.getProperty("machine_head_polygon", "value"), numpy.float32))) return hull ## Get the convex hull of the node with the full head size @@ -77,7 +77,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return None if self._global_stack: - if self._global_stack("print_sequence") == "one_at_a_time" and not self._node.getParent().callDecoration("isGroup"): + if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self._node.getParent().callDecoration("isGroup"): # Printing one at a time and it's not an object in a group return self._compute2DConvexHull() return None @@ -193,7 +193,7 @@ class ConvexHullDecorator(SceneNodeDecorator): return rounded_hull def _getHeadAndFans(self): - return Polygon(numpy.array(self._global_stack.getProperty("machine_head_with_fans_polygon"), numpy.float32)) + return Polygon(numpy.array(self._global_stack.getProperty("machine_head_with_fans_polygon", "value"), numpy.float32)) def _compute2DConvexHeadFull(self): return self._compute2DConvexHull().getMinkowskiHull(self._getHeadAndFans()) |