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

fixtransforms branch: Ensure rotations are re-centered 

git-svn-id: http://svg-edit.googlecode.com/svn/branches/fixtransforms@994 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-12-03 21:41:13 +00:00
parent 464b1580bf
commit 3cebabc86a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/svgcanvas.js
View File

@ -1479,6 +1479,7 @@ function BatchCommand(text) {
var box = canvas.getBBox(selected); var box = canvas.getBBox(selected);
var origcenter = {x: (box.x+box.width/2), y: (box.y+box.height/2)}; var origcenter = {x: (box.x+box.width/2), y: (box.y+box.height/2)};
var newcenter = {x: origcenter.x, y: origcenter.y}; var newcenter = {x: origcenter.x, y: origcenter.y};
var rotAngle = 0;
// This pass loop in reverse order and removes any translates or scales. // This pass loop in reverse order and removes any translates or scales.
// Once we hit our first rotate(), we will only remove translates. // Once we hit our first rotate(), we will only remove translates.
@ -1512,6 +1513,7 @@ function BatchCommand(text) {
// re-center the rotation, and determine the movement // re-center the rotation, and determine the movement
// offset required to keep the shape in the same place // offset required to keep the shape in the same place
if (origcenter.x != newcenter.x || origcenter.y != newcenter.y) { if (origcenter.x != newcenter.x || origcenter.y != newcenter.y) {
rotAngle = xform.angle;
var alpha = xform.angle * Math.PI / 180.0; var alpha = xform.angle * Math.PI / 180.0;
// determine where the new rotated center should be // determine where the new rotated center should be
@ -1530,9 +1532,6 @@ function BatchCommand(text) {
}; };
scalew = function(w) { return w; } scalew = function(w) { return w; }
scaleh = function(h) { return h; } scaleh = function(h) { return h; }
var newrot = svgroot.createSVGTransform();
newrot.setRotate(xform.angle, cx, cy);
tlist.replaceItem(newrot, n);
} }
break; break;
default: default:
@ -1635,11 +1634,16 @@ function BatchCommand(text) {
break; break;
} // switch on element type to get initial values } // switch on element type to get initial values
// if it wasn't a rotate, we have eliminated the transform, so remove it // we have eliminated the transform, so remove it
if (xform.type != 4) { tlist.removeItem(n);
tlist.removeItem(n);
}
} // looping for each transform } // looping for each transform
// we may need to insert a rotation back now
if (rotAngle != 0) {
var newrot = svgroot.createSVGTransform();
newrot.setRotate(xform.angle, newcenter.x, newcenter.y);
tlist.insertItemBefore(newrot, 0);
}
} // a non-group } // a non-group
// now we have a set of changes and an applied reduced transform list // now we have a set of changes and an applied reduced transform list