Skip to content

Cairo rendering for Qt5 #8771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Cairo rendering for Qt5 #8771

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2abdcea
Qt5Cairo backend.
anntzer Jun 15, 2017
d4957ec
Qt4Cairo backend.
anntzer Jun 18, 2017
d2f2bc0
Update backends docs.
anntzer Jun 18, 2017
f884ffa
Update backends API docs.
anntzer Jun 18, 2017
bcb08e9
Let cairo track surface size; fix Pyside refcnt bug.
anntzer Jun 19, 2017
2eac3fa
Fix mandelbrot example.
anntzer Jun 20, 2017
138ba58
Make sure only one cairo binding is ever used; fix docs.
anntzer Jun 20, 2017
d96d104
No need to process_updates in gtk3.
anntzer Jul 23, 2017
5087c05
Qt dpi handling should be renderer-agnostic.
anntzer Aug 1, 2017
89a87d0
Fix vector output from cairo.
anntzer Aug 3, 2017
56854ae
In QtCairo, also save figures using cairo.
anntzer Aug 3, 2017
ab61783
Fix doc builds.
anntzer Aug 26, 2017
8946c38
Fix hidpi in qt5cairo.
anntzer Dec 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix doc builds.
  • Loading branch information
@anntzer
anntzer committed Jan 9, 2018
commit ab61783390f2d8ffad98c38f86e3d406d67e28ca
40 changes: 21 additions & 19 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,17 +335,8 @@ def _check_deps():
]


class MyWX(MagicMock):
class Panel(object):
pass

class ToolBar(object):
pass

class Frame(object):
pass

VERSION_STRING = '2.9'
class MyCairo(MagicMock):
version_info = (1, 2, 0)


class MyPyQt4(MagicMock):
Expand Down Expand Up @@ -450,14 +441,25 @@ def getapi(*args):
return 1


mockwxversion = MagicMock()
mockwx = MyWX()
mocksip = MySip()
mockpyqt4 = MyPyQt4()
sys.modules['wxversion'] = mockwxversion
sys.modules['wx'] = mockwx
sys.modules['sip'] = mocksip
sys.modules['PyQt4'] = mockpyqt4
class MyWX(MagicMock):
class Panel(object):
pass

class ToolBar(object):
pass

class Frame(object):
pass

VERSION_STRING = '2.9'


sys.modules['cairo'] = MyCairo()
sys.modules['cairo'].__name__ = 'cairocffi'
sys.modules['PyQt4'] = MyPyQt4()
sys.modules['sip'] = MySip()
sys.modules['wx'] = MyWX()
sys.modules['wxversion'] = MagicMock()

# numpydoc config

Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/backends/backend_cairo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
import numpy as np

# In order to make it possible to pick the binding, use whichever has already
# been imported, if any. (The intermediate call to iter is just to placate
# Python2.)
# been imported, if any.
cairo = next(
(mod for mod in (
sys.modules.get(name) for name in ["cairocffi", "cairo"]) if mod),
Expand Down