alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

work around recent GraphViz bug in SVG scaling

Browse source 
See https://gitlab.com/graphviz/graphviz/issues/1605.

* python/spot/aux.py (str_to_svg): Invert the scale parameters
if they are both greater than one.
This commit is contained in:
Alexandre Duret-Lutz 2019-10-19 15:40:00 +02:00
parent 0e681ed060
commit 44a79b1b89
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
python/spot/aux.py
View file

@ -27,6 +27,7 @@ import sys
import os import os
import errno import errno
import contextlib import contextlib
import re
def extend(*classes): def extend(*classes):
@ -44,6 +45,21 @@ def extend(*classes):
return wrap return wrap
# Work around a bug introduced in GraphViz 2.42.x, where the scale
# parameter is inverted. https://gitlab.com/graphviz/graphviz/issues/1605
# In our case, the scale parameters should both be <= 1, so we can
# detect when that is not the case.
svgscale_regex = re.compile('transform="scale\(([\d.]+) ([\d.]+)\) rotate')
def _gvfix(matchobj):
xs = float(matchobj.group(1))
ys = float(matchobj.group(2))
if xs >= 1 and ys >= 1:
xs = 1/xs
ys = 1/ys
return 'transform="scale({} {}) rotate'.format(xs, ys)
# Add a small LRU cache so that when we display automata into a # Add a small LRU cache so that when we display automata into a
# interactive widget, we avoid some repeated calls to dot for # interactive widget, we avoid some repeated calls to dot for
# identical inputs. # identical inputs.
@ -70,7 +86,8 @@ def str_to_svg(str):
ret = dot.wait() ret = dot.wait()
if ret: if ret:
raise subprocess.CalledProcessError(ret, 'dot') raise subprocess.CalledProcessError(ret, 'dot')
return stdout.decode('utf-8') out = stdout.decode('utf-8')
return svgscale_regex.sub(_gvfix, out)
def ostream_to_svg(ostr): def ostream_to_svg(ostr):