evert/svgcanvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. move back to image.getAttribute("src")

Browse Source 
2. save the original transform of C2S context in drawImage
This commit is contained in:
fuzhen 2015-12-18 09:59:13 +08:00
parent ef3ab241e6
commit 9dc92b79aa
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
canvas2svg.js
View File

@ -1071,7 +1071,7 @@
parent = this.__closestGroupOrSvg(); parent = this.__closestGroupOrSvg();
currentElement = this.__currentElement; currentElement = this.__currentElement;
var translateDirective = "translate(" + dx + ", " + dy + ")";
if(image instanceof ctx) { if(image instanceof ctx) {
//canvas2svg mock canvas context. In the future we may want to clone nodes instead. //canvas2svg mock canvas context. In the future we may want to clone nodes instead.
//also I'm currently ignoring dw, dh, sw, sh, sx, sy for a mock context. //also I'm currently ignoring dw, dh, sw, sh, sx, sy for a mock context.
@ -1085,7 +1085,15 @@
} }
group = svg.childNodes[1]; group = svg.childNodes[1];
if (group) { if (group) {
group.setAttribute("transform",["translate(",dx,",",dy,")"].join("")); //save original transform
var originTransform = group.getAttribute("transform");
var transformDirective;
if (originTransform) {
transformDirective = originTransform+" "+translateDirective;
} else {
transformDirective = translateDirective;
}
group.setAttribute("transform", transformDirective);
parent.appendChild(group); parent.appendChild(group);
} }
} }
@ -1105,9 +1113,9 @@
context.drawImage(image, sx, sy, sw, sh, 0, 0, dw, dh); context.drawImage(image, sx, sy, sw, sh, 0, 0, dw, dh);
image = canvas; image = canvas;
} }
svgImage.setAttribute("transform",["translate(",dx,",",dy,")"].join("")); svgImage.setAttribute("transform", translateDirective);
svgImage.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", svgImage.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",
image.nodeName === "CANVAS" ? image.toDataURL() : image.src); image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));
parent.appendChild(svgImage); parent.appendChild(svgImage);
} }
}; };
@ -1126,7 +1134,7 @@
img.setAttribute("width", image.width); img.setAttribute("width", image.width);
img.setAttribute("height", image.height); img.setAttribute("height", image.height);
img.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", img.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",
image.nodeName === "CANVAS" ? image.toDataURL() : image.src); image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));
pattern.appendChild(img); pattern.appendChild(img);
this.__defs.appendChild(pattern); this.__defs.appendChild(pattern);
} else if(image instanceof ctx) { } else if(image instanceof ctx) {