From aa69c1beeea14d0b28a62867a07eb3bdecebf43a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Sep 2016 11:13:33 +0200 Subject: [PATCH] Re-use _roundHull method This code was duplicated. Contributes to issue CURA-2407. --- cura/ConvexHullDecorator.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index f1e5cbd4b9..faab07332f 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -196,19 +196,8 @@ class ConvexHullDecorator(SceneNodeDecorator): hull = Polygon(vertex_data) if len(vertex_data) >= 4: - # First, calculate the normal convex hull around the points convex_hull = hull.getConvexHull() - - #Then, offset the convex hull with the horizontal expansion value, since that is always added to the mesh. - #Use a minimum of 0.5mm to outset and round the normal convex hull if there is no horizontal expansion, because of edge cases. - horizontal_expansion = max(0.5, self._getSettingProperty("xy_offset", "value")) - expansion_polygon = Polygon(numpy.array([ - [-horizontal_expansion, -horizontal_expansion], - [-horizontal_expansion, horizontal_expansion], - [horizontal_expansion, horizontal_expansion], - [horizontal_expansion, -horizontal_expansion] - ], numpy.float32)) - rounded_hull = convex_hull.getMinkowskiHull(expansion_polygon) + rounded_hull = self._roundHull(convex_hull) # Store the result in the cache self._2d_convex_hull_mesh = mesh