From 67d31982ef708443216e39f1c9725936634f8fc9 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 22 Nov 2019 04:18:48 +0200 Subject: [PATCH] - Tool Fiducials - added GUI in Preferences and entries in self.defaults dict - Tool Fiducials - updated the source_file object for the modified Gerber files --- FlatCAMApp.py | 23 ++++++- README.md | 5 ++ flatcamGUI/PreferencesUI.py | 116 ++++++++++++++++++++++++++++++++++ flatcamTools/ToolFiducials.py | 18 +++++- 4 files changed, 156 insertions(+), 6 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 03ece838..d4887e14 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -872,6 +872,14 @@ class App(QtCore.QObject): "tools_copper_thieving_lines_size": 0.01, "tools_copper_thieving_lines_spacing": 0.0787402, + # Fiducials Tool + "tools_fiducials_dia": 0.0393701, + "tools_fiducials_margin": 0.0393701, + "tools_fiducials_mode": 'auto', + "tools_fiducials_second_pos": 'up', + "tools_fiducials_type": 'circular', + "tools_fiducials_line_thickness": 0.01, + # Utilities # file associations "fa_excellon": 'drd, drl, exc, ncd, tap, xln', @@ -1416,6 +1424,14 @@ class App(QtCore.QObject): "tools_copper_thieving_lines_size": self.ui.tools2_defaults_form.tools2_cfill_group.line_size_entry, "tools_copper_thieving_lines_spacing": self.ui.tools2_defaults_form.tools2_cfill_group.lines_spacing_entry, + # Fiducials Tool + "tools_fiducials_dia": self.ui.tools2_defaults_form.tools2_fiducials_group.dia_entry, + "tools_fiducials_margin": self.ui.tools2_defaults_form.tools2_fiducials_group.margin_entry, + "tools_fiducials_mode": self.ui.tools2_defaults_form.tools2_fiducials_group.mode_radio, + "tools_fiducials_second_pos": self.ui.tools2_defaults_form.tools2_fiducials_group.pos_radio, + "tools_fiducials_type": self.ui.tools2_defaults_form.tools2_fiducials_group.fid_type_radio, + "tools_fiducials_line_thickness": self.ui.tools2_defaults_form.tools2_fiducials_group.line_thickness_entry, + # Utilities # File associations "fa_excellon": self.ui.util_defaults_form.fa_excellon_group.exc_list_text, @@ -5564,8 +5580,9 @@ class App(QtCore.QObject): "tools_solderpaste_frz", "tools_solderpaste_frz_dispense", "tools_cr_trace_size_val", "tools_cr_c2c_val", "tools_cr_c2o_val", "tools_cr_s2s_val", "tools_cr_s2sm_val", "tools_cr_s2o_val", "tools_cr_sm2sm_val", "tools_cr_ri_val", - "tools_cr_h2h_val", "tools_cr_dh_val", - + "tools_cr_h2h_val", "tools_cr_dh_val", "tools_fiducials_dia", "tools_fiducials_margin", + "tools_fiducials_mode", "tools_fiducials_second_pos", "tools_fiducials_type", + "tools_fiducials_line_thickness", 'global_gridx', 'global_gridy', 'global_snap_max', "global_tolerance"] def scale_defaults(sfactor): @@ -9689,7 +9706,7 @@ class App(QtCore.QObject): else: try: file = StringIO(obj.source_file) - except AttributeError: + except (AttributeError, TypeError): self.inform.emit('[WARNING_NOTCL] %s' % _("There is no selected object for which to see it's source file code.")) return 'fail' diff --git a/README.md b/README.md index 0e7e105b..f5ae1a93 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing. ================================================= +22.11.2019 + +- Tool Fiducials - added GUI in Preferences and entries in self.defaults dict +- Tool Fiducials - updated the source_file object for the modified Gerber files + 21.11.2019 - Tool Fiducials - finished the part with adding copper fiducials: manual and auto diff --git a/flatcamGUI/PreferencesUI.py b/flatcamGUI/PreferencesUI.py index 7bffccbe..05f8397c 100644 --- a/flatcamGUI/PreferencesUI.py +++ b/flatcamGUI/PreferencesUI.py @@ -228,6 +228,9 @@ class Tools2PreferencesUI(QtWidgets.QWidget): self.tools2_cfill_group = Tools2CThievingPrefGroupUI() self.tools2_cfill_group.setMinimumWidth(220) + self.tools2_fiducials_group = Tools2FiducialsPrefGroupUI() + self.tools2_fiducials_group.setMinimumWidth(220) + self.vlay = QtWidgets.QVBoxLayout() self.vlay.addWidget(self.tools2_checkrules_group) self.vlay.addWidget(self.tools2_optimal_group) @@ -239,6 +242,7 @@ class Tools2PreferencesUI(QtWidgets.QWidget): self.vlay2.addWidget(self.tools2_cfill_group) self.vlay3 = QtWidgets.QVBoxLayout() + self.vlay3.addWidget(self.tools2_fiducials_group) self.layout.addLayout(self.vlay) self.layout.addLayout(self.vlay1) @@ -5920,6 +5924,118 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI): self.layout.addStretch() +class Tools2FiducialsPrefGroupUI(OptionsGroupUI): + def __init__(self, parent=None): + + super(Tools2FiducialsPrefGroupUI, self).__init__(self) + + self.setTitle(str(_("Copper Thieving Tool Options"))) + self.decimals = 4 + + # ## 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) + + # DIAMETER # + self.dia_label = QtWidgets.QLabel('%s:' % _("Diameter")) + self.dia_label.setToolTip( + _("This set the fiducial diameter.\n" + "The soldermask opening is double than that.") + ) + self.dia_entry = FCDoubleSpinner() + self.dia_entry.set_range(1.0000, 3.0000) + self.dia_entry.set_precision(self.decimals) + self.dia_entry.setWrapping(True) + self.dia_entry.setSingleStep(0.1) + + grid_lay.addWidget(self.dia_label, 1, 0) + grid_lay.addWidget(self.dia_entry, 1, 1) + + # MARGIN # + self.margin_label = QtWidgets.QLabel('%s:' % _("Margin")) + self.margin_label.setToolTip( + _("Bounding box margin.") + ) + self.margin_entry = FCDoubleSpinner() + self.margin_entry.set_range(-9999.9999, 9999.9999) + self.margin_entry.set_precision(self.decimals) + self.margin_entry.setSingleStep(0.1) + + grid_lay.addWidget(self.margin_label, 2, 0) + grid_lay.addWidget(self.margin_entry, 2, 1) + + # Mode # + self.mode_radio = RadioSet([ + {'label': _('Auto'), 'value': 'auto'}, + {"label": _("Manual"), "value": "manual"} + ], stretch=False) + self.mode_label = QtWidgets.QLabel(_("Mode:")) + self.mode_label.setToolTip( + _("- 'Auto' - automatic placement of fiducials in the corners of the bounding box.\n " + "- 'Manual' - manual placement of fiducials.") + ) + grid_lay.addWidget(self.mode_label, 3, 0) + grid_lay.addWidget(self.mode_radio, 3, 1) + + # Position for second fiducial # + self.pos_radio = RadioSet([ + {'label': _('Up'), 'value': 'up'}, + {"label": _("Down"), "value": "down"}, + {"label": _("None"), "value": "no"} + ], stretch=False) + self.pos_label = QtWidgets.QLabel('%s:' % _("Second fiducial")) + self.pos_label.setToolTip( + _("The position for the second fiducial.\n" + "- 'Up' - the order is: bottom-left, top-left, top-right.\n " + "- 'Down' - the order is: bottom-left, bottom-right, top-right.\n" + "- 'None' - there is no second fiducial. The order is: bottom-left, top-right.") + ) + grid_lay.addWidget(self.pos_label, 4, 0) + grid_lay.addWidget(self.pos_radio, 4, 1) + + separator_line = QtWidgets.QFrame() + separator_line.setFrameShape(QtWidgets.QFrame.HLine) + separator_line.setFrameShadow(QtWidgets.QFrame.Sunken) + grid_lay.addWidget(separator_line, 5, 0, 1, 2) + + # Fiducial type # + self.fid_type_radio = RadioSet([ + {'label': _('Circular'), 'value': 'circular'}, + {"label": _("Cross"), "value": "cross"} + ], stretch=False) + self.fid_type_label = QtWidgets.QLabel('%s:' % _("Fiducial Type")) + self.fid_type_label.setToolTip( + _("The type of fiducial.\n" + "- 'Circular' - this is the regular fiducial.\n " + "- 'Cross' - non-standard fiducial.") + ) + grid_lay.addWidget(self.fid_type_label, 6, 0) + grid_lay.addWidget(self.fid_type_radio, 6, 1) + + # Line Thickness # + self.line_thickness_label = QtWidgets.QLabel('%s:' % _("Line thickness")) + self.line_thickness_label.setToolTip( + _("Bounding box margin.") + ) + self.line_thickness_entry = FCDoubleSpinner() + self.line_thickness_entry.set_range(0.00001, 9999.9999) + self.line_thickness_entry.set_precision(self.decimals) + self.line_thickness_entry.setSingleStep(0.1) + + grid_lay.addWidget(self.line_thickness_label, 7, 0) + grid_lay.addWidget(self.line_thickness_entry, 7, 1) + + self.layout.addStretch() + + class FAExcPrefGroupUI(OptionsGroupUI): def __init__(self, parent=None): # OptionsGroupUI.__init__(self, "Excellon File associations Preferences", parent=None) diff --git a/flatcamTools/ToolFiducials.py b/flatcamTools/ToolFiducials.py index a3a82b4a..f0cd3b8a 100644 --- a/flatcamTools/ToolFiducials.py +++ b/flatcamTools/ToolFiducials.py @@ -368,9 +368,13 @@ class ToolFiducials(FlatCAMTool): def set_tool_ui(self): self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value() - # self.mode_radio.set_value(float(self.app.defaults["tools_fiducials_mode"])) - # self.margin_entry.set_value(float(self.app.defaults["tools_fiducials_margin"])) - # self.dia_entry.set_value(self.app.defaults["tools_fiducials_dia"]) + self.dia_entry.set_value(self.app.defaults["tools_fiducials_dia"]) + self.margin_entry.set_value(float(self.app.defaults["tools_fiducials_margin"])) + self.mode_radio.set_value(self.app.defaults["tools_fiducials_mode"]) + self.pos_radio.set_value(self.app.defaults["tools_fiducials_second_pos"]) + self.fid_type_radio.set_value(self.app.defaults["tools_fiducials_type"]) + self.line_thickness_entry.set_value(float(self.app.defaults["tools_fiducials_line_thickness"])) + self.click_points = list() self.bottom_left_coords_entry.set_value('') self.top_right_coords_entry.set_value('') @@ -471,6 +475,9 @@ class ToolFiducials(FlatCAMTool): self.sec_points_coords_entry.set_value('(%.*f, %.*f)' % (self.decimals, x1, self.decimals, y0)) self.add_fiducials_geo(self.click_points, g_obj=self.grb_object, fid_type=fid_type) + self.grb_object.source_file = self.app.export_gerber(obj_name=self.grb_object.options['name'], + filename=None, + local_use=self.grb_object, use_thread=False) self.on_exit() else: self.app.inform.emit(_("Click to add first Fiducial. Bottom Left...")) @@ -634,6 +641,8 @@ class ToolFiducials(FlatCAMTool): self.sm_obj_set.add(self.sm_object.options['name']) self.add_fiducials_geo(self.click_points, g_obj=self.sm_object, fid_size=sm_opening_dia, fid_type='circular') + self.sm_object.source_file = self.app.export_gerber(obj_name=self.sm_object.options['name'], filename=None, + local_use=self.sm_object, use_thread=False) self.on_exit() def on_mouse_release(self, event): @@ -679,6 +688,9 @@ class ToolFiducials(FlatCAMTool): self.sec_points_coords_entry.set_value(self.click_points[2]) self.app.inform.emit('[success] %s' % _("Done. All fiducials have been added.")) self.add_fiducials_geo(self.click_points, g_obj=self.grb_object, fid_type=fid_type) + self.grb_object.source_file = self.app.export_gerber(obj_name=self.grb_object.options['name'], + filename=None, + local_use=self.grb_object, use_thread=False) self.on_exit() def on_mouse_move(self, event):