3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 18:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Also apply horizontal expansion on normal rounding

Browse source 
Might have to rename this function later.

Contributes to issue CURA-2407.
This commit is contained in:
Ghostkeeper 2016-09-28 11:11:12 +02:00
parent 622233bfd8
commit 5f2533e8a4
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/ConvexHullDecorator.py
View file

@ -257,7 +257,16 @@ class ConvexHullDecorator(SceneNodeDecorator):
return poly return poly
def _roundHull(self, convex_hull): def _roundHull(self, convex_hull):
return convex_hull.getMinkowskiHull(Polygon(numpy.array([[-0.5, -0.5], [-0.5, 0.5], [0.5, 0.5], [0.5, -0.5]], numpy.float32))) #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))
return convex_hull.getMinkowskiHull(expansion_polygon)
def _onChanged(self, *args): def _onChanged(self, *args):
self._raft_thickness = self._build_volume.getRaftThickness() self._raft_thickness = self._build_volume.getRaftThickness()
@ -305,7 +314,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0] stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0]
return stack.getProperty(setting_key, property) return stack.getProperty(setting_key, property)
## Returns true if node is a descendent or the same as the root node. ## Returns true if node is a descendant or the same as the root node.
def __isDescendant(self, root, node): def __isDescendant(self, root, node):
if node is None: if node is None:
return False return False