Skip to content

Kinetic qt5 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joaobimbo wants to merge 2 commits into
base: indigo-devel
Choose a base branch
from
Open

Kinetic qt5 #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b82133
qt5 imports
joaobimbo Jan 24, 2017
4929276
qt5 wheel emit and wheelevent
joaobimbo Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/xdot/xdot_qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@

#from PySide.QtCore import *
#from PySide.QtGui import *
from PyQt4 import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt5 import *
from PyQt5.QtCore import *
from PyQt5.QtGui import *

from PyQt5.QtCore import Signal
from python_qt_binding.QtWidgets import QWidget, QMainWindow
#from python_qt_binding import *
#from python_qt_binding.QtCore import *
#from python_qt_binding.QtGui import *
#from python_qt_binding.QtCore import QMainWindow
#from python_qt_binding.QtGui import *

#--------------------------------------------------------------------------------------------------------------------------------------------------------------------
#-- Drawing Classes --#
Expand Down Expand Up @@ -1338,6 +1340,8 @@ class DotWidget(QWidget):
"""Qt widget that draws dot graphs."""

filter = 'dot'
trigger = pyqtSignal(str,str,QMouseEvent)


def __init__(self, parent=None):
super(DotWidget, self).__init__(parent)
Expand Down Expand Up @@ -1634,9 +1638,9 @@ def mouseReleaseEvent(self, event):
x, y = event.x(), event.y()
url = self.get_url(x, y)
if url is not None:
self.emit(SIGNAL("clicked"), unicode(url.url), event)
self.trigger.emit("clicked", unicode(url.url), event)
else:
self.emit(SIGNAL("clicked"), 'none', event)
self.trigger.emit("clicked", 'none', event)
jump = self.get_jump(x, y)
if jump is not None:
self.animate_to(jump.x, jump.y)
Expand All @@ -1647,9 +1651,9 @@ def mouseReleaseEvent(self, event):
x, y = event.x(), event.y()
url = self.get_url(x, y)
if url is not None:
self.emit(SIGNAL("right_clicked"), unicode(url.url), event)
self.trigger.emit("right_clicked", unicode(url.url), event)
else:
self.emit(SIGNAL("right_clicked"), 'none', event)
self.trigger.emit("right_clicked", 'none', event)
jump = self.get_jump(x, y)
if jump is not None:
self.animate_to(jump.x, jump.y)
Expand All @@ -1662,10 +1666,10 @@ def on_area_scroll_event(self, area, event):
return False

def wheelEvent(self, event):
if event.delta() > 0:
if event.angleDelta().y() > 0:
self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT,
pos=(event.x(), event.y()))
if event.delta() < 0:
if event.angleDelta().y() < 0:
self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT,
pos=(event.x(), event.y()))

Expand Down