GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 02:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12980 with #12970

Browse Source 
Merge the two pull requests as asked by @fieldOfView
This commit is contained in:
digitalfrost 2022-08-08 14:22:58 +02:00
commit e7194db7f6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/Arranging/ShapeArray.py
View File

@ -74,14 +74,14 @@ class ShapeArray:
# If the child-nodes are included, adjust convex hulls as well: # If the child-nodes are included, adjust convex hulls as well:
if include_children: if include_children:
children = node.getAllChildren() children = node.getAllChildren()
if not children is None: if children is not None:
for child in children: for child in children:
# 'Inefficient' combination of convex hulls through known code rather than mess it up: # 'Inefficient' combination of convex hulls through known code rather than mess it up:
child_hull = child.callDecoration("getConvexHull") child_hull = child.callDecoration("getConvexHull")
if not child_hull is None: if child_hull is not None:
hull_verts = hull_verts.unionConvexHulls(child_hull) hull_verts = hull_verts.unionConvexHulls(child_hull)
child_hull_head = child.callDecoration("getConvexHullHead") or child_hull child_hull_head = child.callDecoration("getConvexHullHead") or child_hull
if not child_hull_head is None: if child_hull_head is not None:
hull_head_verts = hull_head_verts.unionConvexHulls(child_hull_head) hull_head_verts = hull_head_verts.unionConvexHulls(child_hull_head)
offset_verts = hull_head_verts.getMinkowskiHull(Polygon.approximatedCircle(min_offset)) offset_verts = hull_head_verts.getMinkowskiHull(Polygon.approximatedCircle(min_offset))
@ -159,4 +159,4 @@ class ShapeArray:
max_col_idx = (idxs[0] - p1[0]) / (p2[0] - p1[0]) * (p2[1] - p1[1]) + p1[1] max_col_idx = (idxs[0] - p1[0]) / (p2[0] - p1[0]) * (p2[1] - p1[1]) + p1[1]
sign = numpy.sign(p2[0] - p1[0]) sign = numpy.sign(p2[0] - p1[0])
return idxs[1] * sign <= max_col_idx * sign return idxs[1] * sign <= max_col_idx * sign