jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

further fixes to ellipse bounding box

Browse Source
This commit is contained in:
jan 2017-08-29 16:55:06 -07:00
parent 85e2c662cc
commit 3d89cd42a0
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
masque/shapes/arc.py
View File

@ -206,6 +206,18 @@ class Arc(Shape):
return [poly] return [poly]
def get_bounds(self) -> numpy.ndarray: def get_bounds(self) -> numpy.ndarray:
'''
Equation for rotated ellipse is
x = x0 + a * cos(t) * cos(rot) - b * sin(t) * sin(phi)
y = y0 + a * cos(t) * sin(rot) + b * sin(t) * cos(rot)
where t is our parameter.
Differentiating and solving for 0 slope wrt. t, we find
tan(t) = -+ b/a cot(phi)
where -+ is for x, y cases, so that's where the extrema are.
If the extrema are innaccessible due to arc constraints, check the arc endpoints instead.
'''
mins = [] mins = []
maxs = [] maxs = []
for sgn in (+1, -1): for sgn in (+1, -1):
@ -235,13 +247,18 @@ class Arc(Shape):
ynt = (ypt - pi) % (2 * pi) + a0_offset ynt = (ypt - pi) % (2 * pi) + a0_offset
# Points along coordinate axes # Points along coordinate axes
xr = numpy.sqrt((rx * cos_r) ** 2 + (ry * sin_r) ** 2) xs = rx * sin_r
yr = numpy.sqrt((rx * sin_r) ** 2 + (ry * cos_r) ** 2) yc = ry * cos_r
sin_ax = yc / (yc * yc + xs * xs)
cos_ax = xs / (yc * yc + xs * xs)
xr = rx * cos_r * cos_ax - ry * sin_r * sin_ax
yr = ry * sin_r * cos_ax + ry * cos_r * sin_ax
# Arc endpoints # Arc endpoints
xn, xp = sorted(rx * cos_r * cos_a - ry * sin_r * sin_a) xn, xp = sorted(rx * cos_r * cos_a - ry * sin_r * sin_a)
yn, yp = sorted(rx * sin_r * cos_a - ry * cos_r * sin_a) yn, yp = sorted(rx * sin_r * cos_a + ry * cos_r * sin_a)
# If
if a0 < xpt < a1: if a0 < xpt < a1:
xp = xr xp = xr