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

Rotated elements properly size while mouse down (still a bug when mouseup though) 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@448 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-08-22 19:08:01 +00:00
parent fa0ea55521
commit 96cc518072
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
editor/svgcanvas.js
View File

@ -1352,59 +1352,67 @@ function SvgCanvas(c)
// the shape's coordinates // the shape's coordinates
var box=canvas.getBBox(selected), left=box.x, top=box.y, width=box.width, var box=canvas.getBBox(selected), left=box.x, top=box.y, width=box.width,
height=box.height, dx=(x-start_x), dy=(y-start_y); height=box.height, dx=(x-start_x), dy=(y-start_y);
// if rotated, adjust the dx,dy values // if rotated, adjust the dx,dy values
console.log(box); console.log(box);
var angle = canvas.getRotationAngle(selected) * Math.PI / 180.0; var angle = canvas.getRotationAngle(selected);
if (angle) { if (angle) {
var r = Math.sqrt( dx*dx + dy*dy ); var r = Math.sqrt( dx*dx + dy*dy );
var theta = Math.atan2(dy,dx) - angle; var theta = Math.atan2(dy,dx) - angle * Math.PI / 180.0;
dx = r * Math.cos(theta); dx = r * Math.cos(theta);
dy = r * Math.sin(theta); dy = r * Math.sin(theta);
} }
var tx=0, ty=0, sx=1, sy=1; // if not stretching in y direction, set dy to 0
// if not stretching in x direction, set dx to 0
if(current_resize_mode.indexOf("n")==-1 && current_resize_mode.indexOf("s")==-1) {
dy = 0;
}
if(current_resize_mode.indexOf("e")==-1 && current_resize_mode.indexOf("w")==-1) {
dx = 0;
}
var ts = null; var ts = null;
var tx = 0, ty = 0;
var sy = (height+dy)/height, sx = (width+dx)/width;
if(current_resize_mode.indexOf("n") != -1) { if(current_resize_mode.indexOf("n") != -1) {
ty = dy;
sy = (height-dy)/height; sy = (height-dy)/height;
ty = height;
} }
else if(current_resize_mode.indexOf("s") != -1) { if(current_resize_mode.indexOf("w") != -1) {
sy = (height+dy)/height;
}
if(current_resize_mode.indexOf("e") != -1) {
sx = (width+dx)/width;
}
else if(current_resize_mode.indexOf("w") != -1) {
tx = dx;
sx = (width-dx)/width; sx = (width-dx)/width;
tx = width;
} }
var selectedBBox = selectedBBoxes[0];
var selectedBBox = selectedBBoxes[0]; // find the rotation transform and prepend it
selectedBBox.x = left+tx; var ts = [" translate(", (left+tx), ",", (top+ty), ") scale(", sx, ",", sy,
selectedBBox.y = top+ty; ") translate(", -(left+tx), ",", -(top+ty), ")"].join('');
if (angle) {
var cx = left + width/2;//selectedBBox.x + selectedBBox.width/2,
cy = top + height/2;//selectedBBox.y + selectedBBox.height/2;
ts = ["rotate(", angle, " ", cx, ",", cy, ")", ts].join('')
}
selected.setAttribute("transform", ts);
if (tx) {
selectedBBox.x = left+dx;
}
if (ty) {
selectedBBox.y = top+dy;
}
selectedBBox.width = width*sx; selectedBBox.width = width*sx;
selectedBBox.height = height*sy; selectedBBox.height = height*sy;
// normalize selectedBBox // normalize selectedBBox
if (selectedBBox.width < 0) { if (selectedBBox.width < 0) {
selectedBBox.x += selectedBBox.width; selectedBBox.x += selectedBBox.width;
selectedBBox.width = -selectedBBox.width; selectedBBox.width *= -1;//-selectedBBox.width;
} }
if (selectedBBox.height < 0) { if (selectedBBox.height < 0) {
selectedBBox.y += selectedBBox.height; selectedBBox.y += selectedBBox.height;
selectedBBox.height = -selectedBBox.height; selectedBBox.height *= -1;//-selectedBBox.height;
} }
// find the rotation transform and prepend it
var ts = [" translate(", (left+tx), ",", (top+ty), ") scale(", sx, ",", sy,
") translate(", -left, ",", -top, ")"].join('');
var angle = canvas.getRotationAngle(selected);
if (angle) {
var cx = selectedBBox.x + selectedBBox.width/2,
cy = selectedBBox.y + selectedBBox.height/2;
ts = ["rotate(", angle, " ", cx, ",", cy, ")", ts].join('')
}
selected.setAttribute("transform", ts);
selectorManager.requestSelector(selected).resize(selectedBBox); selectorManager.requestSelector(selected).resize(selectedBBox);
break; break;
case "text": case "text":