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

fixtransforms branch: undo some damage I did to normal shapes being rotated/resized, but skewed+rotated shapes go back to jumping 

git-svn-id: http://svg-edit.googlecode.com/svn/branches/fixtransforms@1048 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-12-16 07:11:33 +00:00
parent 8d339e2613
commit 54e327b22b
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
editor/svgcanvas.js
View File

@ -1744,13 +1744,8 @@ function BatchCommand(text) {
// else, it's a non-group // else, it's a non-group
else { else {
var box = canvas.getBBox(selected); var box = canvas.getBBox(selected);
// TODO: fix this, it is not correct in the case of a skewed element
// - use transformBox?
// TODO: if a rotated, skewed element is moved, at first no problem
// however, if another element is selected, then back to the first element
// it will hop around...
var center = {x: (box.x+box.width/2), y: (box.y+box.height/2)}; var center = {x: (box.x+box.width/2), y: (box.y+box.height/2)};
var newcenter = transformPoint(center.x,center.y,transformListToTransform(tlist).matrix);//{x: center.x, y: center.y }; var newcenter = transformPoint(center.x,center.y,transformListToTransform(tlist).matrix);
var m = svgroot.createSVGMatrix(); var m = svgroot.createSVGMatrix();
// temporarily strip off the rotate // temporarily strip off the rotate
@ -1797,14 +1792,9 @@ function BatchCommand(text) {
} }
// if the shape was rotated, calculate what the center will be // if the shape was rotated, calculate what the center will be
var xcenter = null; var xcenter = {x:0, y:0};
if (angle) { if (angle) {
// calculate the new center from the translate if (operation == 3) {
if (operation == 2) {
// TODO: avoid this?
// newcenter = transformPoint(center.x,center.y,m);
}
else if (operation == 3) {
xcenter = transformPoint(center.x,center.y,m); xcenter = transformPoint(center.x,center.y,m);
} }
} }
@ -1822,24 +1812,14 @@ function BatchCommand(text) {
// at this point, the element looks exactly how we want it to look but its // at this point, the element looks exactly how we want it to look but its
// rotational center may be off in the case of a resize - we need to fix that // rotational center may be off in the case of a resize - we need to fix that
// TODO: if we get in here, I think there are problems if (false && angle && operation == 3) {
if (angle && operation == 3) {
box = canvas.getBBox(selected);
m = transformListToTransform(tlist).matrix;
// get its actual center
newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2, m);
// determine the resultant delta translate to re-center // determine the resultant delta translate to re-center
var dx = newcenter.x - xcenter.x, var dx = newcenter.x - xcenter.x,
dy = newcenter.y - xcenter.y; dy = newcenter.y - xcenter.y;
var delta = svgroot.createSVGMatrix().translate(dx,dy); var delta = svgroot.createSVGMatrix().translate(dx,dy);
console.log([dx,dy]);
remapElement(selected,changes,delta); remapElement(selected,changes,delta);
var newRot = svgroot.createSVGTransform();
newRot.setRotate(angle,newcenter.x,newcenter.y);
tlist.replaceItem(newRot,0);
} }
} // a non-group } // a non-group