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

- fixed the FlatCAMGerber.merge() function

Browse Source 
- added a new menu entry for the Gerber Join function: Edit -> Conversions -> "Join Gerber(s) to Gerber" allowing joining Gerber objects into a final Gerber object
This commit is contained in:
Marius Stanciu
2019-01-28 02:47:53 +02:00
committed by Marius S
parent 8145ff9aac
commit 37e7c8167d
5 changed files with 210 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flatcamTools/ToolNonCopperClear.py
View File

@@ -263,7 +263,6 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.default_data.update({
"name": '_ncc',
"plot": self.app.defaults["geometry_plot"],
"tooldia": self.app.defaults["geometry_painttooldia"],
"cutz": self.app.defaults["geometry_cutz"],
"vtipdia": 0.1,
"vtipangle": 30,
@@ -283,12 +282,15 @@ class NonCopperClear(FlatCAMTool, Gerber):
"spindlespeed": self.app.defaults["geometry_spindlespeed"],
"toolchangexy": self.app.defaults["geometry_toolchangexy"],
"startz": self.app.defaults["geometry_startz"],
"paintmargin": self.app.defaults["geometry_paintmargin"],
"paintmethod": self.app.defaults["geometry_paintmethod"],
"selectmethod": self.app.defaults["geometry_selectmethod"],
"pathconnect": self.app.defaults["geometry_pathconnect"],
"paintcontour": self.app.defaults["geometry_paintcontour"],
"paintoverlap": self.app.defaults["geometry_paintoverlap"],
"tooldia": self.app.defaults["tools_painttooldia"],
"paintmargin": self.app.defaults["tools_paintmargin"],
"paintmethod": self.app.defaults["tools_paintmethod"],
"selectmethod": self.app.defaults["tools_selectmethod"],
"pathconnect": self.app.defaults["tools_pathconnect"],
"paintcontour": self.app.defaults["tools_paintcontour"],
"paintoverlap": self.app.defaults["tools_paintoverlap"],
"nccoverlap": self.app.defaults["tools_nccoverlap"],
"nccmargin": self.app.defaults["tools_nccmargin"],
"nccmethod": self.app.defaults["tools_nccmethod"],
@@ -298,7 +300,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
})
try:
dias = [float(eval(dia)) for dia in self.app.defaults["gerber_ncctools"].split(",")]
dias = [float(eval(dia)) for dia in self.app.defaults["tools_ncctools"].split(",")]
except:
log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> TOOLS -> NCC Tools.")
return

15
flatcamTools/ToolPaint.py
View File

@@ -250,7 +250,6 @@ class ToolPaint(FlatCAMTool, Gerber):
self.default_data.update({
"name": '_paint',
"plot": self.app.defaults["geometry_plot"],
"tooldia": self.app.defaults["geometry_painttooldia"],
"cutz": self.app.defaults["geometry_cutz"],
"vtipdia": 0.1,
"vtipangle": 30,
@@ -270,12 +269,14 @@ class ToolPaint(FlatCAMTool, Gerber):
"spindlespeed": self.app.defaults["geometry_spindlespeed"],
"toolchangexy": self.app.defaults["geometry_toolchangexy"],
"startz": self.app.defaults["geometry_startz"],
"paintmargin": self.app.defaults["geometry_paintmargin"],
"paintmethod": self.app.defaults["geometry_paintmethod"],
"selectmethod": self.app.defaults["geometry_selectmethod"],
"pathconnect": self.app.defaults["geometry_pathconnect"],
"paintcontour": self.app.defaults["geometry_paintcontour"],
"paintoverlap": self.app.defaults["geometry_paintoverlap"]
"tooldia": self.app.defaults["tools_painttooldia"],
"paintmargin": self.app.defaults["tools_paintmargin"],
"paintmethod": self.app.defaults["tools_paintmethod"],
"selectmethod": self.app.defaults["tools_selectmethod"],
"pathconnect": self.app.defaults["tools_pathconnect"],
"paintcontour": self.app.defaults["tools_paintcontour"],
"paintoverlap": self.app.defaults["tools_paintoverlap"]
})
self.tool_type_item_options = ["C1", "C2", "C3", "C4", "B", "V"]