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

- remade the EDIT -> PREFERENCES window, the Excellon and Gerber sections. Created a new section named TOOLS

Browse Source
This commit is contained in:
Marius Stanciu
2019-01-27 15:46:54 +02:00
committed by Marius S
parent 90ec8b3899
commit ad69be0456
5 changed files with 382 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flatcamTools/ToolCutout.py
View File

@@ -146,8 +146,8 @@ class ToolCutout(FlatCAMTool):
"- one gap Left / one gap Right\n"
"- one gap on each of the 4 sides."
)
self.gaps_rect_radio = RadioSet([{'label': 'T/B', 'value': 'tb'},
{'label': 'L/R', 'value': 'lr'},
self.gaps_rect_radio = RadioSet([{'label': '2(T/B)', 'value': 'tb'},
{'label': '2(L/R)', 'value': 'lr'},
{'label': '4', 'value': '4'}])
form_layout_3.addRow(gapslabel_rect, self.gaps_rect_radio)
@@ -186,11 +186,19 @@ class ToolCutout(FlatCAMTool):
def run(self):
FlatCAMTool.run(self)
self.set_ui()
self.app.ui.notebook.setTabText(2, "Cutout Tool")
def install(self, icon=None, separator=None, **kwargs):
FlatCAMTool.install(self, icon, separator, shortcut='ALT+U', **kwargs)
def set_ui(self):
self.dia.set_value(float(self.app.defaults["tools_cutouttooldia"]))
self.margin.set_value(float(self.app.defaults["tools_cutoutmargin"]))
self.gapsize.set_value(float(self.app.defaults["tools_cutoutgapsize"]))
self.gaps.set_value(4)
self.gaps_rect_radio.set_value(str(self.app.defaults["tools_gaps_rect"]))
def on_freeform_cutout(self):
def subtract_rectangle(obj_, x0, y0, x1, y1):

38
flatcamTools/ToolNonCopperClear.py
View File

@@ -244,12 +244,12 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.app.ui.notebook.setTabText(2, "NCC Tool")
def set_ui(self):
self.ncc_overlap_entry.set_value(self.app.defaults["gerber_nccoverlap"])
self.ncc_margin_entry.set_value(self.app.defaults["gerber_nccmargin"])
self.ncc_method_radio.set_value(self.app.defaults["gerber_nccmethod"])
self.ncc_connect_cb.set_value(self.app.defaults["gerber_nccconnect"])
self.ncc_contour_cb.set_value(self.app.defaults["gerber_ncccontour"])
self.ncc_rest_cb.set_value(self.app.defaults["gerber_nccrest"])
self.ncc_overlap_entry.set_value(self.app.defaults["tools_nccoverlap"])
self.ncc_margin_entry.set_value(self.app.defaults["tools_nccmargin"])
self.ncc_method_radio.set_value(self.app.defaults["tools_nccmethod"])
self.ncc_connect_cb.set_value(self.app.defaults["tools_nccconnect"])
self.ncc_contour_cb.set_value(self.app.defaults["tools_ncccontour"])
self.ncc_rest_cb.set_value(self.app.defaults["tools_nccrest"])
self.tools_table.setupContextMenu()
self.tools_table.addContextMenu(
@@ -289,18 +289,18 @@ class NonCopperClear(FlatCAMTool, Gerber):
"pathconnect": self.app.defaults["geometry_pathconnect"],
"paintcontour": self.app.defaults["geometry_paintcontour"],
"paintoverlap": self.app.defaults["geometry_paintoverlap"],
"nccoverlap": self.app.defaults["gerber_nccoverlap"],
"nccmargin": self.app.defaults["gerber_nccmargin"],
"nccmethod": self.app.defaults["gerber_nccmethod"],
"nccconnect": self.app.defaults["gerber_nccconnect"],
"ncccontour": self.app.defaults["gerber_ncccontour"],
"nccrest": self.app.defaults["gerber_nccrest"]
"nccoverlap": self.app.defaults["tools_nccoverlap"],
"nccmargin": self.app.defaults["tools_nccmargin"],
"nccmethod": self.app.defaults["tools_nccmethod"],
"nccconnect": self.app.defaults["tools_nccconnect"],
"ncccontour": self.app.defaults["tools_ncccontour"],
"nccrest": self.app.defaults["tools_nccrest"]
})
try:
dias = [float(eval(dia)) for dia in self.app.defaults["gerber_ncctools"].split(",")]
except:
log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> Gerber Object -> NCC Tools.")
log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> TOOLS -> NCC Tools.")
return
self.tooluid = 0
@@ -550,22 +550,22 @@ class NonCopperClear(FlatCAMTool, Gerber):
def on_ncc(self):
over = self.ncc_overlap_entry.get_value()
over = over if over else self.app.defaults["gerber_nccoverlap"]
over = over if over else self.app.defaults["tools_nccoverlap"]
margin = self.ncc_margin_entry.get_value()
margin = margin if margin else self.app.defaults["gerber_nccmargin"]
margin = margin if margin else self.app.defaults["tools_nccmargin"]
connect = self.ncc_connect_cb.get_value()
connect = connect if connect else self.app.defaults["gerber_nccconnect"]
connect = connect if connect else self.app.defaults["tools_nccconnect"]
contour = self.ncc_contour_cb.get_value()
contour = contour if contour else self.app.defaults["gerber_ncccontour"]
contour = contour if contour else self.app.defaults["tools_ncccontour"]
clearing_method = self.ncc_rest_cb.get_value()
clearing_method = clearing_method if clearing_method else self.app.defaults["gerber_nccrest"]
clearing_method = clearing_method if clearing_method else self.app.defaults["tools_nccrest"]
pol_method = self.ncc_method_radio.get_value()
pol_method = pol_method if pol_method else self.app.defaults["gerber_nccmethod"]
pol_method = pol_method if pol_method else self.app.defaults["tools_nccmethod"]
self.obj_name = self.object_combo.currentText()
# Get source object.