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

- added properties for the mouse position and mouse clicked position (and setters) and cleaned up the code regarding this data

Browse Source
This commit is contained in:
Marius Stanciu
2022-05-21 02:13:47 +03:00
committed by Marius
parent 61325b7b5f
commit bfb3aa4118
7 changed files with 85 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
appGUI/MainGUI.py
View File

@@ -3456,11 +3456,11 @@ class MainGUI(QtWidgets.QMainWindow):
# Zoom In
if key == QtCore.Qt.Key.Key_Equal:
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'], self.app.mouse)
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'], self.app.mouse_pos)
# Zoom Out
if key == QtCore.Qt.Key.Key_Minus:
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'], self.app.mouse)
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'], self.app.mouse_pos)
# toggle display of Notebook area
if key == QtCore.Qt.Key.Key_QuoteLeft:
@@ -3904,8 +3904,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.inform.emit("Click on target point.")
self.app.ui.add_pad_ar_btn.setChecked(True)
self.app.grb_editor.x = self.app.mouse[0]
self.app.grb_editor.y = self.app.mouse[1]
self.app.grb_editor.x = self.app.mouse_pos[0]
self.app.grb_editor.y = self.app.mouse_pos[1]
self.app.grb_editor.select_tool('array')
return
@@ -3989,8 +3989,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.inform.emit(_("Click on target point."))
self.app.ui.add_pad_ar_btn.setChecked(True)
self.app.grb_editor.x = self.app.mouse[0]
self.app.grb_editor.y = self.app.mouse[1]
self.app.grb_editor.x = self.app.mouse_pos[0]
self.app.grb_editor.y = self.app.mouse_pos[1]
self.app.grb_editor.select_tool('pad')
return
@@ -4177,8 +4177,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.inform.emit(_("Click on target point."))
self.app.ui.add_slot_btn.setChecked(True)
self.app.exc_editor.x = self.app.mouse[0]
self.app.exc_editor.y = self.app.mouse[1]
self.app.exc_editor.x = self.app.mouse_pos[0]
self.app.exc_editor.y = self.app.mouse_pos[1]
self.app.exc_editor.select_tool('slot_add')
return
@@ -4202,8 +4202,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.inform.emit("Click on target point.")
self.app.ui.add_drill_array_btn.setChecked(True)
self.app.exc_editor.x = self.app.mouse[0]
self.app.exc_editor.y = self.app.mouse[1]
self.app.exc_editor.x = self.app.mouse_pos[0]
self.app.exc_editor.y = self.app.mouse_pos[1]
self.app.exc_editor.select_tool('drill_array')
return
@@ -4228,8 +4228,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.inform.emit(_("Click on target point."))
self.app.ui.add_drill_btn.setChecked(True)
self.app.exc_editor.x = self.app.mouse[0]
self.app.exc_editor.y = self.app.mouse[1]
self.app.exc_editor.x = self.app.mouse_pos[0]
self.app.exc_editor.y = self.app.mouse_pos[1]
self.app.exc_editor.select_tool('drill_add')
return
@@ -4258,8 +4258,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.inform.emit("Click on target point.")
self.app.ui.add_slot_array_btn.setChecked(True)
self.app.exc_editor.x = self.app.mouse[0]
self.app.exc_editor.y = self.app.mouse[1]
self.app.exc_editor.x = self.app.mouse_pos[0]
self.app.exc_editor.y = self.app.mouse_pos[1]
self.app.exc_editor.select_tool('slot_array')
return