Merge pull request #16555 from Ultimaker/CURA-10307_expand-one-at-a-time-shadow

CURA-10307_expand-one-at-a-time-shadow
This commit is contained in:
Saumya Jain 2023-08-25 17:24:53 +02:00 committed by GitHub
commit 95aec61de9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions

View File

@ -111,11 +111,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
# Parent can be None if node is just loaded. # Parent can be None if node is just loaded.
if self._isSingularOneAtATimeNode(): if self._isSingularOneAtATimeNode():
hull = self.getConvexHullHeadFull() return self.getConvexHullHeadFull()
if hull is None:
return None
hull = self._add2DAdhesionMargin(hull)
return hull
return self._compute2DConvexHull() return self._compute2DConvexHull()
@ -323,6 +319,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
def _compute2DConvexHeadFull(self) -> Optional[Polygon]: def _compute2DConvexHeadFull(self) -> Optional[Polygon]:
convex_hull = self._compute2DConvexHull() convex_hull = self._compute2DConvexHull()
convex_hull = self._add2DAdhesionMargin(convex_hull)
if convex_hull: if convex_hull:
return convex_hull.getMinkowskiHull(self._getHeadAndFans()) return convex_hull.getMinkowskiHull(self._getHeadAndFans())
return None return None

View File

@ -57,7 +57,7 @@
[25, 49], [25, 49],
[25, -49], [25, -49],
[-25, -49], [-25, -49],
[25, 49] [-25, 49]
] ]
}, },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },

View File

@ -54,7 +54,7 @@
[25, 49], [25, 49],
[25, -49], [25, -49],
[-25, -49], [-25, -49],
[25, 49] [-25, 49]
] ]
}, },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },

View File

@ -51,7 +51,7 @@
[25, 49], [25, 49],
[25, -49], [25, -49],
[-25, -49], [-25, -49],
[25, 49] [-25, 49]
] ]
}, },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },