- optimized the FlatCAMGerber.clear_plot_apertures() method

This commit is contained in:
Marius Stanciu 2019-12-12 18:47:30 +02:00 committed by Marius
parent 367c23fa29
commit c00f30ef65
2 changed files with 17 additions and 9 deletions

View File

@ -1809,18 +1809,25 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
:param aperture: string; aperture for which to clear the mark shapes
:return:
"""
try:
if self.mark_shapes:
if aperture == 'all':
for apid in list(self.apertures.keys()):
if self.app.is_legacy is True:
self.mark_shapes[apid].clear(update=False)
else:
self.mark_shapes[apid].clear(update=True)
try:
if self.app.is_legacy is True:
self.mark_shapes[apid].clear(update=False)
else:
self.mark_shapes[apid].clear(update=True)
except Exception as e:
log.debug("FlatCAMGerber.clear_plot_apertures() 'all' --> %s" % str(e))
else:
self.mark_shapes[aperture].clear(update=True)
except Exception as e:
log.debug("FlatCAMGerber.clear_plot_apertures() --> %s" % str(e))
try:
if self.app.is_legacy is True:
self.mark_shapes[aperture].clear(update=False)
else:
self.mark_shapes[aperture].clear(update=True)
except Exception as e:
log.debug("FlatCAMGerber.clear_plot_apertures() 'aperture' --> %s" % str(e))
def clear_mark_all(self):
self.ui.mark_all_cb.set_value(False)

View File

@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing.
- changed the Scale Entry in Object UI to FCEntry() GUI element in order to allow expressions to be entered. E.g: 1/25.4
- some small changes in the Scale button handler in FlatCAMObj() class
- added option to save objects as PDF files in File -> Save menu
- optimized the FlatCAMGerber.clear_plot_apertures() method
11.12.2019