diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a8d1b20..5135194e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ CHANGELOG for FlatCAM beta - fixed the Subtract sub-tool in the Geometry Editor - added an alternative Subtract sub-tool in the Geometry Editor, one that do not delete the subtracting shapes - added some not-so-good icons for the Subtract Alt sub-tool in Geometry Editor +- minimized the number of tools present in the Tools Toolbar to the bare minimum +- fixed an error in the Follow Tool 12.11.2020 diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index cca5950e..e04d9ded 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -1039,63 +1039,70 @@ class MainGUI(QtWidgets.QMainWindow): # ######################################################################## # ########################## Tools Toolbar# ############################## # ######################################################################## - self.dblsided_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) - self.align_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) - self.extract_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) + self.drill_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling Tool")) + + self.toolbartools.addSeparator() - self.cutout_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) - self.ncc_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool")) - self.paint_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) self.isolation_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool")) self.follow_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow Tool")) - self.drill_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling Tool")) + self.ncc_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool")) + self.paint_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) + self.toolbartools.addSeparator() + self.cutout_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) self.panelize_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/panelize32.png'), _("Panel Tool")) self.film_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/film16.png'), _("Film Tool")) - self.solder_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/solderpastebis32.png'), _("SolderPaste Tool")) - self.sub_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) - self.rules_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/rules32.png'), _("Rules Tool")) - self.optimal_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Optimal Tool")) + self.dblsided_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) self.toolbartools.addSeparator() - self.calculators_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators Tool")) - self.transform_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform Tool")) - self.qrcode_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/qrcode32.png'), _("QRCode Tool")) self.copperfill_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/copperfill32.png'), _("Copper Thieving Tool")) - - self.fiducials_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/fiducials_32.png'), _("Fiducials Tool")) - self.cal_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/calibrate_32.png'), _("Calibration Tool")) - self.punch_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber Tool")) - self.invert_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/invert32.png'), _("Invert Gerber Tool")) self.corners_tool_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Corner Markers Tool")) - self.etch_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/etch_32.png'), _("Etch Compensation Tool")) + self.punch_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber Tool")) + self.calculators_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators Tool")) + + self.toolbartools.addSeparator() + + + # self.solder_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/solderpastebis32.png'), _("SolderPaste Tool")) + # self.sub_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) + # self.rules_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/rules32.png'), _("Rules Tool")) + # self.optimal_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Optimal Tool")) + # self.transform_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform Tool")) + # self.qrcode_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/qrcode32.png'), _("QRCode Tool")) + # self.align_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) + # self.extract_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) + # self.fiducials_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/fiducials_32.png'), _("Fiducials Tool")) + # self.cal_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/calibrate_32.png'), _("Calibration Tool")) + + # self.invert_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/invert32.png'), _("Invert Gerber Tool")) + # self.etch_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/etch_32.png'), _("Etch Compensation Tool")) # ######################################################################## # ########################## Excellon Editor Toolbar# #################### @@ -2214,63 +2221,69 @@ class MainGUI(QtWidgets.QMainWindow): # ######################################################################### # ######################### Tools Toolbar ################################# # ######################################################################### - self.dblsided_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) - self.align_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) - self.extract_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) + self.drill_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling Tool")) + + self.toolbartools.addSeparator() - self.cutout_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) - self.ncc_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool")) - self.paint_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) self.isolation_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool")) self.follow_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow Tool")) - self.drill_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling Tool")) + self.ncc_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool")) + self.paint_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) + self.toolbartools.addSeparator() + self.cutout_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) self.panelize_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/panelize32.png'), _("Panel Tool")) self.film_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/film16.png'), _("Film Tool")) - self.solder_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/solderpastebis32.png'), _("SolderPaste Tool")) - self.sub_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) - self.rules_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/rules32.png'), _("Rules Tool")) - self.optimal_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Optimal Tool")) + self.dblsided_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) self.toolbartools.addSeparator() - self.calculators_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators Tool")) - self.transform_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform Tool")) - self.qrcode_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/qrcode32.png'), _("QRCode Tool")) self.copperfill_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/copperfill32.png'), _("Copper Thieving Tool")) - - self.fiducials_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/fiducials_32.png'), _("Fiducials Tool")) - self.cal_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/calibrate_32.png'), _("Calibration Tool")) - self.punch_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber Tool")) - self.invert_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/invert32.png'), _("Invert Gerber Tool")) self.corners_tool_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Corner Markers Tool")) - self.etch_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/etch_32.png'), _("Etch Compensation Tool")) + self.punch_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber Tool")) + self.calculators_btn = self.toolbartools.addAction( + QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators Tool")) + + self.toolbartools.addSeparator() + + # self.solder_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/solderpastebis32.png'), _("SolderPaste Tool")) + # self.sub_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) + # self.rules_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/rules32.png'), _("Rules Tool")) + # self.optimal_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Optimal Tool")) + # self.transform_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform Tool")) + # self.qrcode_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/qrcode32.png'), _("QRCode Tool")) + # self.align_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) + # self.extract_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) + # self.fiducials_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/fiducials_32.png'), _("Fiducials Tool")) + # self.cal_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/calibrate_32.png'), _("Calibration Tool")) + + # self.invert_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/invert32.png'), _("Invert Gerber Tool")) + # self.etch_btn = self.toolbartools.addAction( + # QtGui.QIcon(self.app.resource_location + '/etch_32.png'), _("Etch Compensation Tool")) # ######################################################################## # ################### Excellon Editor Toolbar ############################ diff --git a/appTools/ToolFollow.py b/appTools/ToolFollow.py index b1737c69..c5f7c5e8 100644 --- a/appTools/ToolFollow.py +++ b/appTools/ToolFollow.py @@ -125,7 +125,7 @@ class ToolFollow(AppTool, Gerber): return "Could not retrieve object: %s with error: %s" % (obj_name, str(e)) if obj is None: - self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Object not found"), str(self.obj_name))) + self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Object not found"), str(obj_name))) return formatted_name = obj_name.rpartition('.')[0] diff --git a/app_Main.py b/app_Main.py index c5ca8d40..c5c178ea 100644 --- a/app_Main.py +++ b/app_Main.py @@ -2151,35 +2151,37 @@ class App(QtCore.QObject): def connect_tools_signals_to_toolbar(self): self.log.debug(" -> Connecting Tools Toolbar Signals") - self.ui.dblsided_btn.triggered.connect(lambda: self.dblsidedtool.run(toggle=True)) - self.ui.cal_btn.triggered.connect(lambda: self.cal_exc_tool.run(toggle=True)) - self.ui.align_btn.triggered.connect(lambda: self.align_objects_tool.run(toggle=True)) - self.ui.extract_btn.triggered.connect(lambda: self.extract_tool.run(toggle=True)) - - self.ui.cutout_btn.triggered.connect(lambda: self.cutout_tool.run(toggle=True)) - self.ui.ncc_btn.triggered.connect(lambda: self.ncclear_tool.run(toggle=True)) - self.ui.paint_btn.triggered.connect(lambda: self.paint_tool.run(toggle=True)) - self.ui.isolation_btn.triggered.connect(lambda: self.isolation_tool.run(toggle=True)) - self.ui.follow_btn.triggered.connect(lambda: self.follow_tool.run(toggle=True)) - self.ui.drill_btn.triggered.connect(lambda: self.drilling_tool.run(toggle=True)) + self.ui.isolation_btn.triggered.connect(lambda: self.isolation_tool.run(toggle=True)) + self.ui.follow_btn.triggered.connect(lambda: self.follow_tool.run(toggle=True)) + self.ui.ncc_btn.triggered.connect(lambda: self.ncclear_tool.run(toggle=True)) + self.ui.paint_btn.triggered.connect(lambda: self.paint_tool.run(toggle=True)) + + self.ui.cutout_btn.triggered.connect(lambda: self.cutout_tool.run(toggle=True)) self.ui.panelize_btn.triggered.connect(lambda: self.panelize_tool.run(toggle=True)) self.ui.film_btn.triggered.connect(lambda: self.film_tool.run(toggle=True)) - self.ui.solder_btn.triggered.connect(lambda: self.paste_tool.run(toggle=True)) - self.ui.sub_btn.triggered.connect(lambda: self.sub_tool.run(toggle=True)) - self.ui.rules_btn.triggered.connect(lambda: self.rules_tool.run(toggle=True)) - self.ui.optimal_btn.triggered.connect(lambda: self.optimal_tool.run(toggle=True)) + self.ui.dblsided_btn.triggered.connect(lambda: self.dblsidedtool.run(toggle=True)) - self.ui.calculators_btn.triggered.connect(lambda: self.calculator_tool.run(toggle=True)) - self.ui.transform_btn.triggered.connect(lambda: self.transform_tool.run(toggle=True)) - self.ui.qrcode_btn.triggered.connect(lambda: self.qrcode_tool.run(toggle=True)) self.ui.copperfill_btn.triggered.connect(lambda: self.copper_thieving_tool.run(toggle=True)) - self.ui.fiducials_btn.triggered.connect(lambda: self.fiducial_tool.run(toggle=True)) - self.ui.punch_btn.triggered.connect(lambda: self.punch_tool.run(toggle=True)) - self.ui.invert_btn.triggered.connect(lambda: self.invert_tool.run(toggle=True)) self.ui.corners_tool_btn.triggered.connect(lambda: self.corners_tool.run(toggle=True)) - self.ui.etch_btn.triggered.connect(lambda: self.etch_tool.run(toggle=True)) + self.ui.punch_btn.triggered.connect(lambda: self.punch_tool.run(toggle=True)) + self.ui.calculators_btn.triggered.connect(lambda: self.calculator_tool.run(toggle=True)) + + # self.ui.cal_btn.triggered.connect(lambda: self.cal_exc_tool.run(toggle=True)) + # self.ui.align_btn.triggered.connect(lambda: self.align_objects_tool.run(toggle=True)) + # self.ui.extract_btn.triggered.connect(lambda: self.extract_tool.run(toggle=True)) + # + # self.ui.solder_btn.triggered.connect(lambda: self.paste_tool.run(toggle=True)) + # self.ui.sub_btn.triggered.connect(lambda: self.sub_tool.run(toggle=True)) + # self.ui.rules_btn.triggered.connect(lambda: self.rules_tool.run(toggle=True)) + # self.ui.optimal_btn.triggered.connect(lambda: self.optimal_tool.run(toggle=True)) + # + # self.ui.transform_btn.triggered.connect(lambda: self.transform_tool.run(toggle=True)) + # self.ui.qrcode_btn.triggered.connect(lambda: self.qrcode_tool.run(toggle=True)) + # self.ui.fiducials_btn.triggered.connect(lambda: self.fiducial_tool.run(toggle=True)) + # self.ui.invert_btn.triggered.connect(lambda: self.invert_tool.run(toggle=True)) + # self.ui.etch_btn.triggered.connect(lambda: self.etch_tool.run(toggle=True)) def connect_editors_toolbar_signals(self): self.log.debug(" -> Connecting Editors Toolbar Signals")