Page MenuHome
Differential D4318 Diff 13551 io_curve_svg/import_svg.py

Changeset View

Standalone View

View Options

io_curve_svg/import_svg.py

Context not available.
self._radius = (rx, ry) self._radius = (rx, ry)
def _appendCorner(self, spline, coord, firstTime, rounded): def _appendCorner(self, spline, coord, firstTime):
""" """
Append new corner to rectangle Append new corner to rectangle
""" """
handle = None handle = None
if len(coord) == 3:
if len(coord) == 4:
handle = self._transformCoord(coord[2]) handle = self._transformCoord(coord[2])
coord = (coord[0], coord[1]) co = self._transformCoord((coord[0], coord[1]))
else:
co = self._transformCoord(coord) co = self._transformCoord(coord)
if not firstTime: if not firstTime:
spline.bezier_points.add(1) spline.bezier_points.add(1)
bezt = spline.bezier_points[-1] bezt = spline.bezier_points[-1]
bezt.co = co bezt.co = co
if rounded: # correct bezier handles in rounded rectangles
if handle: if len(coord) == 4:
if coord[3] == 'R':
bezt.handle_left_type = 'VECTOR' bezt.handle_left_type = 'VECTOR'
bezt.handle_right_type = 'FREE' bezt.handle_right_type = 'FREE'
bezt.handle_right = handle bezt.handle_right = handle
else: else:
bezt.handle_left_type = 'FREE' bezt.handle_left_type = 'FREE'
bezt.handle_right_type = 'VECTOR' bezt.handle_right_type = 'VECTOR'
bezt.handle_left = co bezt.handle_left = handle
else: else:
bezt.handle_left_type = 'VECTOR' bezt.handle_left_type = 'VECTOR'
Context not available.
x, y = rect[0], rect[1] x, y = rect[0], rect[1]
w, h = rect[2], rect[3] w, h = rect[2], rect[3]
rx, ry = radius[0], radius[1] rx, ry = radius[0], radius[1]
rounded = False
if rx or ry: if rx or ry:
# #
Context not available.
# \ / # \ /
# \ / # \ /
# 5 _______ 4 # 5 _______ 4
#
# Optional third component -- right handle coord # correct bezier handles in rounded rectangles
coords = [(x + rx, y), # dconst is (4/3)*tan(pi/8) = 4*(sqrt(2)-1)/3 = 0.552284749831
(x + w - rx, y, (x + w, y)), dconst = 1 - 0.552284749831
JacquesLuckeUnsubmitted
Not Done
Inline Actions

I already commented on that like, I don't think it is necessary to precompute this constant. Better explain why that formula is correct.

JacquesLucke: I already commented on that like, I don't think it is necessary to precompute this constant.
(x + w, y + ry),
(x + w, y + h - ry, (x + w, y + h)), # third component -- right/left handle coord
(x + w - rx, y + h), coords = [(x + rx, y, (x + (dconst * rx), y), 'L'),
(x + rx, y + h, (x, y + h)), (x + w - rx, y, (x + w - (dconst * rx), y), 'R'),
(x, y + h - ry), (x + w, y + ry, (x + w, y + (ry * dconst) ), 'L'),
(x, y + ry, (x, y))] (x + w, y + h - ry, (x + w, y + h - (ry * dconst)), 'R'),
(x + w - rx, y + h, (x + w - (dconst * rx), y + h), 'L'), #4
rounded = True (x + rx, y + h, (x + (dconst * rx), y + h), 'R'),
(x, y + h - ry, (x, y + h - (ry * dconst)), 'L'),
(x, y + ry, (x, y + (ry * dconst)), 'R')]
else: else:
coords = [(x, y), (x + w, y), (x + w, y + h), (x, y + h)] coords = [(x, y), (x + w, y), (x + w, y + h), (x, y + h)]
firstTime = True firstTime = True
for coord in coords: for coord in coords:
self._appendCorner(spline, coord, firstTime, rounded) self._appendCorner(spline, coord, firstTime)
firstTime = False firstTime = False
SVGFinishCurve() SVGFinishCurve()
Context not available.