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

- finished the work on file extensions registration with FlatCAM. If the file extensions are deleted in the Preferences -> File Associations then those extensions are unregistered with FlatCAM

Browse Source 
- fixed bug in NCC Tools and in SolderPaste Tool if in Edit -> Preferences only one tool is entered
This commit is contained in:
Marius Stanciu
2019-09-03 22:46:18 +03:00
committed by Marius
parent e8aba2cdb7
commit 241cac8556
4 changed files with 140 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatcamTools/ToolNonCopperClear.py
View File

@@ -1488,7 +1488,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
# Generate area for each tool
offset = sum(sorted_tools)
current_uid = int(1)
tool = eval(self.app.defaults["tools_ncctools"])[0]
try:
tool = eval(self.app.defaults["tools_ncctools"])[0]
except TypeError:
tool = eval(self.app.defaults["tools_ncctools"])
# ###################################################################################################
# Calculate the empty area by subtracting the solid_geometry from the object bounding box geometry ##
@@ -1715,7 +1718,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
cleared_by_last_tool = []
rest_geo = []
current_uid = 1
tool = eval(self.app.defaults["tools_ncctools"])[0]
try:
tool = eval(self.app.defaults["tools_ncctools"])[0]
except TypeError:
tool = eval(self.app.defaults["tools_ncctools"])
# repurposed flag for final object, geo_obj. True if it has any solid_geometry, False if not.
app_obj.poly_not_cleared = True

8
flatcamTools/ToolSolderPaste.py
View File

@@ -1124,7 +1124,7 @@ class SolderPaste(FlatCAMTool):
# some or all the pads are not covered with solder paste
if work_geo:
app_obj.inform.emit(_("[WARNING_NOTCL] Some or all pads have no solder "
"due of inadequate nozzle diameters..."))
"due of inadequate nozzle diameters..."))
return 'fail'
if use_thread:
@@ -1300,11 +1300,11 @@ class SolderPaste(FlatCAMTool):
try:
if obj.special_group != 'solder_paste_tool':
self.app.inform.emit(_("[WARNING_NOTCL] This CNCJob object can't be processed. "
"NOT a solder_paste_tool CNCJob object."))
"NOT a solder_paste_tool CNCJob object."))
return
except AttributeError:
self.app.inform.emit(_("[WARNING_NOTCL] This CNCJob object can't be processed. "
"NOT a solder_paste_tool CNCJob object."))
"NOT a solder_paste_tool CNCJob object."))
return
gcode = '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \
@@ -1356,7 +1356,7 @@ class SolderPaste(FlatCAMTool):
if obj.special_group != 'solder_paste_tool':
self.app.inform.emit(_("[WARNING_NOTCL] This CNCJob object can't be processed. "
"NOT a solder_paste_tool CNCJob object."))
"NOT a solder_paste_tool CNCJob object."))
return
_filter_ = "G-Code Files (*.nc);;G-Code Files (*.txt);;G-Code Files (*.tap);;G-Code Files (*.cnc);;" \