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

Fix rotation of resized groups for Firefox/WebKit, Opera still semi-broken 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@971 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-11-24 06:10:33 +00:00
parent 11ed30d303
commit 1387116be6
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/svgcanvas.js
View File

@ -1245,7 +1245,7 @@ function BatchCommand(text) {
var i = selectedElements.length; var i = selectedElements.length;
while(i--) { while(i--) {
var cmd = recalculateDimensions(selectedElements[i]);//,selectedBBoxes[i]); var cmd = recalculateDimensions(selectedElements[i]);
if (cmd) { if (cmd) {
batchCmd.addSubCommand(cmd); batchCmd.addSubCommand(cmd);
} }
@ -2729,6 +2729,11 @@ function BatchCommand(text) {
var box = canvas.getBBox(selected), var box = canvas.getBBox(selected),
cx = round(box.x + box.width/2), cx = round(box.x + box.width/2),
cy = round(box.y + box.height/2); cy = round(box.y + box.height/2);
var m = transformListToTransform(canvas.getTransformList(selected)).matrix;
logMatrix(m);
var center = transformPoint(cx,cy,m);
cx = center.x;
cy = center.y;
var angle = round(((Math.atan2(cy-y,cx-x) * (180/Math.PI))-90) % 360); var angle = round(((Math.atan2(cy-y,cx-x) * (180/Math.PI))-90) % 360);
canvas.setRotationAngle(angle<-180?(360+angle):angle, true); canvas.setRotationAngle(angle<-180?(360+angle):angle, true);
call("changed", selectedElements); call("changed", selectedElements);
@ -3356,7 +3361,7 @@ function BatchCommand(text) {
if (selectedElements[i] == null) break; if (selectedElements[i] == null) break;
if(selectedElements[i].tagName != 'g') { if(selectedElements[i].tagName != 'g') {
// Not needed for groups (incorrectly resizes elems), possibly not needed at all? // Not needed for groups (incorrectly resizes elems), possibly not needed at all?
selectorManager.requestSelector(selectedElements[i]).resize();//selectedBBoxes[i]); // TODO: remove box arg selectorManager.requestSelector(selectedElements[i]).resize();
} }
} }
} }
@ -3838,6 +3843,7 @@ function BatchCommand(text) {
// Returns: // Returns:
// This function returns false if the set was unsuccessful, true otherwise. // This function returns false if the set was unsuccessful, true otherwise.
this.setSvgString = function(xmlString) { this.setSvgString = function(xmlString) {
console.log(xmlString);
try { try {
// convert string into XML document // convert string into XML document
var newDoc = Utils.text2xml(xmlString); var newDoc = Utils.text2xml(xmlString);
@ -4884,8 +4890,6 @@ function BatchCommand(text) {
val = parseFloat(val); val = parseFloat(val);
var elem = selectedElements[0]; var elem = selectedElements[0];
var oldTransform = elem.getAttribute("transform"); var oldTransform = elem.getAttribute("transform");
// we use the actual element's bbox (not the calculated one) since the
// calculated bbox's center can change depending on the angle
var bbox = elem.getBBox(); var bbox = elem.getBBox();
var cx = round(bbox.x+bbox.width/2), cy = round(bbox.y+bbox.height/2); var cx = round(bbox.x+bbox.width/2), cy = round(bbox.y+bbox.height/2);
var tlist = canvas.getTransformList(elem); var tlist = canvas.getTransformList(elem);
@ -4896,14 +4900,16 @@ function BatchCommand(text) {
var xform = tlist.getItem(n); var xform = tlist.getItem(n);
if (xform.type == 4) { if (xform.type == 4) {
rotIndex = n; rotIndex = n;
// TODO: get the rotational center here?
tlist.removeItem(n); tlist.removeItem(n);
break; break;
} }
} }
// if we are not rotated yet, insert a dummy xform // if we are not rotated yet, insert a dummy xform
var m = transformListToTransform(tlist).matrix; var m = transformListToTransform(tlist).matrix;
var ctm = elem.getCTM();
var center = transformPoint(cx,cy,m); var center = transformPoint(cx,cy,m);
// console.log("before: " + elem.getAttribute("transform"));
// console.log([center.x,center.y]);
var newrot = svgroot.createSVGTransform(); var newrot = svgroot.createSVGTransform();
newrot.setRotate(val, center.x, center.y); newrot.setRotate(val, center.x, center.y);
tlist.insertItemBefore(newrot, rotIndex); tlist.insertItemBefore(newrot, rotIndex);
@ -4914,6 +4920,7 @@ function BatchCommand(text) {
elem.setAttribute("transform", oldTransform); elem.setAttribute("transform", oldTransform);
this.changeSelectedAttribute("transform",newTransform,selectedElements); this.changeSelectedAttribute("transform",newTransform,selectedElements);
} }
// console.log("after: " + elem.getAttribute("transform"));
var pointGripContainer = document.getElementById("pathpointgrip_container"); var pointGripContainer = document.getElementById("pathpointgrip_container");
if(elem.nodeName == "path" && pointGripContainer) { if(elem.nodeName == "path" && pointGripContainer) {
setPointContainerTransform(elem.getAttribute("transform")); setPointContainerTransform(elem.getAttribute("transform"));
@ -5080,7 +5087,7 @@ function BatchCommand(text) {
replacePathSeg(new_type, next_index, points); replacePathSeg(new_type, next_index, points);
addAllPointGripsToPath(); addAllPointGripsToPath();
recalculateDimensions(current_path);//, current_path.getBBox()); recalculateDimensions(current_path);
updateSegLine(true); updateSegLine(true);
batchCmd.addSubCommand(new ChangeElementCommand(current_path, {d: old_d})); batchCmd.addSubCommand(new ChangeElementCommand(current_path, {d: old_d}));
@ -5351,7 +5358,7 @@ function BatchCommand(text) {
elem.setAttribute("transform", ""); elem.setAttribute("transform", "");
} }
batchCmd.addSubCommand(new ChangeElementCommand(elem, changes)); batchCmd.addSubCommand(new ChangeElementCommand(elem, changes));
batchCmd.addSubCommand(recalculateDimensions(elem));//, childBox)); batchCmd.addSubCommand(recalculateDimensions(elem));
} }
} }
@ -5439,11 +5446,11 @@ function BatchCommand(text) {
tlist.appendItem(xform); tlist.appendItem(xform);
var cmd = recalculateDimensions(selected);//,selectedBBoxes[i]); var cmd = recalculateDimensions(selected);
if (cmd) { if (cmd) {
batchCmd.addSubCommand(cmd); batchCmd.addSubCommand(cmd);
} }
selectorManager.requestSelector(selected).resize();//selectedBBoxes[i]); selectorManager.requestSelector(selected).resize();
} }
} }
if (!batchCmd.isEmpty()) { if (!batchCmd.isEmpty()) {