Commit 67f2bb5c authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Fix remaining incompatibilities with graphviz > 2.30

parent 995c8809
...@@ -420,7 +420,10 @@ def graphviz_draw(g, pos=None, size=(15, 15), pin=False, layout=None, ...@@ -420,7 +420,10 @@ def graphviz_draw(g, pos=None, size=(15, 15), pin=False, layout=None,
else: else:
vertices = g.vertices() vertices = g.vertices()
for v in vertices: for v in vertices:
n = libgv.agnode(gvg, str(int(v)).encode("utf8")) if gv_new_api:
n = libgv.agnode(gvg, str(int(v)).encode("utf8"))
else:
n = libgv.agnode(gvg, str(int(v)).encode("utf8"), True)
if type(vsize) == PropertyMap: if type(vsize) == PropertyMap:
vw = vh = vsize[v] vw = vh = vsize[v]
...@@ -467,9 +470,15 @@ def graphviz_draw(g, pos=None, size=(15, 15), pin=False, layout=None, ...@@ -467,9 +470,15 @@ def graphviz_draw(g, pos=None, size=(15, 15), pin=False, layout=None,
else: else:
edges = g.edges() edges = g.edges()
for e in edges: for e in edges:
ge = libgv.agedge(gvg, if gv_new_api:
libgv.agnode(gvg, str(int(e.source())).encode("utf8")), ge = libgv.agedge(gvg,
libgv.agnode(gvg, str(int(e.target())).encode("utf8"))) libgv.agnode(gvg, str(int(e.source())).encode("utf8"), False),
libgv.agnode(gvg, str(int(e.target())).encode("utf8"), False),
str(g.edge_index[e]).encode("utf8"), True)
else:
ge = libgv.agedge(gvg,
libgv.agnode(gvg, str(int(e.source())).encode("utf8")),
libgv.agnode(gvg, str(int(e.target())).encode("utf8")))
aset(ge, "arrowsize", "0.3") aset(ge, "arrowsize", "0.3")
if g.is_directed(): if g.is_directed():
aset(ge, "arrowhead", "vee") aset(ge, "arrowhead", "vee")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment