zcy
/
svgpathtools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for units and handle mindim=None correctly. (#149) 

* add support for units and handle mindim=None correctly.

* Move baseunit positional argument to the end to avoid disruption.
pull/98/head
Nathan Hurst 2021-05-10 21:09:58 -07:00 committed by GitHub
parent 3a1fe8695d
commit a0fc28849c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
svgpathtools/paths2svg.py
View File

@ -100,7 +100,7 @@ def disvg(paths=None, colors=None, filename=None, stroke_widths=None,
mindim=600, dimensions=None, viewbox=None, text=None, mindim=600, dimensions=None, viewbox=None, text=None,
text_path=None, font_size=None, attributes=None, text_path=None, font_size=None, attributes=None,
svg_attributes=None, svgwrite_debug=False, svg_attributes=None, svgwrite_debug=False,
paths2Drawing=False): paths2Drawing=False, baseunit='px'):
"""Creates (and optionally displays) an SVG file. """Creates (and optionally displays) an SVG file.
REQUIRED INPUTS: REQUIRED INPUTS:
@ -313,12 +313,16 @@ def disvg(paths=None, colors=None, filename=None, stroke_widths=None,
dy += 2*margin_size*dy + extra_space_for_style dy += 2*margin_size*dy + extra_space_for_style
viewbox = "%s %s %s %s" % (xmin, ymin, dx, dy) viewbox = "%s %s %s %s" % (xmin, ymin, dx, dy)
if dx > dy: if mindim is None:
szx = str(mindim) + 'px' szx = "{}{}".format(dx, baseunit)
szy = str(int(ceil(mindim * dy / dx))) + 'px' szy = "{}{}".format(dy, baseunit)
else: else:
szx = str(int(ceil(mindim * dx / dy))) + 'px' if dx > dy:
szy = str(mindim) + 'px' szx = str(mindim) + baseunit
szy = str(int(ceil(mindim * dy / dx))) + baseunit
else:
szx = str(int(ceil(mindim * dx / dy))) + baseunit
szy = str(mindim) + baseunit
dimensions = szx, szy dimensions = szx, szy
# Create an SVG file # Create an SVG file
@ -428,7 +432,7 @@ def wsvg(paths=None, colors=None, filename=None, stroke_widths=None,
mindim=600, dimensions=None, viewbox=None, text=None, mindim=600, dimensions=None, viewbox=None, text=None,
text_path=None, font_size=None, attributes=None, text_path=None, font_size=None, attributes=None,
svg_attributes=None, svgwrite_debug=False, svg_attributes=None, svgwrite_debug=False,
paths2Drawing=False): paths2Drawing=False, baseunit='px'):
"""Create SVG and write to disk. """Create SVG and write to disk.
Note: This is identical to `disvg()` except that `openinbrowser` Note: This is identical to `disvg()` except that `openinbrowser`
@ -447,7 +451,7 @@ def wsvg(paths=None, colors=None, filename=None, stroke_widths=None,
text_path=text_path, font_size=font_size, text_path=text_path, font_size=font_size,
attributes=attributes, svg_attributes=svg_attributes, attributes=attributes, svg_attributes=svg_attributes,
svgwrite_debug=svgwrite_debug, svgwrite_debug=svgwrite_debug,
paths2Drawing=paths2Drawing) paths2Drawing=paths2Drawing, baseunit=baseunit)
def paths2Drawing(paths=None, colors=None, filename=None, def paths2Drawing(paths=None, colors=None, filename=None,
@ -456,7 +460,7 @@ def paths2Drawing(paths=None, colors=None, filename=None,
margin_size=0.1, mindim=600, dimensions=None, margin_size=0.1, mindim=600, dimensions=None,
viewbox=None, text=None, text_path=None, viewbox=None, text=None, text_path=None,
font_size=None, attributes=None, svg_attributes=None, font_size=None, attributes=None, svg_attributes=None,
svgwrite_debug=False, paths2Drawing=True): svgwrite_debug=False, paths2Drawing=True, baseunit='px'):
"""Create and return `svg.Drawing` object. """Create and return `svg.Drawing` object.
Note: This is identical to `disvg()` except that `paths2Drawing` Note: This is identical to `disvg()` except that `paths2Drawing`
@ -474,4 +478,4 @@ def paths2Drawing(paths=None, colors=None, filename=None,
text_path=text_path, font_size=font_size, text_path=text_path, font_size=font_size,
attributes=attributes, svg_attributes=svg_attributes, attributes=attributes, svg_attributes=svg_attributes,
svgwrite_debug=svgwrite_debug, svgwrite_debug=svgwrite_debug,
paths2Drawing=paths2Drawing) paths2Drawing=paths2Drawing, baseunit=baseunit)