Revert to using update() instead of redraw() for Qt5/Win

matplotlib · tacaswell · Jul 22, 2015 · Jul 8, 2015 · Jul 10, 2015 · Jul 16, 2015
commit 7fb21c660a1ae17c27ef95b4790c2e71bf679b36
diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py
@@ -73,22 +73,6 @@ def __init__(self, figure):
        self._drawRect = None
        self.blitbox = None
        self.setAttribute(QtCore.Qt.WA_OpaquePaintEvent)
-        # it has been reported that Qt is semi-broken in a windows
-        # environment.  If `self.draw()` uses `update` to trigger a
-        # system-level window repaint (as is explicitly advised in the
-        # Qt documentation) the figure responds very slowly to mouse
-        # input.  The work around is to directly use `repaint`
-        # (against the advice of the Qt documentation).  The
-        # difference between `update` and repaint is that `update`
-        # schedules a `repaint` for the next time the system is idle,
-        # where as `repaint` repaints the window immediately.  The
-        # risk is if `self.draw` gets called with in another `repaint`
-        # method there will be an infinite recursion.  Thus, we only
-        # expose windows users to this risk.
-        if sys.platform.startswith('win'):
-            self._priv_update = self.repaint
-        else:
-            self._priv_update = self.update


 FigureCanvas = FigureCanvasQTAgg

diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -416,7 +416,7 @@ def stop_event_loop(self):
    stop_event_loop.__doc__ = FigureCanvasBase.stop_event_loop_default.__doc__

    def draw_idle(self):
-        self._priv_update()
+        self.update()


 class MainWindow(QtWidgets.QMainWindow):

diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
@@ -147,7 +147,7 @@ def draw(self):
        # causes problems with code that uses the result of the
        # draw() to update plot elements.
        FigureCanvasAgg.draw(self)
-        self._priv_update()
+        self.update()

    def blit(self, bbox=None):
        """
@@ -184,22 +184,6 @@ def __init__(self, figure):
        self._drawRect = None
        self.blitbox = None
        self.setAttribute(QtCore.Qt.WA_OpaquePaintEvent)
-        # it has been reported that Qt is semi-broken in a windows
-        # environment.  If `self.draw()` uses `update` to trigger a
-        # system-level window repaint (as is explicitly advised in the
-        # Qt documentation) the figure responds very slowly to mouse
-        # input.  The work around is to directly use `repaint`
-        # (against the advice of the Qt documentation).  The
-        # difference between `update` and repaint is that `update`
-        # schedules a `repaint` for the next time the system is idle,
-        # where as `repaint` repaints the window immediately.  The
-        # risk is if `self.draw` gets called with in another `repaint`
-        # method there will be an infinite recursion.  Thus, we only
-        # expose windows users to this risk.
-        if sys.platform.startswith('win'):
-            self._priv_update = self.repaint
-        else:
-            self._priv_update = self.update


 FigureCanvas = FigureCanvasQTAgg