Thanks to visit codestin.com
Credit goes to github.com

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
Let cairo track surface size; fix Pyside refcnt bug.
  • Loading branch information
@anntzer
anntzer committed Jan 9, 2018
commit bcb08e93a7a82441d58bc2ed3035a1f4a3db6558
11 changes: 1 addition & 10 deletions lib/matplotlib/backends/backend_cairo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,11 @@ def __init__(self, dpi):

def set_ctx_from_surface(self, surface):
self.gc.ctx = cairo.Context(surface)
self.set_width_height(surface.get_width(), surface.get_height())

def set_width_height(self, width, height):
self.width = width
self.height = height
self.matrix_flipy = cairo.Matrix(yy=-1, y0=self.height)
# use matrix_flipy for ALL rendering?
# - problem with text? - will need to switch matrix_flipy off, or do a
# font transform?

def _fill_and_stroke(self, ctx, fill_c, alpha, alpha_overrides):
if fill_c is not None:
Expand Down Expand Up @@ -303,11 +300,6 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):

ctx.restore()

def flipy(self):
return True
#return False # tried - all draw objects ok except text (and images?)
# which comes out mirrored!

def get_canvas_width_height(self):
return self.width, self.height

Expand Down Expand Up @@ -503,7 +495,6 @@ def _save(self, fo, fmt, **kwargs):

# surface.set_dpi() can be used
renderer = RendererCairo(self.figure.dpi)
renderer.set_width_height(width_in_points, height_in_points)
renderer.set_ctx_from_surface(surface)
ctx = renderer.gc.ctx

Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/backends/backend_qt5agg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ def paintEvent(self, e):
reg = self.copy_from_bbox(bbox)
buf = reg.to_string_argb()
qimage = QtGui.QImage(buf, w, h, QtGui.QImage.Format_ARGB32)
# 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:
ctypes.c_long.from_address(id(buf)).value = 1
if hasattr(qimage, 'setDevicePixelRatio'):
# Not available on Qt4 or some older Qt5.
qimage.setDevicePixelRatio(self._dpi_ratio)
origin = QtCore.QPoint(l, self.renderer.height - t)
painter.drawImage(origin / self._dpi_ratio, qimage)
# 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:
ctypes.c_long.from_address(id(buf)).value = 1

self._draw_rect_callback(painter)

Expand Down
10 changes: 7 additions & 3 deletions lib/matplotlib/backends/backend_qt5cairo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from . import backend_cairo # Keep the RendererCairo class swappable.
from .backend_qt5 import QtCore, QtGui, _BackendQT5, FigureCanvasQT
from .qt_compat import QT_API


class FigureCanvasQTCairo(FigureCanvasQT):
Expand All @@ -13,11 +14,14 @@ def paintEvent(self, event):
surface = backend_cairo.cairo.ImageSurface(
backend_cairo.cairo.FORMAT_ARGB32, width, height)
self._renderer.set_ctx_from_surface(surface)
# This should be really done by set_ctx_from_surface...
self._renderer.set_width_height(width, height)
self.figure.draw(self._renderer)
qimage = QtGui.QImage(surface.get_data(), width, height,
buf = surface.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:
ctypes.c_long.from_address(id(buf)).value = 1
painter = QtGui.QPainter(self)
painter.drawImage(0, 0, qimage)
self._draw_rect_callback(painter)
Expand Down