Merge pull request matplotlib#2221 from DanielO/master

Try PySide then PyQt4 for Qt4 examples.

Author: mdboom

examples/animation/old_animation/animation_blit_qt4.py

@@ -11,7 +11,13 @@
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
 
-from PyQt4 import QtCore, QtGui
+from matplotlib.backends import qt4_compat
+use_pyside = qt4_compat.QT_API == qt4_compat.QT_API_PYSIDE
+
+if use_pyside:
+    from PySide import QtCore, QtGui
+else:
+    from PyQt4 import QtCore, QtGui
 
 ITERS = 1000
 

examples/user_interfaces/embedding_in_qt4.py

@@ -11,7 +11,12 @@
 
 from __future__ import unicode_literals
 import sys, os, random
-from PyQt4 import QtGui, QtCore
+from matplotlib.backends import qt4_compat
+use_pyside = qt4_compat.QT_API == qt4_compat.QT_API_PYSIDE
+if use_pyside:
+    from PySide import QtGui, QtCore
+else:
+    from PyQt4 import QtGui, QtCore
 
 from numpy import arange, sin, pi
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
@@ -57,7 +62,10 @@ class MyDynamicMplCanvas(MyMplCanvas):
     def __init__(self, *args, **kwargs):
         MyMplCanvas.__init__(self, *args, **kwargs)
         timer = QtCore.QTimer(self)
-        QtCore.QObject.connect(timer, QtCore.SIGNAL("timeout()"), self.update_figure)
+        if use_pyside: 
+            timer.timeout.connect(self.update_figure)
+        else:
+            QtCore.QObject.connect(timer, QtCore.SIGNAL("timeout()"), self.update_figure)
         timer.start(1000)
 
     def compute_initial_figure(self):

examples/user_interfaces/embedding_in_qt4_wtoolbar.py

@@ -8,8 +8,15 @@
 from matplotlib.backends.backend_qt4agg import (
     FigureCanvasQTAgg as FigureCanvas,
     NavigationToolbar2QTAgg as NavigationToolbar)
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from matplotlib.backends import qt4_compat
+use_pyside = qt4_compat.QT_API == qt4_compat.QT_API_PYSIDE
+
+if use_pyside:
+    from PySide.QtCore import *
+    from PySide.QtGui import *
+else:
+    from PyQt4.QtCore import *
+    from PyQt4.QtGui import *
 
 
 class AppForm(QMainWindow):