Merge pull request #10399 from anntzer/qt5cairo-doubledraw

tacaswell · web-flow · commit a409c01421a2 · 2018-02-11T00:26:25.000-05:00
PRF: Avoid double draw in qt5cairo.
diff --git a/lib/matplotlib/backends/backend_qt5cairo.py b/lib/matplotlib/backends/backend_qt5cairo.py
@@ -10,22 +10,30 @@ class FigureCanvasQTCairo(FigureCanvasQT, FigureCanvasCairo):
     def __init__(self, figure):
         super(FigureCanvasQTCairo, self).__init__(figure=figure)
         self._renderer = RendererCairo(self.figure.dpi)
+        self._renderer.set_width_height(-1, -1)  # Invalid values.
+
+    def draw(self):
+        if hasattr(self._renderer.gc, "ctx"):
+            self.figure.draw(self._renderer)
+        super(FigureCanvasQTCairo, self).draw()
 
     def paintEvent(self, event):
         self._update_dpi()
         dpi_ratio = self._dpi_ratio
         width = dpi_ratio * self.width()
         height = dpi_ratio * self.height()
-        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-        self._renderer.set_ctx_from_surface(surface)
-        self._renderer.set_width_height(width, height)
-        self.figure.draw(self._renderer)
-        buf = surface.get_data()
+        if (width, height) != self._renderer.get_canvas_width_height():
+            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+            self._renderer.set_ctx_from_surface(surface)
+            self._renderer.set_width_height(width, height)
+            self.figure.draw(self._renderer)
+        buf = self._renderer.gc.ctx.get_target().get_data()
         qimage = QtGui.QImage(buf, width, height,
                               QtGui.QImage.Format_ARGB32_Premultiplied)
         # Adjust the buf reference count to work around a memory leak bug in
         # QImage under PySide on Python 3.
         if QT_API == 'PySide' and six.PY3:
+            import ctypes
             ctypes.c_long.from_address(id(buf)).value = 1
         if hasattr(qimage, 'setDevicePixelRatio'):
             # Not available on Qt4 or some older Qt5.
