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

5
CHANGELOG.md
View File

@@ -7,6 +7,11 @@ CHANGELOG for FlatCAM Evo beta
=================================================
15.06.2023
- a bit of optimization in camblib.clear_polygon() method
- added the update of bounds for the TclCommands: Mirror, Scale, Offset, Skew, Buffer
12.06.2023
- Geometry Editor: fixed the selected shapes width issue; now the selected shapes are thicker

49
camlib.py
View File

@@ -1488,11 +1488,10 @@ 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:
for tiny_pol in cl_pol_list:
if tiny_pol.area > 0:
added_flag = True
geoms.insert(tiny_pol.exterior)
@@ -1506,19 +1505,39 @@ class Geometry(object):
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)
cl_pol = MultiPolygon(cl_pol_list)
for i in cl_pol.interiors:
geoms.insert(i)
if prog_plot:
self.plot_temp_shapes(i)
else:
break
# 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")

10
tclCommands/TclCommandBuffer.py
View File

@@ -110,3 +110,13 @@ class TclCommandBuffer(TclCommand):
factor = bool(eval(str(args['factor']).capitalize())) if 'factor' in args else None
obj_to_buff.buffer(distance, join, factor, only_exterior=True)
try:
xmin, ymin, xmax, ymax = obj_to_buff.bounds()
obj_to_buff.obj_options['xmin'] = xmin
obj_to_buff.obj_options['ymin'] = ymin
obj_to_buff.obj_options['xmax'] = xmax
obj_to_buff.obj_options['ymax'] = ymax
except Exception as e:
self.app.log.error("TclCommandBuffer -> The object has no bounds properties. %s" % str(e))
return "fail"

10
tclCommands/TclCommandMirror.py
View File

@@ -162,3 +162,13 @@ class TclCommandMirror(TclCommandSignaled):
except Exception as e:
self.app.log.error("Operation failed: %s" % str(e))
return "fail"
try:
xmin, ymin, xmax, ymax = obj.bounds()
obj.obj_options['xmin'] = xmin
obj.obj_options['ymin'] = ymin
obj.obj_options['xmax'] = xmax
obj.obj_options['ymax'] = ymax
except Exception as e:
self.app.log.error("TclCommandMirror -> The object has no bounds properties. %s" % str(e))
return "fail"

10
tclCommands/TclCommandOffset.py
View File

@@ -72,3 +72,13 @@ class TclCommandOffset(TclCommand):
return "fail"
obj.offset((x, y))
try:
xmin, ymin, xmax, ymax = obj.bounds()
obj.obj_options['xmin'] = xmin
obj.obj_options['ymin'] = ymin
obj.obj_options['xmax'] = xmax
obj.obj_options['ymax'] = ymax
except Exception as e:
self.app.log.error("TclCommandOffset -> The object has no bounds properties. %s" % str(e))
return "fail"

10
tclCommands/TclCommandScale.py
View File

@@ -155,3 +155,13 @@ class TclCommandScale(TclCommand):
f_x = float(args['x'])
f_y = float(args['y'])
obj_to_scale.scale(f_x, f_y, point=point)
try:
xmin, ymin, xmax, ymax = obj_to_scale.bounds()
obj_to_scale.obj_options['xmin'] = xmin
obj_to_scale.obj_options['ymin'] = ymin
obj_to_scale.obj_options['xmax'] = xmax
obj_to_scale.obj_options['ymax'] = ymax
except Exception as e:
self.app.log.error("TclCommandScale -> The object has no bounds properties. %s" % str(e))
return "fail"

10
tclCommands/TclCommandSkew.py
View File

@@ -202,3 +202,13 @@ class TclCommandSkew(TclCommand):
angle_y = math.degrees(math.atan(dist_y/width))
obj_to_skew.skew(angle_x, angle_y, point=ref_point)
try:
xmin, ymin, xmax, ymax = obj_to_skew.bounds()
obj_to_skew.obj_options['xmin'] = xmin
obj_to_skew.obj_options['ymin'] = ymin
obj_to_skew.obj_options['xmax'] = xmax
obj_to_skew.obj_options['ymax'] = ymax
except Exception as e:
self.app.log.error("TclCommandSkew -> The object has no bounds properties. %s" % str(e))
return "fail"