WXCairo backend.

anntzer · anntzer · commit 7367ce4ecd26 · 2017-12-29T13:12:54.000-08:00
diff --git a/doc/api/backend_wxcairo_api.rst b/doc/api/backend_wxcairo_api.rst
@@ -0,0 +1,8 @@
+
+:mod:`matplotlib.backends.backend_wxcairo`
+==========================================
+
+.. automodule:: matplotlib.backends.backend_wxcairo
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/api/index_backend_api.rst b/doc/api/index_backend_api.rst
@@ -26,3 +26,4 @@ backends
    backend_tkagg_api.rst
    backend_webagg_api.rst
    backend_wxagg_api.rst
+   backend_wxcairo_api.rst
diff --git a/doc/users/whats_new/more-cairo.rst b/doc/users/whats_new/more-cairo.rst
@@ -0,0 +1,5 @@
+cairo rendering for Qt and WX canvases
+--------------------------------------
+
+The new ``Qt4Cairo``, ``Qt5Cairo``, and ``WXCairo`` backends allow Qt and WX
+canvases to use cairo rendering instead of Agg.
diff --git a/doc/users/whats_new/qtcairo.rst b/doc/users/whats_new/qtcairo.rst
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -6,7 +6,8 @@
 import wx
 
 import matplotlib
-from . import cbook, wx_compat as wxc
+from .. import cbook
+from . import wx_compat as wxc
 from .backend_agg import FigureCanvasAgg
 from .backend_wx import (
     _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
@@ -0,0 +1,53 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+import six
+
+from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
+from .backend_wx import (
+    _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
+
+import wx
+
+
+class FigureFrameWxCairo(FigureFrameWx):
+    def get_canvas(self, fig):
+        return FigureCanvasWxCairo(self, -1, fig)
+
+
+class FigureCanvasWxCairo(_FigureCanvasWxBase, FigureCanvasCairo):
+    """
+    The FigureCanvas contains the figure and does event handling.
+
+    In the wxPython backend, it is derived from wxPanel, and (usually) lives
+    inside a frame instantiated by a FigureManagerWx. The parent window
+    probably implements a wxSizer to control the displayed control size - but
+    we give a hint as to our preferred minimum size.
+    """
+
+    def __init__(self, parent, id, figure):
+        # _FigureCanvasWxBase should be fixed to have the same signature as
+        # every other FigureCanvas and use cooperative inheritance, but in the
+        # meantime the following will make do.
+        _FigureCanvasWxBase.__init__(self, parent, id, figure)
+        FigureCanvasCairo.__init__(self, figure)
+        self._renderer = RendererCairo(self.figure.dpi)
+
+    def draw(self, drawDC=None):
+        FigureCanvasCairo.draw(self)
+        width = int(self.figure.bbox.width)
+        height = int(self.figure.bbox.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()
+        self.bitmap = wx.Bitmap.FromBufferRGBA(width, height, buf)
+        self._isDrawn = True
+        self.gui_repaint(drawDC=drawDC, origin='WXCairo')
+
+
+@_BackendWx.export
+class _BackendWxCairo(_BackendWx):
+    FigureCanvas = FigureCanvasWxCairo
+    _frame_class = FigureFrameWxCairo
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -38,7 +38,7 @@
                   'Qt4Agg', 'Qt4Cairo', 'Qt5Agg', 'Qt5Cairo',
                   'TkAgg',
                   'WebAgg',
-                  'WX', 'WXAgg']
+                  'WX', 'WXAgg', 'WXCairo']
 non_interactive_bk = ['agg', 'cairo', 'gdk',
                       'pdf', 'pgf', 'ps', 'svg', 'template']
 all_backends = interactive_bk + non_interactive_bk
diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py
@@ -446,9 +446,12 @@ def my_plotter(ax, data1, data2, param_dict):
 #           activated in IPython with ``%matplotlib gtk``.
 # GTKCairo  Cairo rendering to a :term:`GTK` 2.x canvas (requires PyGTK_,
 #           and pycairo_ or cairocffi_; Python2 only).
-# WXAgg     Agg rendering to a :term:`wxWidgets` canvas (requires wxPython_;
+# WXAgg     Agg rendering to a :term:`wxWidgets` canvas (requires wxPython_ --
 #           v4.0 (in beta) is required for Python3). This backend can be
-#           activated in IPython with ``%matplotlib wx``.#
+#           activated in IPython with ``%matplotlib wx``.
+# WXCairo   Cairo rendering to a :term:`wxWidgets` canvas (requires wxPython_
+#           -- v4.0 (in beta) is required for Python3, and pycairo_ or
+#           cairocffi_).
 # ========= ================================================================
 #
 # .. _`Anti-Grain Geometry`: http://antigrain.com/
