marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed the transform optimizations, which were all broken (wrong arg order).

Browse source
This commit is contained in:
Johan Sundström 2011-02-21 01:13:56 -08:00
parent 438fd06952
commit c6a9336185
1 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

67
scour.py
View file

@ -2302,51 +2302,51 @@ def optimizeTransform(transform):
""" """
# if there's only one transformation and it's a matrix, # if there's only one transformation and it's a matrix,
# try to make it a shorter non-matrix transformation # try to make it a shorter non-matrix transformation
# NOTE: as matrix(a b c d e f) in SVG means the matrix:
# |¯ a c e ¯| make constants |¯ A1 A2 A3 ¯|
# | b d f | translating them | B1 B2 B3 |
# |_ 0 0 1 _| to more readable |_ 0 0 1 _|
if len(transform) == 1 and transform[0][0] == 'matrix': if len(transform) == 1 and transform[0][0] == 'matrix':
matrix = [A1, B1, A2, B2, A3, B3] = transform[0][1]
# |¯ 1 0 0 ¯| # |¯ 1 0 0 ¯|
# | 0 1 0 | Identity matrix (no transformation) # | 0 1 0 | Identity matrix (no transformation)
# |_ 0 0 1 _| # |_ 0 0 1 _|
if transform[0][1] == [1, 0, 0, 0, 1, 0]: if matrix == [1, 0, 0, 1, 0, 0]:
del transform[0] del transform[0]
# |¯ 1 0 X ¯| # |¯ 1 0 X ¯|
# | 0 1 Y | Translation by (X, Y). # | 0 1 Y | Translation by (X, Y).
# |_ 0 0 1 _| # |_ 0 0 1 _|
if (transform[0][1][0] == 1 and elif (A1 == 1 and A2 == 0
transform[0][1][1] == 0 and and B1 == 0 and B2 == 1):
transform[0][1][3] == 0 and transform[0] = ('translate', [A3, B3])
transform[0][1][4] == 1):
transform[0] = ('translate', [
transform[0][1][2], transform[0][1][5]
])
# |¯ X 0 0 ¯| # |¯ X 0 0 ¯|
# | 0 Y 0 | Scaling by (X, Y). # | 0 Y 0 | Scaling by (X, Y).
# |_ 0 0 1 _| # |_ 0 0 1 _|
elif (transform[0][1][1] == 0 and elif ( A2 == 0 and A3 == 0
transform[0][1][2] == 0 and and B1 == 0 and B3 == 0):
transform[0][1][3] == 0 and transform[0] = ('scale', [A1, B2])
transform[0][1][5] == 0):
transform[0] = ('scale', [
transform[0][1][0], transform[0][1][4]
])
# |¯ cos(A) -sin(A) 0 ¯| Rotation by angle A, # |¯ cos(A) -sin(A) 0 ¯| Rotation by angle A,
# | sin(A) cos(A) 0 | clockwise, about the origin. # | sin(A) cos(A) 0 | clockwise, about the origin.
# |_ 0 0 1 _| A is in degrees. # |_ 0 0 1 _| A is in degrees, [-180...180].
elif (transform[0][1][0] == transform[0][1][4] and elif (A1 == B2 and -1 <= A1 <= 1 and A3 == 0
transform[0][1][1] == -transform[0][1][3] and and -B1 == A2 and -1 <= B1 <= 1 and B3 == 0
transform[0][1][0] >= 0 and # as cos² A + sin² A == 1 and as decimal trig is approximate:
transform[0][1][0] <= 1 and and abs((B1 ** 2) + (A1 ** 2) - 1) < Decimal("1e-15")):
transform[0][1][3] == sqrt(1 - transform[0][1][0] ** 2) and [sin_A, cos_A] = [B1, A1]
transform[0][1][2] == 0 and # while asin(A) and acos(A) both only have an 180° range
transform[0][1][5] == 0): # the sign of sin(A) and cos(A) varies across quadrants,
transform[0] = ('rotate', [ # letting us hone in on the angle the matrix represents:
# What allows us to get the angle from the matrix # -- => < -90 | -+ => -90..0 | ++ => 0..90 | +- => >= 90
# is the inverse sine of sin(A), which is the 4th #
# matrix component, or the inverse cosine of cos(A), # http://en.wikipedia.org/wiki/File:Sine_cosine_plot.svg
# which is the 1st matrix component. I chose sin(A). # shows asin has the correct angle the middle quadrants:
# math.asin returns radians, so convert. A = Decimal(str(math.degrees(math.asin(sin_A))))
# SVG demands degrees. if cos_A < 0: # otherwise needs adjusting from the edges
Decimal(math.degrees(math.asin(transform[0][1][4]))) if sin_A < 0:
]) A = -180 - A
else:
A = 180 - A
transform[0] = ('rotate', [A])
# Simplify transformations where numbers are optional. # Simplify transformations where numbers are optional.
for singleTransform in transform: for singleTransform in transform:
@ -2435,7 +2435,10 @@ def optimizeTransforms(element, options) :
newVal = serializeTransform(transform) newVal = serializeTransform(transform)
if len(newVal) < len(val): if len(newVal) < len(val):
if len(newVal):
element.setAttribute(transformAttr, newVal) element.setAttribute(transformAttr, newVal)
else:
element.removeAttribute(transformAttr)
num += len(val) - len(newVal) num += len(val) - len(newVal)
for child in element.childNodes: for child in element.childNodes: