diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 05c2a850..63504639 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -1592,6 +1592,20 @@ class App(QtCore.QObject):
"tools_cal_toolchange_xy": self.ui.tools2_defaults_form.tools2_cal_group.toolchange_xy_entry,
"tools_cal_sec_point": self.ui.tools2_defaults_form.tools2_cal_group.second_point_radio,
+ # Extract Drills Tool
+ "tools_edrills_hole_type": self.ui.tools2_defaults_form.tools2_edrills_group.hole_size_radio,
+ "tools_edrills_hole_fixed_dia": self.ui.tools2_defaults_form.tools2_edrills_group.dia_entry,
+ "tools_edrills_circular_ring": self.ui.tools2_defaults_form.tools2_edrills_group.circular_ring_entry,
+ "tools_edrills_oblong_ring": self.ui.tools2_defaults_form.tools2_edrills_group.oblong_ring_entry,
+ "tools_edrills_square_ring": self.ui.tools2_defaults_form.tools2_edrills_group.square_ring_entry,
+ "tools_edrills_rectangular_ring": self.ui.tools2_defaults_form.tools2_edrills_group.rectangular_ring_entry,
+ "tools_edrills_others_ring": self.ui.tools2_defaults_form.tools2_edrills_group.other_ring_entry,
+ "tools_edrills_circular": self.ui.tools2_defaults_form.tools2_edrills_group.circular_cb,
+ "tools_edrills_oblong": self.ui.tools2_defaults_form.tools2_edrills_group.oblong_cb,
+ "tools_edrills_square": self.ui.tools2_defaults_form.tools2_edrills_group.square_cb,
+ "tools_edrills_rectangular": self.ui.tools2_defaults_form.tools2_edrills_group.rectangular_cb,
+ "tools_edrills_others": self.ui.tools2_defaults_form.tools2_edrills_group.other_cb,
+
# Utilities
# File associations
"fa_excellon": self.ui.util_defaults_form.fa_excellon_group.exc_list_text,
diff --git a/README.md b/README.md
index 19a3cfa8..afbc0e06 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ CAD program, and create G-Code for Isolation routing.
- fixed an issue in the Distance Tool
- expanded the Extract Drills Tool to use a particular annular ring for each type of aperture flash (pad)
+- Extract Drills Tool: fixed issue with oblong pads and with pads made from aperture macros
+- Extract Drills Tool: added controls in Edit -> Preferences
10.02.2020
diff --git a/flatcamGUI/PreferencesUI.py b/flatcamGUI/PreferencesUI.py
index b84a514b..a073b534 100644
--- a/flatcamGUI/PreferencesUI.py
+++ b/flatcamGUI/PreferencesUI.py
@@ -242,19 +242,23 @@ class Tools2PreferencesUI(QtWidgets.QWidget):
self.tools2_cal_group = Tools2CalPrefGroupUI(decimals=self.decimals)
self.tools2_cal_group.setMinimumWidth(220)
+ self.tools2_edrills_group = Tools2EDrillsPrefGroupUI(decimals=self.decimals)
+ self.tools2_edrills_group.setMinimumWidth(220)
+
self.vlay = QtWidgets.QVBoxLayout()
self.vlay.addWidget(self.tools2_checkrules_group)
self.vlay.addWidget(self.tools2_optimal_group)
self.vlay1 = QtWidgets.QVBoxLayout()
self.vlay1.addWidget(self.tools2_qrcode_group)
+ self.vlay1.addWidget(self.tools2_fiducials_group)
self.vlay2 = QtWidgets.QVBoxLayout()
self.vlay2.addWidget(self.tools2_cfill_group)
self.vlay3 = QtWidgets.QVBoxLayout()
- self.vlay3.addWidget(self.tools2_fiducials_group)
self.vlay3.addWidget(self.tools2_cal_group)
+ self.vlay3.addWidget(self.tools2_edrills_group)
self.layout.addLayout(self.vlay)
self.layout.addLayout(self.vlay1)
@@ -7618,6 +7622,190 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
self.layout.addStretch()
+class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
+ def __init__(self, decimals=4, parent=None):
+
+ super(Tools2EDrillsPrefGroupUI, self).__init__(self)
+
+ self.setTitle(str(_("Extract Drills Options")))
+ self.decimals = decimals
+
+ # ## Grid Layout
+ grid_lay = QtWidgets.QGridLayout()
+ self.layout.addLayout(grid_lay)
+ grid_lay.setColumnStretch(0, 0)
+ grid_lay.setColumnStretch(1, 1)
+
+ self.param_label = QtWidgets.QLabel('%s:' % _('Parameters'))
+ self.param_label.setToolTip(
+ _("Parameters used for this tool.")
+ )
+ grid_lay.addWidget(self.param_label, 0, 0, 1, 2)
+
+ self.padt_label = QtWidgets.QLabel("%s:" % _("Processed Pads Type"))
+ self.padt_label.setToolTip(
+ _("The type of pads shape to be processed.\n"
+ "If the PCB has many SMD pads with rectangular pads,\n"
+ "disable the Rectangular aperture.")
+ )
+
+ grid_lay.addWidget(self.padt_label, 2, 0, 1, 2)
+
+ # Circular Aperture Selection
+ self.circular_cb = FCCheckBox('%s' % _("Circular"))
+ self.circular_cb.setToolTip(
+ _("Create drills from circular pads.")
+ )
+
+ grid_lay.addWidget(self.circular_cb, 3, 0, 1, 2)
+
+ # Oblong Aperture Selection
+ self.oblong_cb = FCCheckBox('%s' % _("Oblong"))
+ self.oblong_cb.setToolTip(
+ _("Create drills from oblong pads.")
+ )
+
+ grid_lay.addWidget(self.oblong_cb, 4, 0, 1, 2)
+
+ # Square Aperture Selection
+ self.square_cb = FCCheckBox('%s' % _("Square"))
+ self.square_cb.setToolTip(
+ _("Create drills from square pads.")
+ )
+
+ grid_lay.addWidget(self.square_cb, 5, 0, 1, 2)
+
+ # Rectangular Aperture Selection
+ self.rectangular_cb = FCCheckBox('%s' % _("Rectangular"))
+ self.rectangular_cb.setToolTip(
+ _("Create drills from rectangular pads.")
+ )
+
+ grid_lay.addWidget(self.rectangular_cb, 6, 0, 1, 2)
+
+ # Others type of Apertures Selection
+ self.other_cb = FCCheckBox('%s' % _("Others"))
+ self.other_cb.setToolTip(
+ _("Create drills from other types of pad shape.")
+ )
+
+ grid_lay.addWidget(self.other_cb, 7, 0, 1, 2)
+
+ separator_line = QtWidgets.QFrame()
+ separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+ separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+ grid_lay.addWidget(separator_line, 8, 0, 1, 2)
+
+ # ## Axis
+ self.hole_size_radio = RadioSet([{'label': _("Fixed"), 'value': 'fixed'},
+ {'label': _("Proportional"), 'value': 'prop'}])
+ self.hole_size_label = QtWidgets.QLabel('%s:' % _("Hole Size"))
+ self.hole_size_label.setToolTip(
+ _("The type of hole size. Can be:\n"
+ "- Fixed -> all holes will have a set size\n"
+ "- Proprotional -> each hole will havea a variable size\n"
+ "such as to preserve a set annular ring"))
+
+ grid_lay.addWidget(self.hole_size_label, 9, 0)
+ grid_lay.addWidget(self.hole_size_radio, 9, 1)
+
+ # grid_lay1.addWidget(QtWidgets.QLabel(''))
+
+ separator_line = QtWidgets.QFrame()
+ separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+ separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+ grid_lay.addWidget(separator_line, 10, 0, 1, 2)
+
+ # Diameter value
+ self.dia_entry = FCDoubleSpinner()
+ self.dia_entry.set_precision(self.decimals)
+ self.dia_entry.set_range(0.0000, 9999.9999)
+
+ self.dia_label = QtWidgets.QLabel('%s:' % _("Diameter"))
+ self.dia_label.setToolTip(
+ _("Fixed hole diameter.")
+ )
+
+ grid_lay.addWidget(self.dia_label, 11, 0)
+ grid_lay.addWidget(self.dia_entry, 11, 1)
+
+ # Annular Ring value
+ self.ring_label = QtWidgets.QLabel('%s' % _("Annular Ring"))
+ self.ring_label.setToolTip(
+ _("The size of annular ring.\n"
+ "The copper sliver between the drill hole exterior\n"
+ "and the margin of the copper pad.")
+ )
+ grid_lay.addWidget(self.ring_label, 12, 0, 1, 2)
+
+ # Circular Annular Ring Value
+ self.circular_ring_label = QtWidgets.QLabel('%s:' % _("Circular"))
+ self.circular_ring_label.setToolTip(
+ _("The size of annular ring for circular pads.")
+ )
+
+ self.circular_ring_entry = FCDoubleSpinner()
+ self.circular_ring_entry.set_precision(self.decimals)
+ self.circular_ring_entry.set_range(0.0000, 9999.9999)
+
+ grid_lay.addWidget(self.circular_ring_label, 13, 0)
+ grid_lay.addWidget(self.circular_ring_entry, 13, 1)
+
+ # Oblong Annular Ring Value
+ self.oblong_ring_label = QtWidgets.QLabel('%s:' % _("Oblong"))
+ self.oblong_ring_label.setToolTip(
+ _("The size of annular ring for oblong pads.")
+ )
+
+ self.oblong_ring_entry = FCDoubleSpinner()
+ self.oblong_ring_entry.set_precision(self.decimals)
+ self.oblong_ring_entry.set_range(0.0000, 9999.9999)
+
+ grid_lay.addWidget(self.oblong_ring_label, 14, 0)
+ grid_lay.addWidget(self.oblong_ring_entry, 14, 1)
+
+ # Square Annular Ring Value
+ self.square_ring_label = QtWidgets.QLabel('%s:' % _("Square"))
+ self.square_ring_label.setToolTip(
+ _("The size of annular ring for square pads.")
+ )
+
+ self.square_ring_entry = FCDoubleSpinner()
+ self.square_ring_entry.set_precision(self.decimals)
+ self.square_ring_entry.set_range(0.0000, 9999.9999)
+
+ grid_lay.addWidget(self.square_ring_label, 15, 0)
+ grid_lay.addWidget(self.square_ring_entry, 15, 1)
+
+ # Rectangular Annular Ring Value
+ self.rectangular_ring_label = QtWidgets.QLabel('%s:' % _("Rectangular"))
+ self.rectangular_ring_label.setToolTip(
+ _("The size of annular ring for rectangular pads.")
+ )
+
+ self.rectangular_ring_entry = FCDoubleSpinner()
+ self.rectangular_ring_entry.set_precision(self.decimals)
+ self.rectangular_ring_entry.set_range(0.0000, 9999.9999)
+
+ grid_lay.addWidget(self.rectangular_ring_label, 16, 0)
+ grid_lay.addWidget(self.rectangular_ring_entry, 16, 1)
+
+ # Others Annular Ring Value
+ self.other_ring_label = QtWidgets.QLabel('%s:' % _("Others"))
+ self.other_ring_label.setToolTip(
+ _("The size of annular ring for other pads.")
+ )
+
+ self.other_ring_entry = FCDoubleSpinner()
+ self.other_ring_entry.set_precision(self.decimals)
+ self.other_ring_entry.set_range(0.0000, 9999.9999)
+
+ grid_lay.addWidget(self.other_ring_label, 17, 0)
+ grid_lay.addWidget(self.other_ring_entry, 17, 1)
+
+ self.layout.addStretch()
+
+
class FAExcPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Excellon File associations Preferences", parent=None)
diff --git a/flatcamTools/ToolExtractDrills.py b/flatcamTools/ToolExtractDrills.py
index fa50ecc8..c0300549 100644
--- a/flatcamTools/ToolExtractDrills.py
+++ b/flatcamTools/ToolExtractDrills.py
@@ -59,7 +59,7 @@ class ToolExtractDrills(FlatCAMTool):
grid_lay.addWidget(self.grb_label, 0, 0, 1, 2)
grid_lay.addWidget(self.gerber_object_combo, 1, 0, 1, 2)
- self.padt_label = QtWidgets.QLabel("%s:" % _("Processed Pads Type"))
+ self.padt_label = QtWidgets.QLabel("%s" % _("Processed Pads Type"))
self.padt_label.setToolTip(
_("The type of pads shape to be processed.\n"
"If the PCB has many SMD pads with rectangular pads,\n"
@@ -424,7 +424,15 @@ class ToolExtractDrills(FlatCAMTool):
if ap_type == 'C':
if self.circular_cb.get_value():
dia = float(apid_value['size']) - (2 * circ_r_val)
- elif ap_type == 'R' or ap_type == 'O':
+ elif ap_type == 'O':
+ width = float(apid_value['width'])
+ height = float(apid_value['height'])
+ if self.oblong_cb.get_value():
+ if width > height:
+ dia = float(apid_value['height']) - (2 * rect_r_val)
+ else:
+ dia = float(apid_value['width']) - (2 * rect_r_val)
+ elif ap_type == 'R':
width = float(apid_value['width'])
height = float(apid_value['height'])
@@ -441,9 +449,20 @@ class ToolExtractDrills(FlatCAMTool):
dia = float(apid_value['width']) - (2 * rect_r_val)
else:
if self.other_cb.get_value():
- dia = float(apid_value['size']) - (2 * other_r_val)
+ try:
+ dia = float(apid_value['size']) - (2 * other_r_val)
+ except KeyError:
+ if ap_type == 'AM':
+ pol = apid_value['geometry'][0]['solid']
+ x0, y0, x1, y1 = pol.bounds
+ dx = x1 - x0
+ dy = y1 - y0
+ if dx <= dy:
+ dia = dx - (2 * other_r_val)
+ else:
+ dia = dy - (2 * other_r_val)
- # if dia is None then none of the above applied so we skip th e following
+ # if dia is None then none of the above applied so we skip the following
if dia is None:
continue