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

Merge pull request #31 from andersgb/acos-roundoff-fix 

Arc parsing round-off fix
pull/36/merge
Andy Port 2017-12-25 23:55:26 -05:00 committed by GitHub
parent c32c7a627b ec63d0c312
commit 50d7db0352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
svgpathtools/path.py
View File

@ -1300,10 +1300,13 @@ class Arc(object):
# delta is the angular distance of the arc (w.r.t the circle) # delta is the angular distance of the arc (w.r.t the circle)
# theta is the angle between the positive x'-axis and the start point # theta is the angle between the positive x'-axis and the start point
# on the circle # on the circle
u1_real_rounded = u1.real
if u1.real > 1 or u1.real < -1:
u1_real_rounded = round(u1.real)
if u1.imag > 0: if u1.imag > 0:
self.theta = degrees(acos(u1.real)) self.theta = degrees(acos(u1_real_rounded))
elif u1.imag < 0: elif u1.imag < 0:
self.theta = -degrees(acos(u1.real)) self.theta = -degrees(acos(u1_real_rounded))
else: else:
if u1.real > 0: # start is on pos u_x axis if u1.real > 0: # start is on pos u_x axis
self.theta = 0 self.theta = 0

28
test/test_parsing.py
View File

@ -137,3 +137,31 @@ class TestParser(unittest.TestCase):
def test_errors(self): def test_errors(self):
self.assertRaises(ValueError, parse_path, 'M 100 100 L 200 200 Z 100 200') self.assertRaises(ValueError, parse_path, 'M 100 100 L 200 200 Z 100 200')
def test_roundoff(self):
"""Paths with arc segments may have floating point round-off issues"""
path1 = parse_path("""
M160.172,102.95
L159.922,102.95
A0.025,0.025 0 0,1 159.897,102.925
L159.897,102.675
A0.025,0.025 0 0,1 159.922,102.65
L160.172,102.65
A0.025,0.025 0 0,1 160.197,102.675
L160.197,102.925
A0.025,0.025 0 0,1 160.172,102.95""")
path2 = Path(Line(start=(160.172 + 102.95j), end=(159.922 + 102.95j)),
Arc(start=(159.922 + 102.95j), radius=(0.025 + 0.025j), rotation=0.0,
large_arc=False, sweep=True, end=(159.897 + 102.925j)),
Line(start=(159.897 + 102.925j), end=(159.897 + 102.675j)),
Arc(start=(159.897 + 102.675j), radius=(0.025 + 0.025j), rotation=0.0,
large_arc=False, sweep=True, end=(159.922 + 102.65j)),
Line(start=(159.922 + 102.65j), end=(160.172 + 102.65j)),
Arc(start=(160.172 + 102.65j), radius=(0.025 + 0.025j), rotation=0.0,
large_arc=False, sweep=True, end=(160.197 + 102.675j)),
Line(start=(160.197 + 102.675j), end=(160.197 + 102.925j)),
Arc(start=(160.197 + 102.925j), radius=(0.025 + 0.025j), rotation=0.0,
large_arc=False, sweep=True, end=(160.172 + 102.95j)))
self.assertEqual(path1, path2)