giuliof/flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update zoom in and zoom out function.

Browse Source
This commit is contained in:
camellan 2019-06-09 19:24:01 +04:00
parent 4587946b48
commit bfab836a1b
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FlatCAMApp.py
View File

@ -1417,10 +1417,6 @@ class App(QtCore.QObject):
self.ui.menuviewenable.triggered.connect(self.enable_all_plots)
self.ui.menuview_zoom_fit.triggered.connect(self.on_zoom_fit)
<<<<<<< HEAD
self.ui.menuview_zoom_in.triggered.connect(lambda: self.plotcanvas.zoom(1.5))
self.ui.menuview_zoom_out.triggered.connect(lambda: self.plotcanvas.zoom(1 / 1.5))
=======
self.ui.menuview_zoom_in.triggered.connect(
lambda: self.plotcanvas.zoom(1 / float(self.defaults['global_zoom_ratio']))
)
@ -1428,7 +1424,6 @@ class App(QtCore.QObject):
lambda: self.plotcanvas.zoom(float(self.defaults['global_zoom_ratio']))
)
>>>>>>> remotes/jpcgt/flatcam/Beta
self.ui.menuview_toggle_code_editor.triggered.connect(self.on_toggle_code_editor)
self.ui.menuview_toggle_fscreen.triggered.connect(self.on_fullscreen)
self.ui.menuview_toggle_parea.triggered.connect(self.on_toggle_plotarea)
@ -8049,7 +8044,7 @@ class App(QtCore.QObject):
This behavior works only within main thread,
errors with promissed tasks can be catched and detected only with log.
TODO: this problem have to be addressed somehow, maybe rewrite promissing to be blocking somehow for
TODO: this problem have to be addressed somehow, maybe rewrite promissing to be blocking somehow for
TCL shell.
Kamil's comment: I will rewrite existing TCL commands from time to time to follow this rules.

11
flatcamGUI/FlatCAMGUI.py
View File

@ -1250,7 +1250,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
</tr>
</tbody>
</table>
'''
)
@ -1265,7 +1265,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
'''<b>Editor Shortcut list</b><br>
<br>
<strong><span style="color:#0000ff">GEOMETRY EDITOR</span></strong><br>
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
@ -2328,20 +2328,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.app.on_flipy()
# Zoom In
<<<<<<< HEAD
=======
if key == QtCore.Qt.Key_Equal:
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'], self.app.mouse)
# Zoom Out
>>>>>>> remotes/jpcgt/flatcam/Beta
if key == QtCore.Qt.Key_Minus:
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'], self.app.mouse)
# Zoom Out
if key == QtCore.Qt.Key_Equal:
self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
# toggle display of Notebook area
if key == QtCore.Qt.Key_QuoteLeft:
self.app.on_toggle_notebook()