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

- made PlotCanvas class inherit from VisPy Canvas instead of creating an instance of it (work of JP)

Browse Source
This commit is contained in:
Marius Stanciu
2019-08-24 04:45:25 +03:00
committed by Marius
parent 3fe31dec59
commit 0e96be7d9a
12 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flatcamEditors/FlatCAMExcEditor.py
View File

@@ -3262,7 +3262,7 @@ class FlatCAMExcEditor(QtCore.QObject):
:return: None
"""
self.pos = self.canvas.vispy_canvas.translate_coords(event.pos)
self.pos = self.canvas.translate_coords(event.pos)
if self.app.grid_status() == True:
self.pos = self.app.geo_editor.snap(self.pos[0], self.pos[1])
@@ -3401,7 +3401,7 @@ class FlatCAMExcEditor(QtCore.QObject):
:param event: Event object dispatched by VisPy SceneCavas
:return: None
"""
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
pos_canvas = self.canvas.translate_coords(event.pos)
if self.app.grid_status() == True:
pos = self.app.geo_editor.snap(pos_canvas[0], pos_canvas[1])
@@ -3557,7 +3557,7 @@ class FlatCAMExcEditor(QtCore.QObject):
:return: None
"""
pos = self.canvas.vispy_canvas.translate_coords(event.pos)
pos = self.canvas.translate_coords(event.pos)
event.xdata, event.ydata = pos[0], pos[1]
self.x = event.xdata

6
flatcamEditors/FlatCAMGeoEditor.py
View File

@@ -3576,7 +3576,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
:return: None
"""
self.pos = self.canvas.vispy_canvas.translate_coords(event.pos)
self.pos = self.canvas.translate_coords(event.pos)
if self.app.grid_status() == True:
self.pos = self.app.geo_editor.snap(self.pos[0], self.pos[1])
@@ -3628,7 +3628,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
:param event: Event object dispatched by VisPy SceneCavas
:return: None
"""
pos = self.canvas.vispy_canvas.translate_coords(event.pos)
pos = self.canvas.translate_coords(event.pos)
event.xdata, event.ydata = pos[0], pos[1]
self.x = event.xdata
@@ -3704,7 +3704,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.app.selection_type = None
def on_geo_click_release(self, event):
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
pos_canvas = self.canvas.translate_coords(event.pos)
if self.app.grid_status() == True:
pos = self.snap(pos_canvas[0], pos_canvas[1])

6
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -4069,7 +4069,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
:return: None
"""
self.pos = self.canvas.vispy_canvas.translate_coords(event.pos)
self.pos = self.canvas.translate_coords(event.pos)
if self.app.grid_status() == True:
self.pos = self.app.geo_editor.snap(self.pos[0], self.pos[1])
@@ -4132,7 +4132,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
def on_grb_click_release(self, event):
self.modifiers = QtWidgets.QApplication.keyboardModifiers()
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
pos_canvas = self.canvas.translate_coords(event.pos)
if self.app.grid_status() == True:
pos = self.app.geo_editor.snap(pos_canvas[0], pos_canvas[1])
else:
@@ -4264,7 +4264,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
:return: None
"""
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
pos_canvas = self.canvas.translate_coords(event.pos)
event.xdata, event.ydata = pos_canvas[0], pos_canvas[1]
self.x = event.xdata