bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- in Fiducials Plugin added the support for ESCAPE key from manual mode and also exit by right clicking

Browse Source
This commit is contained in:
Marius Stanciu
2021-09-09 21:30:48 +03:00
committed by Marius
parent 9866bb9037
commit e0a158759c
4 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
appGUI/MainGUI.py
View File

@@ -4173,6 +4173,7 @@ class MainGUI(QtWidgets.QMainWindow):
if key == QtCore.Qt.Key.Key_J:
self.app.on_jump_to()
elif self.app.call_source == 'geometry':
# used for Exclusion Areas
if modifiers == QtCore.Qt.KeyboardModifier.ControlModifier:
pass
elif modifiers == QtCore.Qt.KeyboardModifier.AltModifier:
@@ -4196,6 +4197,31 @@ class MainGUI(QtWidgets.QMainWindow):
# Jump to coords
if key == QtCore.Qt.Key.Key_J or key == 'J':
self.app.on_jump_to()
elif self.app.call_source == 'fiducials_tool':
# CTRL + ALT
if modifiers == QtCore.Qt.KeyboardModifier.ControlModifier | QtCore.Qt.KeyboardModifier.AltModifier:
if key == QtCore.Qt.Key.Key_X:
self.app.abort_all_tasks()
return
elif modifiers == QtCore.Qt.KeyboardModifier.ControlModifier:
pass
elif modifiers == QtCore.Qt.KeyboardModifier.ShiftModifier:
pass
elif modifiers == QtCore.Qt.KeyboardModifier.AltModifier:
pass
# NO MODIFIER
elif modifiers == QtCore.Qt.KeyboardModifier.NoModifier:
# Escape = Deselect All
if key == QtCore.Qt.Key.Key_Escape or key == 'Escape':
self.app.fiducial_tool.on_exit(cancelled=True)
# Grid toggle
if key == QtCore.Qt.Key.Key_G:
self.app.ui.grid_snap_btn.trigger()
# Jump to coords
if key == QtCore.Qt.Key.Key_J:
self.app.on_jump_to()
def eventFilter(self, obj, event):
"""