- in Solderpast Plugin fixed the GCode generation; make sure that if no object is selected then the first Gerber object is autoselected

- in Solderpaste Plugin fixed the CNCJob plotting
- in Solderpaste Plugin added a new parameter 'Margin' which allows reducing how much solderpaste is added and therefore adding a space between the solderpaste and the pad boundary
- all CNCJob objects generated by the Solderpaste plugin now have the GCode saved as source_code which can be saved also from the CNCJob object context menu, and edited
This commit is contained in:
Marius Stanciu
2022-04-20 14:35:39 +03:00
committed by Marius
parent a56f794fbc
commit de8fd2cceb
6 changed files with 103 additions and 47 deletions

View File

@@ -1001,15 +1001,15 @@ class CNCJobObject(FlatCAMObj, CNCjob):
if postamble == '':
postamble = self.app.options["cncjob_append"]
try:
if self.special_group:
self.app.inform.emit('[WARNING_NOTCL] %s %s %s.' %
(_("This CNCJob object can't be processed because it is a"),
str(self.special_group),
_("CNCJob object")))
return 'fail'
except AttributeError:
pass
# try:
# if self.special_group:
# self.app.inform.emit('[WARNING_NOTCL] %s %s %s.' %
# (_("This CNCJob object can't be processed because it is a"),
# str(self.special_group),
# _("CNCJob object")))
# return 'fail'
# except AttributeError:
# pass
# if this dict is not empty then the object is a Geometry object
if self.obj_options['type'].lower() == 'geometry':
@@ -1357,7 +1357,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.plot2(tooldia=dia_plot, obj=self, visible=visible, gcode_parsed=gcode_parsed,
kind=kind)
self.shapes.redraw()
except (ObjectDeleted, AttributeError):
except (ObjectDeleted, AttributeError) as err:
self.app.log.debug("CNCJobObject.plot() --> %s" % str(err))
self.shapes.clear(update=True)
if self.app.use_3d_engine:
self.annotation.clear(update=True)