Merged jpcgt/flatcam/Beta into Beta_8.995

This commit is contained in:
Marius Stanciu
2020-11-08 17:58:31 +02:00
7 changed files with 123 additions and 7 deletions

View File

@@ -2873,7 +2873,7 @@ class NonCopperClear(AppTool, Gerber):
bounding_box = unary_union(geo_buff_list)
elif ncc_sel_obj.kind == 'gerber':
geo_n = unary_union(geo_n).convex_hull
bounding_box = unary_union(self.ncc_obj.solid_geometry).convex_hull.intersection(geo_n)
bounding_box = unary_union(ncc_sel_obj.solid_geometry).convex_hull.intersection(geo_n)
bounding_box = bounding_box.buffer(distance=ncc_margin, join_style=base.JOIN_STYLE.mitre)
else:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("The reference object type is not supported."))
@@ -3319,7 +3319,7 @@ class NonCopperClear(AppTool, Gerber):
rest_geo = []
current_uid = 1
try:
tool = eval(self.app.defaults["tools_ncc_tools"])[0]
tool = eval(str(self.app.defaults["tools_ncc_tools"]))[0]
except TypeError:
tool = eval(self.app.defaults["tools_ncc_tools"])