zcy
/
svgpathtoolss
mirror of https://github.com/mathandy/svgpathtools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove need for scipy req

no-scipy-req
Andrew Port 2022-03-05 21:06:16 -08:00
parent 19df25b99b
commit 6db22d002a
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup.py
View File

@ -30,7 +30,8 @@ setup(name='svgpathtools',
download_url='{}/releases/download/{}/svgpathtools-{}-py2.py3-none-any.whl' download_url='{}/releases/download/{}/svgpathtools-{}-py2.py3-none-any.whl'
''.format(GITHUB, VERSION, VERSION), ''.format(GITHUB, VERSION, VERSION),
license='MIT', license='MIT',
install_requires=['numpy', 'svgwrite', 'scipy'], install_requires=['numpy', 'svgwrite'],
extras_require={'fast_accurate_lengths': ['scipy']},
platforms="OS Independent", platforms="OS Independent",
keywords=['svg', 'svg path', 'svg.path', 'bezier', 'parse svg path', 'display svg'], keywords=['svg', 'svg path', 'svg.path', 'bezier', 'parse svg path', 'display svg'],
classifiers=[ classifiers=[

20
svgpathtools/path.py
View File

@ -21,11 +21,17 @@ from numpy import sqrt, cos, sin, tan, arccos as acos, arcsin as asin, \
degrees, radians, log, pi, ceil degrees, radians, log, pi, ceil
from numpy import exp, sqrt as csqrt, angle as phase, isnan from numpy import exp, sqrt as csqrt, angle as phase, isnan
_length_error_default = 1e-12
_length_error_default_without_scipy = 1e-9
try: try:
from scipy.integrate import quad from scipy.integrate import quad
_quad_available = True _quad_available = True
except: except:
_quad_available = False _quad_available = False
warn("SciPy not found. `LENGTH_ERROR`, `ILENGTH_ERROR`, and "
"`ILENGTH_S_TOL` defaults will be set to {} to avoid slow "
"computations (normally {})."
"".format(_length_error_default_without_scipy, _length_error_default))
# Internal dependencies # Internal dependencies
from .bezier import (bezier_intersections, bezier_bounding_box, split_bezier, from .bezier import (bezier_intersections, bezier_bounding_box, split_bezier,
@ -50,13 +56,13 @@ FLOAT_RE = re.compile("[-+]?[0-9]*\.?[0-9]+(?:[eE][-+]?[0-9]+)?")
# path segment .length() parameters for arc length computation # path segment .length() parameters for arc length computation
LENGTH_MIN_DEPTH = 5 LENGTH_MIN_DEPTH = 5
LENGTH_ERROR = 1e-12 LENGTH_ERROR = _length_error_default if _quad_available else _length_error_default_without_scipy
USE_SCIPY_QUAD = True # for elliptic Arc segment arc length computation USE_SCIPY_QUAD = True # for Arc and CubicBezier length computation
# path segment .ilength() parameters for inverse arc length computation # path segment .ilength() parameters for inverse arc length computation
ILENGTH_MIN_DEPTH = 5 ILENGTH_MIN_DEPTH = 5
ILENGTH_ERROR = 1e-12 ILENGTH_ERROR = _length_error_default if _quad_available else _length_error_default_without_scipy
ILENGTH_S_TOL = 1e-12 ILENGTH_S_TOL = _length_error_default if _quad_available else _length_error_default_without_scipy
ILENGTH_MAXITS = 10000 ILENGTH_MAXITS = 10000
# compatibility/implementation related warnings and parameters # compatibility/implementation related warnings and parameters
@ -1189,7 +1195,7 @@ class CubicBezier(object):
return self._length_info['length'] return self._length_info['length']
# using scipy.integrate.quad is quick # using scipy.integrate.quad is quick
if _quad_available: if _quad_available and USE_SCIPY_QUAD:
s = quad(lambda tau: abs(self.derivative(tau)), t0, t1, s = quad(lambda tau: abs(self.derivative(tau)), t0, t1,
epsabs=error, limit=1000)[0] epsabs=error, limit=1000)[0]
else: else:
@ -1756,7 +1762,7 @@ class Arc(object):
h = hash(self) h = hash(self)
if self.segment_length_hash is None or self.segment_length_hash != h: if self.segment_length_hash is None or self.segment_length_hash != h:
self.segment_length_hash = h self.segment_length_hash = h
if _quad_available: if _quad_available and USE_SCIPY_QUAD:
self.segment_length = quad(lambda tau: abs(self.derivative(tau)), self.segment_length = quad(lambda tau: abs(self.derivative(tau)),
t0, t1, epsabs=error, limit=1000)[0] t0, t1, epsabs=error, limit=1000)[0]
else: else:
@ -1764,7 +1770,7 @@ class Arc(object):
self.point(t1), error, min_depth, 0) self.point(t1), error, min_depth, 0)
return self.segment_length return self.segment_length
if _quad_available: if _quad_available and USE_SCIPY_QUAD:
return quad(lambda tau: abs(self.derivative(tau)), t0, t1, return quad(lambda tau: abs(self.derivative(tau)), t0, t1,
epsabs=error, limit=1000)[0] epsabs=error, limit=1000)[0]
else: else: