zcy
/
snap.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in transformation handling reported here: https://github.com/adobe-webplatform/Snap.svg/issues/42

master
Dmitry Baranovskiy 2013-10-20 14:59:06 +11:00
parent b29e12b387
commit dc1866045a
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/reference.html vendored
View File

@ -1566,7 +1566,7 @@ Parses given path string into an array of arrays of path segments
<span class="dr-description">path string or array of segments (in the last case it is returned straight away)</span></li>
</ol></div>
<p class="dr-returns"><strong class="dr-title">Returns:</strong> <em class="dr-type-array">array</em> <span class="dr-description">array of segments</span></p>
</div></section></article><article id="Snap.parseTransformString" class="Snap-parseTransformString-section"><header><h3 id="Snap.parseTransformString" class="dr-method">Snap.parseTransformString(TString)<a href="#Snap.parseTransformString" title="Link to this section" class="dr-hash">&#x2693;</a><a class="dr-sourceline" title="Go to line 1104 in the source" href="https://github.com/adobe-webplatform/savage/blob/master/src/svg.js#L1104">&#x27ad;</a></h3></header>
</div></section></article><article id="Snap.parseTransformString" class="Snap-parseTransformString-section"><header><h3 id="Snap.parseTransformString" class="dr-method">Snap.parseTransformString(TString)<a href="#Snap.parseTransformString" title="Link to this section" class="dr-hash">&#x2693;</a><a class="dr-sourceline" title="Go to line 1103 in the source" href="https://github.com/adobe-webplatform/savage/blob/master/src/svg.js#L1103">&#x27ad;</a></h3></header>
<section><div class="extra" id="Snap.parseTransformString-extra"></div><div class="dr-method"><p>Utility method
Parses given transform string into an array of transformations
</p>

8
dist/snap.svg-min.js vendored
View File

File diff suppressed because one or more lines are too long

26
dist/snap.svg.js vendored
View File

@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
// build: 2013-10-18
// build: 2013-10-20
// Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -2187,7 +2187,6 @@ Snap.parsePathString = function (pathString) {
pth.arr = Snap.path.clone(data);
return data;
};
// SIERRA Snap.parseTransformString(): I don't understand the string format.
/*\
* Snap.parseTransformString
[ method ]
@ -2249,11 +2248,6 @@ function svgTransform2string(tstr) {
var rgTransform = new RegExp("^[a-z][" + spaces + "]*-?\\.?\\d");
function transform2matrix(tstr, bbox) {
var tdata = parseTransformString(tstr),
deg = 0,
dx = 0,
dy = 0,
sx = 1,
sy = 1,
m = new Matrix;
if (tdata) {
for (var i = 0, ii = tdata.length; i < ii; i++) {
@ -2290,14 +2284,19 @@ function transform2matrix(tstr, bbox) {
} else {
m.rotate(t[1], t[2], t[3]);
}
deg += t[1];
}
} else if (command == "s") {
if (tlen == 2 || tlen == 3) {
bb = bb || bbox;
m.scale(t[1], t[tlen - 1], bb.x + bb.width / 2, bb.y + bb.height / 2);
sx *= t[1];
sy *= t[tlen - 1];
} else if (tlen == 4) {
if (absolute) {
x2 = inver.x(t[2], t[3]);
y2 = inver.y(t[2], t[3]);
m.scale(t[1], t[1], x2, y2);
} else {
m.scale(t[1], t[1], t[2], t[3]);
}
} else if (tlen == 5) {
if (absolute) {
x2 = inver.x(t[3], t[4]);
@ -2306,8 +2305,6 @@ function transform2matrix(tstr, bbox) {
} else {
m.scale(t[1], t[2], t[3], t[4]);
}
sx *= t[1];
sy *= t[2];
}
} else if (command == "m" && tlen == 7) {
m.add(t[1], t[2], t[3], t[4], t[5], t[6]);
@ -2332,12 +2329,15 @@ function extractTransform(el, tstr) {
}
tstr = svgTransform2string(tstr);
} else {
el._.transform = tstr;
if (!rgTransform.test(tstr)) {
tstr = svgTransform2string(tstr);
} else {
tstr = Str(tstr).replace(/\.{3}|\u2026/g, el._.transform || E);
}
if (is(tstr, "array")) {
tstr = Snap.path ? Snap.path.toString.call(tstr) : Str(tstr);
}
el._.transform = tstr;
}
var m = transform2matrix(tstr, el.getBBox(1));
if (doReturn) {

24
src/svg.js
View File

@ -1090,7 +1090,6 @@ Snap.parsePathString = function (pathString) {
pth.arr = Snap.path.clone(data);
return data;
};
// SIERRA Snap.parseTransformString(): I don't understand the string format.
/*\
* Snap.parseTransformString
[ method ]
@ -1152,11 +1151,6 @@ function svgTransform2string(tstr) {
var rgTransform = new RegExp("^[a-z][" + spaces + "]*-?\\.?\\d");
function transform2matrix(tstr, bbox) {
var tdata = parseTransformString(tstr),
deg = 0,
dx = 0,
dy = 0,
sx = 1,
sy = 1,
m = new Matrix;
if (tdata) {
for (var i = 0, ii = tdata.length; i < ii; i++) {
@ -1193,14 +1187,19 @@ function transform2matrix(tstr, bbox) {
} else {
m.rotate(t[1], t[2], t[3]);
}
deg += t[1];
}
} else if (command == "s") {
if (tlen == 2 || tlen == 3) {
bb = bb || bbox;
m.scale(t[1], t[tlen - 1], bb.x + bb.width / 2, bb.y + bb.height / 2);
sx *= t[1];
sy *= t[tlen - 1];
} else if (tlen == 4) {
if (absolute) {
x2 = inver.x(t[2], t[3]);
y2 = inver.y(t[2], t[3]);
m.scale(t[1], t[1], x2, y2);
} else {
m.scale(t[1], t[1], t[2], t[3]);
}
} else if (tlen == 5) {
if (absolute) {
x2 = inver.x(t[3], t[4]);
@ -1209,8 +1208,6 @@ function transform2matrix(tstr, bbox) {
} else {
m.scale(t[1], t[2], t[3], t[4]);
}
sx *= t[1];
sy *= t[2];
}
} else if (command == "m" && tlen == 7) {
m.add(t[1], t[2], t[3], t[4], t[5], t[6]);
@ -1235,12 +1232,15 @@ function extractTransform(el, tstr) {
}
tstr = svgTransform2string(tstr);
} else {
el._.transform = tstr;
if (!rgTransform.test(tstr)) {
tstr = svgTransform2string(tstr);
} else {
tstr = Str(tstr).replace(/\.{3}|\u2026/g, el._.transform || E);
}
if (is(tstr, "array")) {
tstr = Snap.path ? Snap.path.toString.call(tstr) : Str(tstr);
}
el._.transform = tstr;
}
var m = transform2matrix(tstr, el.getBBox(1));
if (doReturn) {