3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

refactor ConvexHullDecorator.getConvexHull

Browse source 
CURA-6522
This commit is contained in:
Nino van Hooff 2019-10-31 16:40:32 +01:00
parent 249a66ebd9
commit b6fc8523f3
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cura/Scene/ConvexHullDecorator.py
View file

@ -95,14 +95,16 @@ class ConvexHullDecorator(SceneNodeDecorator):
return None return None
if self._node.callDecoration("isNonPrintingMesh"): if self._node.callDecoration("isNonPrintingMesh"):
return None return None
hull = self._compute2DConvexHull()
if self._global_stack and self._node is not None and hull is not None: # Parent can be None if node is just loaded.
# Parent can be None if node is just loaded. if self._global_stack \
if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): and self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" \
hull = hull.getMinkowskiHull(Polygon(numpy.array(self._global_stack.getProperty("machine_head_polygon", "value"), numpy.float32))) and not self.hasGroupAsParent(self._node):
hull = self._add2DAdhesionMargin(hull) hull = self.getConvexHullHeadFull()
return hull hull = self._add2DAdhesionMargin(hull)
return hull
return self._compute2DConvexHull()
## Get the convex hull of the node with the full head size ## Get the convex hull of the node with the full head size
def getConvexHullHeadFull(self) -> Optional[Polygon]: def getConvexHullHeadFull(self) -> Optional[Polygon]: