From fa99f9758691a051b972172520b26fac5c9747e2 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 5 Dec 2019 03:14:07 +0200 Subject: [PATCH] - Copper Thieving Tool - added a default value for the mask clearance when generating pattern plating mask --- FlatCAMApp.py | 2 ++ README.md | 1 + flatcamGUI/ObjectUI.py | 6 +++--- flatcamGUI/PreferencesUI.py | 29 ++++++++++++++++++++++++----- flatcamTools/ToolCopperThieving.py | 1 + 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 54efec5e..2503dffa 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -883,6 +883,7 @@ class App(QtCore.QObject): "tools_copper_thieving_lines_spacing": 2.0, "tools_copper_thieving_rb_margin": 1.0, "tools_copper_thieving_rb_thickness": 1.0, + "tools_copper_thieving_mask_clearance": 0.0, # Fiducials Tool "tools_fiducials_dia": 1.0, @@ -1447,6 +1448,7 @@ class App(QtCore.QObject): "tools_copper_thieving_lines_spacing": self.ui.tools2_defaults_form.tools2_cfill_group.lines_spacing_entry, "tools_copper_thieving_rb_margin": self.ui.tools2_defaults_form.tools2_cfill_group.rb_margin_entry, "tools_copper_thieving_rb_thickness": self.ui.tools2_defaults_form.tools2_cfill_group.rb_thickness_entry, + "tools_copper_thieving_mask_clearance": self.ui.tools2_defaults_form.tools2_cfill_group.clearance_ppm_entry, # Fiducials Tool "tools_fiducials_dia": self.ui.tools2_defaults_form.tools2_fiducials_group.dia_entry, diff --git a/README.md b/README.md index d6f5ccb0..56f34570 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing. - in NCC Tool, the new Geometry object that is created on copper clear now has the solid_geometry attribute where the geometry is stored not only in the obj.tools attribute - Copper Thieving Tool - added units label for the pattern plated area - Properties Tool - added a new parameter, the copper area which show the area of the copper features for the Gerber objects +- Copper Thieving Tool - added a default value for the mask clearance when generating pattern plating mask 4.12.2019 diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index 5eecde4b..e81f87ff 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -1443,7 +1443,7 @@ class GeometryObjectUI(ObjectUI): self.grid3.addWidget(self.gendz_entry, 9, 1) # Feedrate X-Y - frlabel = QtWidgets.QLabel('%s:' % _('Feed Rate X-Y')) + frlabel = QtWidgets.QLabel('%s:' % _('Feedrate X-Y')) frlabel.setToolTip( _("Cutting speed in the XY\n" "plane in units per minute") @@ -1457,7 +1457,7 @@ class GeometryObjectUI(ObjectUI): self.grid3.addWidget(self.cncfeedrate_entry, 10, 1) # Feedrate Z (Plunge) - frzlabel = QtWidgets.QLabel('%s:' % _('Feed Rate Z')) + frzlabel = QtWidgets.QLabel('%s:' % _('Feedrate Z')) frzlabel.setToolTip( _("Cutting speed in the XY\n" "plane in units per minute.\n" @@ -1472,7 +1472,7 @@ class GeometryObjectUI(ObjectUI): self.grid3.addWidget(self.cncplunge_entry, 11, 1) # Feedrate rapids - self.fr_rapidlabel = QtWidgets.QLabel('%s:' % _('Feed Rate Rapids')) + self.fr_rapidlabel = QtWidgets.QLabel('%s:' % _('Feedrate Rapids')) self.fr_rapidlabel.setToolTip( _("Cutting speed in the XY plane\n" "(in units per minute).\n" diff --git a/flatcamGUI/PreferencesUI.py b/flatcamGUI/PreferencesUI.py index 352ba876..056d04c4 100644 --- a/flatcamGUI/PreferencesUI.py +++ b/flatcamGUI/PreferencesUI.py @@ -3253,7 +3253,7 @@ class GeometryOptPrefGroupUI(OptionsGroupUI): grid1.addWidget(self.gendz_entry, 6, 1) # Feedrate X-Y - frlabel = QtWidgets.QLabel('%s:' % _('Feed Rate X-Y')) + frlabel = QtWidgets.QLabel('%s:' % _('Feedrate X-Y')) frlabel.setToolTip( _("Cutting speed in the XY\n" "plane in units per minute") @@ -3268,7 +3268,7 @@ class GeometryOptPrefGroupUI(OptionsGroupUI): grid1.addWidget(self.cncfeedrate_entry, 7, 1) # Feedrate Z (Plunge) - frz_label = QtWidgets.QLabel('%s:' % _('Feed Rate Z')) + frz_label = QtWidgets.QLabel('%s:' % _('Feedrate Z')) frz_label.setToolTip( _("Cutting speed in the XY\n" "plane in units per minute.\n" @@ -3373,7 +3373,7 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI): grid1.addWidget(self.gstartz_entry, 2, 1) # Feedrate rapids - fr_rapid_label = QtWidgets.QLabel('%s:' % _('Feed Rate Rapids')) + fr_rapid_label = QtWidgets.QLabel('%s:' % _('Feedrate Rapids')) fr_rapid_label.setToolTip( _("Cutting speed in the XY plane\n" "(in units per minute).\n" @@ -3456,7 +3456,7 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI): grid1.addWidget(self.fplunge_cb, 9, 1) # Size of trace segment on X axis - segx_label = QtWidgets.QLabel('%s:' % _("Seg. X size")) + segx_label = QtWidgets.QLabel('%s:' % _("Segment X size")) segx_label.setToolTip( _("The size of the trace segment on the X axis.\n" "Useful for auto-leveling.\n" @@ -3472,7 +3472,7 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI): grid1.addWidget(self.segx_entry, 10, 1) # Size of trace segment on Y axis - segy_label = QtWidgets.QLabel('%s:' % _("Seg. Y size")) + segy_label = QtWidgets.QLabel('%s:' % _("Segment Y size")) segy_label.setToolTip( _("The size of the trace segment on the Y axis.\n" "Useful for auto-leveling.\n" @@ -6214,6 +6214,25 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI): grid_lay.addWidget(self.rb_thickness_label, 19, 0) grid_lay.addWidget(self.rb_thickness_entry, 19, 1) + self.patern_mask_label = QtWidgets.QLabel('%s' % _('Pattern Plating Mask')) + self.patern_mask_label.setToolTip( + _("Generate a mask for pattern plating.") + ) + grid_lay.addWidget(self.patern_mask_label, 20, 0, 1, 2) + + # Openings CLEARANCE # + self.clearance_ppm_label = QtWidgets.QLabel('%s:' % _("Clearance")) + self.clearance_ppm_label.setToolTip( + _("The distance between the possible copper thieving elements\n" + "and/or robber bar and the actual openings in the mask.") + ) + self.clearance_ppm_entry = FCDoubleSpinner() + self.clearance_ppm_entry.set_range(-9999.9999, 9999.9999) + self.clearance_ppm_entry.set_precision(self.decimals) + self.clearance_ppm_entry.setSingleStep(0.1) + + grid_lay.addWidget(self.clearance_ppm_label, 21, 0) + grid_lay.addWidget(self.clearance_ppm_entry, 21, 1) self.layout.addStretch() diff --git a/flatcamTools/ToolCopperThieving.py b/flatcamTools/ToolCopperThieving.py index efed27f4..7f847c13 100644 --- a/flatcamTools/ToolCopperThieving.py +++ b/flatcamTools/ToolCopperThieving.py @@ -586,6 +586,7 @@ class ToolCopperThieving(FlatCAMTool): self.rb_margin_entry.set_value(self.app.defaults["tools_copper_thieving_rb_margin"]) self.rb_thickness_entry.set_value(self.app.defaults["tools_copper_thieving_rb_thickness"]) + self.clearance_ppm_entry.set_value(self.app.defaults["tools_copper_thieving_mask_clearance"]) # INIT SECTION self.area_method = False