Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Benjamin Jakimow
EO Time Series Viewer
Commits
1418358b
Commit
1418358b
authored
Nov 17, 2013
by
Luke Campagnola
Browse files
Fixed RemoteGraphicsView passing mouse events on python3 + pyside
parent
08be09ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
examples/initExample.py
View file @
1418358b
...
...
@@ -33,3 +33,10 @@ for gs in ['raster', 'native', 'opengl']:
QtGui
.
QApplication
.
setGraphicsSystem
(
gs
)
break
## Enable fault handling to give more helpful error messages on crash.
## Only available in python 3.3+
try
:
import
faulthandler
faulthandler
.
enable
()
except
ImportError
:
pass
\ No newline at end of file
pyqtgraph/multiprocess/processes.py
View file @
1418358b
from
.remoteproxy
import
RemoteEventHandler
,
ClosedError
,
NoResultError
,
LocalObjectProxy
,
ObjectProxy
import
subprocess
,
atexit
,
os
,
sys
,
time
,
random
,
socket
,
signal
import
multiprocessing.connection
from
pyqtgraph
.Qt
import
USE_PYSIDE
import
pyqtgraph
as
pg
try
:
import
cPickle
as
pickle
except
ImportError
:
...
...
@@ -98,7 +98,6 @@ class Process(RemoteEventHandler):
targetStr
=
pickle
.
dumps
(
target
)
## double-pickle target so that child has a chance to
## set its sys.path properly before unpickling the target
pid
=
os
.
getpid
()
# we must send pid to child because windows does not have getppid
pyside
=
USE_PYSIDE
## Send everything the remote process needs to start correctly
data
=
dict
(
...
...
@@ -108,7 +107,7 @@ class Process(RemoteEventHandler):
ppid
=
pid
,
targetStr
=
targetStr
,
path
=
sysPath
,
pyside
=
p
yside
,
pyside
=
p
g
.
Qt
.
USE_PYSIDE
,
debug
=
debug
)
pickle
.
dump
(
data
,
self
.
proc
.
stdin
)
...
...
pyqtgraph/widgets/RemoteGraphicsView.py
View file @
1418358b
...
...
@@ -83,17 +83,17 @@ class RemoteGraphicsView(QtGui.QWidget):
p
.
end
()
def
mousePressEvent
(
self
,
ev
):
self
.
_view
.
mousePressEvent
(
ev
.
type
(),
ev
.
pos
(),
ev
.
globalPos
(),
ev
.
button
(),
int
(
ev
.
buttons
()),
int
(
ev
.
modifiers
()),
_callSync
=
'off'
)
self
.
_view
.
mousePressEvent
(
int
(
ev
.
type
()
)
,
ev
.
pos
(),
ev
.
globalPos
(),
int
(
ev
.
button
()
)
,
int
(
ev
.
buttons
()),
int
(
ev
.
modifiers
()),
_callSync
=
'off'
)
ev
.
accept
()
return
QtGui
.
QWidget
.
mousePressEvent
(
self
,
ev
)
def
mouseReleaseEvent
(
self
,
ev
):
self
.
_view
.
mouseReleaseEvent
(
ev
.
type
(),
ev
.
pos
(),
ev
.
globalPos
(),
ev
.
button
(),
int
(
ev
.
buttons
()),
int
(
ev
.
modifiers
()),
_callSync
=
'off'
)
self
.
_view
.
mouseReleaseEvent
(
int
(
ev
.
type
()
)
,
ev
.
pos
(),
ev
.
globalPos
(),
int
(
ev
.
button
()
)
,
int
(
ev
.
buttons
()),
int
(
ev
.
modifiers
()),
_callSync
=
'off'
)
ev
.
accept
()
return
QtGui
.
QWidget
.
mouseReleaseEvent
(
self
,
ev
)
def
mouseMoveEvent
(
self
,
ev
):
self
.
_view
.
mouseMoveEvent
(
ev
.
type
(),
ev
.
pos
(),
ev
.
globalPos
(),
ev
.
button
(),
int
(
ev
.
buttons
()),
int
(
ev
.
modifiers
()),
_callSync
=
'off'
)
self
.
_view
.
mouseMoveEvent
(
int
(
ev
.
type
()
)
,
ev
.
pos
(),
ev
.
globalPos
(),
int
(
ev
.
button
()
)
,
int
(
ev
.
buttons
()),
int
(
ev
.
modifiers
()),
_callSync
=
'off'
)
ev
.
accept
()
return
QtGui
.
QWidget
.
mouseMoveEvent
(
self
,
ev
)
...
...
@@ -103,16 +103,16 @@ class RemoteGraphicsView(QtGui.QWidget):
return
QtGui
.
QWidget
.
wheelEvent
(
self
,
ev
)
def
keyEvent
(
self
,
ev
):
if
self
.
_view
.
keyEvent
(
ev
.
type
(),
int
(
ev
.
modifiers
()),
text
,
autorep
,
count
):
if
self
.
_view
.
keyEvent
(
int
(
ev
.
type
()
)
,
int
(
ev
.
modifiers
()),
text
,
autorep
,
count
):
ev
.
accept
()
return
QtGui
.
QWidget
.
keyEvent
(
self
,
ev
)
def
enterEvent
(
self
,
ev
):
self
.
_view
.
enterEvent
(
ev
.
type
(),
_callSync
=
'off'
)
self
.
_view
.
enterEvent
(
int
(
ev
.
type
()
)
,
_callSync
=
'off'
)
return
QtGui
.
QWidget
.
enterEvent
(
self
,
ev
)
def
leaveEvent
(
self
,
ev
):
self
.
_view
.
leaveEvent
(
ev
.
type
(),
_callSync
=
'off'
)
self
.
_view
.
leaveEvent
(
int
(
ev
.
type
()
)
,
_callSync
=
'off'
)
return
QtGui
.
QWidget
.
leaveEvent
(
self
,
ev
)
def
remoteProcess
(
self
):
...
...
@@ -206,18 +206,21 @@ class Renderer(GraphicsView):
def
mousePressEvent
(
self
,
typ
,
pos
,
gpos
,
btn
,
btns
,
mods
):
typ
=
QtCore
.
QEvent
.
Type
(
typ
)
btn
=
QtCore
.
Qt
.
MouseButton
(
btn
)
btns
=
QtCore
.
Qt
.
MouseButtons
(
btns
)
mods
=
QtCore
.
Qt
.
KeyboardModifiers
(
mods
)
return
GraphicsView
.
mousePressEvent
(
self
,
QtGui
.
QMouseEvent
(
typ
,
pos
,
gpos
,
btn
,
btns
,
mods
))
def
mouseMoveEvent
(
self
,
typ
,
pos
,
gpos
,
btn
,
btns
,
mods
):
typ
=
QtCore
.
QEvent
.
Type
(
typ
)
btn
=
QtCore
.
Qt
.
MouseButton
(
btn
)
btns
=
QtCore
.
Qt
.
MouseButtons
(
btns
)
mods
=
QtCore
.
Qt
.
KeyboardModifiers
(
mods
)
return
GraphicsView
.
mouseMoveEvent
(
self
,
QtGui
.
QMouseEvent
(
typ
,
pos
,
gpos
,
btn
,
btns
,
mods
))
def
mouseReleaseEvent
(
self
,
typ
,
pos
,
gpos
,
btn
,
btns
,
mods
):
typ
=
QtCore
.
QEvent
.
Type
(
typ
)
btn
=
QtCore
.
Qt
.
MouseButton
(
btn
)
btns
=
QtCore
.
Qt
.
MouseButtons
(
btns
)
mods
=
QtCore
.
Qt
.
KeyboardModifiers
(
mods
)
return
GraphicsView
.
mouseReleaseEvent
(
self
,
QtGui
.
QMouseEvent
(
typ
,
pos
,
gpos
,
btn
,
btns
,
mods
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment