From d92750d124345a2ac63c621c619619d34bf5a2a0 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 16 Apr 2019 15:27:51 +0300 Subject: [PATCH] - added ability to use ENTER key to finish tool adding in Editors, NCC Tool, Paint Tool and SolderPaste Tool. --- FlatCAMObj.py | 2 ++ README.md | 4 ++++ flatcamEditors/FlatCAMExcEditor.py | 2 +- flatcamEditors/FlatCAMGrbEditor.py | 5 ++++- flatcamGUI/ObjectUI.py | 2 +- flatcamTools/ToolNonCopperClear.py | 3 ++- flatcamTools/ToolPaint.py | 3 ++- flatcamTools/ToolSolderPaste.py | 5 +++-- 8 files changed, 19 insertions(+), 7 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 83678a70..fcb955dc 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -3032,6 +3032,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click) self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=False)) self.ui.pp_geometry_name_cb.activated.connect(self.on_pp_changed) + self.ui.addtool_entry.returnPressed.connect(lambda: self.on_tool_add()) def set_tool_offset_visibility(self, current_row): if current_row is None: @@ -3107,6 +3108,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): # I use lambda's because the connected functions have parameters that could be used in certain scenarios self.ui.addtool_btn.clicked.connect(lambda: self.on_tool_add()) + self.ui.copytool_btn.clicked.connect(lambda: self.on_tool_copy()) self.ui.deltool_btn.clicked.connect(lambda: self.on_tool_delete()) diff --git a/README.md b/README.md index a73e875c..2e9f41a4 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +16.04.2019 + +- added ability to use ENTER key to finish tool adding in Editors, NCC Tool, Paint Tool and SolderPaste Tool. + 15.04.2019 - working on a new tool to process automatically PcbWizard Excellon files which are generated in 2 files diff --git a/flatcamEditors/FlatCAMExcEditor.py b/flatcamEditors/FlatCAMExcEditor.py index 89e23a51..c75ea1a2 100644 --- a/flatcamEditors/FlatCAMExcEditor.py +++ b/flatcamEditors/FlatCAMExcEditor.py @@ -1020,7 +1020,7 @@ class FlatCAMExcEditor(QtCore.QObject): self.app.ui.delete_drill_btn.triggered.connect(self.on_delete_btn) self.name_entry.returnPressed.connect(self.on_name_activate) self.addtool_btn.clicked.connect(self.on_tool_add) - # self.addtool_entry.editingFinished.connect(self.on_tool_add) + self.addtool_entry.returnPressed.connect(self.on_tool_add) self.deltool_btn.clicked.connect(self.on_tool_delete) # self.tools_table_exc.selectionModel().currentChanged.connect(self.on_row_selected) self.tools_table_exc.cellPressed.connect(self.on_row_selected) diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/flatcamEditors/FlatCAMGrbEditor.py index d94ebb9d..06cafa3e 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/flatcamEditors/FlatCAMGrbEditor.py @@ -1084,7 +1084,7 @@ class FlatCAMGrbEditor(QtCore.QObject): ) grid1.addWidget(self.apdim_lbl, 4, 0) - self.apdim_entry = EvalEntry() + self.apdim_entry = EvalEntry2() grid1.addWidget(self.apdim_entry, 4, 1) apadd_lbl = QtWidgets.QLabel('%s' % _('Add Aperture:')) @@ -1466,6 +1466,9 @@ class FlatCAMGrbEditor(QtCore.QObject): self.aptype_cb.currentIndexChanged[str].connect(self.on_aptype_changed) self.addaperture_btn.clicked.connect(self.on_aperture_add) + self.apsize_entry.returnPressed.connect(self.on_aperture_add) + self.apdim_entry.returnPressed.connect(self.on_aperture_add) + self.delaperture_btn.clicked.connect(self.on_aperture_delete) self.apertures_table.cellPressed.connect(self.on_row_selected) diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index 72391d8e..d5cbac25 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -975,7 +975,7 @@ class GeometryObjectUI(ObjectUI): "Diameter for the new tool" ) ) - self.addtool_entry = FCEntry() + self.addtool_entry = FCEntry2() # hlay.addWidget(self.addtool_label) # hlay.addStretch() diff --git a/flatcamTools/ToolNonCopperClear.py b/flatcamTools/ToolNonCopperClear.py index 4b7ee0de..a29bc229 100644 --- a/flatcamTools/ToolNonCopperClear.py +++ b/flatcamTools/ToolNonCopperClear.py @@ -121,7 +121,7 @@ class NonCopperClear(FlatCAMTool, Gerber): self.addtool_entry_lbl.setToolTip( _("Diameter for the new tool to add in the Tool Table") ) - self.addtool_entry = FCEntry() + self.addtool_entry = FCEntry2() # hlay.addWidget(self.addtool_label) # hlay.addStretch() @@ -254,6 +254,7 @@ class NonCopperClear(FlatCAMTool, Gerber): self.tools_box.addStretch() self.addtool_btn.clicked.connect(self.on_tool_add) + self.addtool_entry.returnPressed.connect(self.on_tool_add) self.deltool_btn.clicked.connect(self.on_tool_delete) self.generate_ncc_button.clicked.connect(self.on_ncc) diff --git a/flatcamTools/ToolPaint.py b/flatcamTools/ToolPaint.py index c6aff23c..4e3c1e8a 100644 --- a/flatcamTools/ToolPaint.py +++ b/flatcamTools/ToolPaint.py @@ -118,7 +118,7 @@ class ToolPaint(FlatCAMTool, Gerber): self.addtool_entry_lbl.setToolTip( _("Diameter for the new tool.") ) - self.addtool_entry = FCEntry() + self.addtool_entry = FCEntry2() # hlay.addWidget(self.addtool_label) # hlay.addStretch() @@ -307,6 +307,7 @@ class ToolPaint(FlatCAMTool, Gerber): ## Signals self.addtool_btn.clicked.connect(self.on_tool_add) + self.addtool_entry.returnPressed.connect(self.on_tool_add) # self.copytool_btn.clicked.connect(lambda: self.on_tool_copy()) self.tools_table.itemChanged.connect(self.on_tool_edit) self.deltool_btn.clicked.connect(self.on_tool_delete) diff --git a/flatcamTools/ToolSolderPaste.py b/flatcamTools/ToolSolderPaste.py index 477c055f..4f7a21e7 100644 --- a/flatcamTools/ToolSolderPaste.py +++ b/flatcamTools/ToolSolderPaste.py @@ -8,7 +8,7 @@ from FlatCAMTool import FlatCAMTool from FlatCAMCommon import LoudDict -from flatcamGUI.GUIElements import FCComboBox, FCEntry, FCTable +from flatcamGUI.GUIElements import FCComboBox, FCEntry, FCEntry2, FCTable from FlatCAMApp import log from camlib import distance from FlatCAMObj import FlatCAMCNCjob @@ -102,7 +102,7 @@ class SolderPaste(FlatCAMTool): self.addtool_entry_lbl.setToolTip( _("Diameter for the new Nozzle tool to add in the Tool Table") ) - self.addtool_entry = FCEntry() + self.addtool_entry = FCEntry2() # hlay.addWidget(self.addtool_label) # hlay.addStretch() @@ -415,6 +415,7 @@ class SolderPaste(FlatCAMTool): ## Signals self.combo_context_del_action.triggered.connect(self.on_delete_object) self.addtool_btn.clicked.connect(self.on_tool_add) + self.addtool_entry.returnPressed.connect(self.on_tool_add) self.deltool_btn.clicked.connect(self.on_tool_delete) self.soldergeo_btn.clicked.connect(self.on_create_geo_click) self.solder_gcode_btn.clicked.connect(self.on_create_gcode_click)