bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- a bit of optimization in camblib.clear_polygon() method

Browse Source 
- added the update of bounds for the TclCommands: Mirror, Scale, Offset, Skew, Buffer
This commit is contained in:
Marius Stanciu
2023-06-15 00:50:10 +03:00
parent dd49b21176
commit aa7758c885
7 changed files with 99 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
camlib.py
View File

@@ -1488,37 +1488,56 @@ class Geometry(object):
QtWidgets.QApplication.processEvents()
cl_pol = cl_pol.buffer(-tooldia * (1 - overlap), int(steps_per_circle))
if isinstance(cl_pol, MultiPolygon):
cl_pol = flatten_shapely_geometry(cl_pol)
cl_pol_list = flatten_shapely_geometry(cl_pol)
added_flag = False
for tiny_pol in cl_pol:
if tiny_pol.area > 0:
added_flag = True
geoms.insert(tiny_pol.exterior)
if prog_plot:
self.plot_temp_shapes(tiny_pol.exterior)
for i in tiny_pol.interiors:
geoms.insert(i)
if prog_plot:
self.plot_temp_shapes(i)
if added_flag is False:
break
cl_pol = MultiPolygon(cl_pol)
else:
if cl_pol.area > 0:
geoms.insert(cl_pol.exterior)
added_flag = False
for tiny_pol in cl_pol_list:
if tiny_pol.area > 0:
added_flag = True
geoms.insert(tiny_pol.exterior)
if prog_plot:
self.plot_temp_shapes(cl_pol.exterior)
self.plot_temp_shapes(tiny_pol.exterior)
for i in cl_pol.interiors:
for i in tiny_pol.interiors:
geoms.insert(i)
if prog_plot:
self.plot_temp_shapes(i)
else:
break
if added_flag is False:
break
cl_pol = MultiPolygon(cl_pol_list)
# if isinstance(cl_pol, MultiPolygon):
# cl_pol = flatten_shapely_geometry(cl_pol)
#
# added_flag = False
# for tiny_pol in cl_pol:
# if tiny_pol.area > 0:
# added_flag = True
# geoms.insert(tiny_pol.exterior)
# if prog_plot:
# self.plot_temp_shapes(tiny_pol.exterior)
#
# for i in tiny_pol.interiors:
# geoms.insert(i)
# if prog_plot:
# self.plot_temp_shapes(i)
# if added_flag is False:
# break
#
# cl_pol = MultiPolygon(cl_pol)
# else:
# if cl_pol.area > 0:
# geoms.insert(cl_pol.exterior)
# if prog_plot:
# self.plot_temp_shapes(cl_pol.exterior)
#
# for i in cl_pol.interiors:
# geoms.insert(i)
# if prog_plot:
# self.plot_temp_shapes(i)
# else:
# break
if not geoms.objects:
self.app.log.debug("camlib.Geometry.clear_polygon() --> Current Area is zero")