2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

optionally use PyGObject and pycario instead of pgi and cairocffi

Browse source 
pgi doesn't work with python 3.12, but PyGObject and pycario does work
This commit is contained in:
Jenny Danzmayr 2024-08-13 21:30:02 +02:00
parent aa49840806
commit f56b6416df
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/c3nav/mapdata/render/engines/svg.py
View file

@ -17,10 +17,16 @@ from c3nav.mapdata.render.engines.base import FillAttribs, RenderEngine, StrokeA
from c3nav.mapdata.utils.geometry import unwrap_geom from c3nav.mapdata.utils.geometry import unwrap_geom
if settings.SVG_RENDERER == 'rsvg': if settings.SVG_RENDERER == 'rsvg':
try:
import pgi import pgi
pgi.require_version('Rsvg', '2.0') pgi.require_version('Rsvg', '2.0')
import cairocffi
from pgi.repository import Rsvg from pgi.repository import Rsvg
import cairocffi as cairo
except ImportError:
import gi
gi.require_version('Rsvg', '2.0')
import cairo
from gi.repository import Rsvg
elif settings.SVG_RENDERER == 'rsvg-convert': elif settings.SVG_RENDERER == 'rsvg-convert':
from PIL import Image from PIL import Image
@ -106,8 +112,8 @@ class SVGEngine(RenderEngine):
if settings.SVG_RENDERER == 'rsvg': if settings.SVG_RENDERER == 'rsvg':
# create buffered surfaces # create buffered surfaces
buffered_surface = cairocffi.SVGSurface(None, self.buffered_width, self.buffered_height) buffered_surface = cairo.SVGSurface(None, self.buffered_width, self.buffered_height)
buffered_context = cairocffi.Context(buffered_surface) buffered_context = cairo.Context(buffered_surface)
# draw svg with rsvg # draw svg with rsvg
handle = Rsvg.Handle() handle = Rsvg.Handle()
@ -115,18 +121,21 @@ class SVGEngine(RenderEngine):
svg.render_cairo(buffered_context) svg.render_cairo(buffered_context)
# create cropped image # create cropped image
surface = buffered_surface.create_similar(cairocffi.CONTENT_COLOR, self.width, self.height) surface = buffered_surface.create_similar(cairo.CONTENT_COLOR, self.width, self.height)
context = cairocffi.Context(surface) context = cairo.Context(surface)
# set background color # set background color
context.set_source(cairocffi.SolidPattern(*self.background_rgb)) context.set_source(cairo.SolidPattern(*self.background_rgb))
context.paint() context.paint()
# paste buffered immage with offset # paste buffered immage with offset
context.set_source_surface(buffered_surface, -self.buffer, -self.buffer) context.set_source_surface(buffered_surface, -self.buffer, -self.buffer)
context.paint() context.paint()
return surface.write_to_png() f = io.BytesIO()
surface.write_to_png(f)
f.seek(0)
return f.read()
elif settings.SVG_RENDERER == 'rsvg-convert': elif settings.SVG_RENDERER == 'rsvg-convert':
p = subprocess.run(('rsvg-convert', '-b', self.background, '--format', 'png'), p = subprocess.run(('rsvg-convert', '-b', self.background, '--format', 'png'),

2
src/requirements/rsvg-pygobjet.txt Normal file
View file

@ -0,0 +1,2 @@
PyGObject==3.48.2
pycairo==1.26.1