zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixtransforms branch: Fix undo of transforms 

git-svn-id: http://svg-edit.googlecode.com/svn/branches/fixtransforms@1054 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-12-17 15:02:14 +00:00
parent c54d14f394
commit 48c4aa0e97
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/svgcanvas.js
View File

@ -1743,7 +1743,6 @@ function BatchCommand(text) {
} }
// else, it's a non-group // else, it's a non-group
else { else {
// TODO: it all seems to work now, but we need to make sure it's undo-able
var box = canvas.getBBox(selected); var box = canvas.getBBox(selected);
var oldcenter = {x: box.x+box.width/2, y: box.y+box.height/2}; var oldcenter = {x: box.x+box.width/2, y: box.y+box.height/2};
var newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2, var newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2,
@ -1769,10 +1768,9 @@ function BatchCommand(text) {
var operation = 0; var operation = 0;
var N = tlist.numberOfItems; var N = tlist.numberOfItems;
// first, if it was a scale then the second-last transform will be it // first, if it was a scale then the second-last transform will be the [S]
// if we had [M][T][S][T] we want to extract the matrix equivalent of // if we had [M][T][S][T] we want to extract the matrix equivalent of
// [T][S][T] and push it down // [T][S][T] and push it down to the element
console.log("N=" + N);
if (N >= 3 && tlist.getItem(N-2).type == 3 && if (N >= 3 && tlist.getItem(N-2).type == 3 &&
tlist.getItem(N-3).type == 2 && tlist.getItem(N-1).type == 2) tlist.getItem(N-3).type == 2 && tlist.getItem(N-1).type == 2)
{ {
@ -1783,7 +1781,8 @@ function BatchCommand(text) {
tlist.removeItem(N-3); tlist.removeItem(N-3);
} }
// if we had [T1][M] we want to transform this into [M][T2] // if we had [T1][M] we want to transform this into [M][T2]
// therefore [ T2 ] = [ M_inv ] [ T1 ] [ M ] // therefore [ T2 ] = [ M_inv ] [ T1 ] [ M ] and we can push [T2]
// down to the element
else if ( (N == 1 || (N > 1 && tlist.getItem(1).type != 3)) && else if ( (N == 1 || (N > 1 && tlist.getItem(1).type != 3)) &&
tlist.getItem(0).type == 2) tlist.getItem(0).type == 2)
{ {
@ -1794,17 +1793,22 @@ function BatchCommand(text) {
m = matrixMultiply( meq_inv, oldxlate, meq ); m = matrixMultiply( meq_inv, oldxlate, meq );
tlist.removeItem(0); tlist.removeItem(0);
} }
// if it was a rotation, put the rotate back and return without a command
// (this function has zero work to do for a rotate())
else { else {
operation = 4; // rotation operation = 4; // rotation
var newRot = svgroot.createSVGTransform(); var newRot = svgroot.createSVGTransform();
newRot.setRotate(angle,newcenter.x,newcenter.y); newRot.setRotate(angle,newcenter.x,newcenter.y);
tlist.insertItemBefore(newRot, 0); tlist.insertItemBefore(newRot, 0);
return null;
} }
// if it was a translate or resize, we need to remap the element and absorb the xform
if (operation == 2 || operation == 3) { if (operation == 2 || operation == 3) {
remapElement(selected,changes,m); remapElement(selected,changes,m);
} // if we are remapping } // if we are remapping
// if it was a translate, put back the rotate at the new center
if (operation == 2) { if (operation == 2) {
if (angle) { if (angle) {
var newRot = svgroot.createSVGTransform(); var newRot = svgroot.createSVGTransform();
@ -1815,7 +1819,7 @@ function BatchCommand(text) {
// [Rold][M][T][S][-T] became [Rold][M] // [Rold][M][T][S][-T] became [Rold][M]
// we want it to be [Rnew][M][Tr] where Tr is the // we want it to be [Rnew][M][Tr] where Tr is the
// translation required to re-center it // translation required to re-center it
// Therefore, [Tr][ = [M_inv][Rnew_inv][Rold][M] // Therefore, [Tr] = [M_inv][Rnew_inv][Rold][M]
else if (operation == 3) { else if (operation == 3) {
var m = transformListToTransform(tlist).matrix; var m = transformListToTransform(tlist).matrix;
var roldt = svgroot.createSVGTransform(); var roldt = svgroot.createSVGTransform();
@ -1837,7 +1841,6 @@ function BatchCommand(text) {
if (tlist.numberOfItems == 0) { if (tlist.numberOfItems == 0) {
selected.removeAttribute("transform"); selected.removeAttribute("transform");
} }
batchCmd.addSubCommand(new ChangeElementCommand(selected, initial)); batchCmd.addSubCommand(new ChangeElementCommand(selected, initial));
return batchCmd; return batchCmd;
@ -5490,8 +5493,7 @@ function BatchCommand(text) {
if (elem.tagName == "g" && (attr != "transform" && attr != "opacity")) continue; if (elem.tagName == "g" && (attr != "transform" && attr != "opacity")) continue;
var oldval = attr == "#text" ? elem.textContent : elem.getAttribute(attr); var oldval = attr == "#text" ? elem.textContent : elem.getAttribute(attr);
if (oldval == null) oldval = ""; if (oldval == null) oldval = "";
// TODO: determine why r877 changed this to !== which will means this if will always run if (oldval != String(newValue)) {
if (oldval !== newValue) {
if (attr == "#text") { if (attr == "#text") {
var old_w = canvas.getBBox(elem).width; var old_w = canvas.getBBox(elem).width;
elem.textContent = newValue; elem.textContent = newValue;