Merge pull request #9641 from anntzer/qt4-as-qt5

fariza · web-flow · commit a89057330e0e · 2017-12-13T10:50:39.000-05:00
Implement Qt4 backend by fully reexporting Qt5 backend.
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -2,45 +2,14 @@
                         unicode_literals)
 
 import six
-from six import unichr
-import os
-import re
-import signal
-import sys
-
-from matplotlib._pylab_helpers import Gcf
-from matplotlib.backend_bases import (
-    FigureCanvasBase, FigureManagerBase, NavigationToolbar2, TimerBase,
-    cursors)
-from matplotlib.figure import Figure
-from matplotlib.widgets import SubplotTool
-
-from .qt_compat import QtCore, QtWidgets, _getSaveFileName, __version__
 
 from .backend_qt5 import (
     backend_version, SPECIAL_KEYS, SUPER, ALT, CTRL, SHIFT, MODIFIER_KEYS,
     cursord, _create_qApp, _BackendQT5, TimerQT, MainWindow, FigureManagerQT,
     NavigationToolbar2QT, SubplotToolQt, error_msg_qt, exception_handler)
 from .backend_qt5 import FigureCanvasQT as FigureCanvasQT5
 
-DEBUG = False
-
-
-class FigureCanvasQT(FigureCanvasQT5):
-
-    def wheelEvent(self, event):
-        x = event.x()
-        # flipy so y=0 is bottom of canvas
-        y = self.figure.bbox.height - event.y()
-        # from QWheelEvent::delta doc
-        steps = event.delta()/120
-        if (event.orientation() == QtCore.Qt.Vertical):
-            FigureCanvasBase.scroll_event(self, x, y, steps)
-            if DEBUG:
-                print('scroll event: delta = %i, '
-                      'steps = %i ' % (event.delta(), steps))
-
 
 @_BackendQT5.export
 class _BackendQT4(_BackendQT5):
-    FigureCanvas = FigureCanvasQT
+    pass
diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py
@@ -6,25 +6,10 @@
 
 import six
 
-from .backend_agg import FigureCanvasAgg
-from .backend_qt4 import (
-    QtCore, _BackendQT4, FigureCanvasQT, FigureManagerQT, NavigationToolbar2QT)
-from .backend_qt5agg import FigureCanvasQTAggBase
+from .backend_qt5agg import (
+    _BackendQT5Agg, FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT)
 
 
-class FigureCanvasQTAgg(FigureCanvasQTAggBase, FigureCanvasQT):
-    """
-    The canvas the figure renders into.  Calls the draw and print fig
-    methods, creates the renderers, etc...
-
-    Attributes
-    ----------
-    figure : `matplotlib.figure.Figure`
-        A high-level Figure instance
-
-    """
-
-
-@_BackendQT4.export
-class _BackendQT4Agg(_BackendQT4):
-    FigureCanvas = FigureCanvasQTAgg
+@_BackendQT5Agg.export
+class _BackendQT4Agg(_BackendQT5Agg):
+    pass
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -316,15 +316,27 @@ def mouseReleaseEvent(self, event):
             FigureCanvasBase.button_release_event(self, x, y, button,
                                                   guiEvent=event)
 
-    def wheelEvent(self, event):
-        x, y = self.mouseEventCoords(event)
-        # from QWheelEvent::delta doc
-        if event.pixelDelta().x() == 0 and event.pixelDelta().y() == 0:
-            steps = event.angleDelta().y() / 120
-        else:
-            steps = event.pixelDelta().y()
-        if steps:
-            FigureCanvasBase.scroll_event(self, x, y, steps, guiEvent=event)
+    if is_pyqt5():
+        def wheelEvent(self, event):
+            x, y = self.mouseEventCoords(event)
+            # from QWheelEvent::delta doc
+            if event.pixelDelta().x() == 0 and event.pixelDelta().y() == 0:
+                steps = event.angleDelta().y() / 120
+            else:
+                steps = event.pixelDelta().y()
+            if steps:
+                FigureCanvasBase.scroll_event(
+                    self, x, y, steps, guiEvent=event)
+    else:
+        def wheelEvent(self, event):
+            x = event.x()
+            # flipy so y=0 is bottom of canvas
+            y = self.figure.bbox.height - event.y()
+            # from QWheelEvent::delta doc
+            steps = event.delta() / 120
+            if event.orientation() == QtCore.Qt.Vertical:
+                FigureCanvasBase.scroll_event(
+                    self, x, y, steps, guiEvent=event)
 
     def keyPressEvent(self, event):
         key = self._get_key(event)
