Fixed issue with viewbox being written as tuple

pull/75/head
Andy Port 2018-10-13 19:50:33 -07:00
parent f77f94db5b
commit 7fa103e533
1 changed files with 11 additions and 4 deletions

View File

@ -144,9 +144,10 @@ def disvg(paths=None, colors=None,
this will override the mindim parameter. this will override the mindim parameter.
:param viewbox - This specifies what rectangular patch of R^2 will be :param viewbox - This specifies what rectangular patch of R^2 will be
viewable through the outputSVG. It should be input in the form viewable through the outputSVG. It should be input as a 4-tuple,
(min_x, min_y, width, height). This is different from the display (min_x, min_y, width, height), or a string "min_x min_y width height".
dimension of the svg, which can be set through mindim or dimensions. This is different from the display dimension of the svg, which can be
set through mindim or dimensions.
:param attributes - a list of dictionaries of attributes for the input :param attributes - a list of dictionaries of attributes for the input
paths. Note: This will override any other conflicting settings. paths. Note: This will override any other conflicting settings.
@ -174,12 +175,14 @@ def disvg(paths=None, colors=None,
names, or use a pause command (e.g. time.sleep(1)) between uses. names, or use a pause command (e.g. time.sleep(1)) between uses.
""" """
_default_relative_node_radius = 5e-3 _default_relative_node_radius = 5e-3
_default_relative_stroke_width = 1e-3 _default_relative_stroke_width = 1e-3
_default_path_color = '#000000' # black _default_path_color = '#000000' # black
_default_node_color = '#ff0000' # red _default_node_color = '#ff0000' # red
_default_font_size = 12 _default_font_size = 12
# append directory to filename (if not included) # append directory to filename (if not included)
if os_path.dirname(filename) == '': if os_path.dirname(filename) == '':
filename = os_path.join(getcwd(), filename) filename = os_path.join(getcwd(), filename)
@ -227,7 +230,11 @@ def disvg(paths=None, colors=None,
assert paths or nodes assert paths or nodes
stuff2bound = [] stuff2bound = []
if viewbox: if viewbox:
szx, szy = viewbox[2:4] if isinstance(viewbox, str):
szx, szy = viewbox.split(' ')[2:4]
else:
szx, szy = viewbox[2:4]
viewbox = '%s %s %s %s' % viewbox
else: else:
if paths: if paths:
stuff2bound += paths stuff2bound += paths