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

Fixed issue 543 and related problems resulting from reorienting paths 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1546 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-04-26 16:53:06 +00:00
parent c131014dfb
commit eeeec6fb12
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
editor/svgcanvas.js
View File

@ -541,8 +541,7 @@ function BatchCommand(text) {
} }
// loop and transform our bounding box until we reach our first rotation // loop and transform our bounding box until we reach our first rotation
var tlist = canvas.getTransformList(selected), var m = getMatrix(selected);
m = transformListToTransform(tlist).matrix;
// This should probably be handled somewhere else, but for now // This should probably be handled somewhere else, but for now
// it keeps the selection box correctly positioned when zoomed // it keeps the selection box correctly positioned when zoomed
@ -2804,17 +2803,11 @@ function BatchCommand(text) {
} }
return false; return false;
} }
// // Easy way to loop through transform list, but may not be worthwhile var getMatrix = function(elem) {
// var eachXform = function(elem, callback) { var tlist = canvas.getTransformList(elem);
// var tlist = canvas.getTransformList(elem); return transformListToTransform(tlist).matrix;
// var num = tlist.numberOfItems; }
// if(num == 0) return;
// while(num--) {
// var xform = tlist.getItem(num);
// callback(xform, tlist);
// }
// }
// FIXME: this should not have anything to do with zoom here - update the one place it is used this way // FIXME: this should not have anything to do with zoom here - update the one place it is used this way
// converts a tiny object equivalent of a SVGTransform // converts a tiny object equivalent of a SVGTransform
@ -3570,7 +3563,7 @@ function BatchCommand(text) {
var box = canvas.getBBox(selected), var box = canvas.getBBox(selected),
cx = box.x + box.width/2, cx = box.x + box.width/2,
cy = box.y + box.height/2, cy = box.y + box.height/2,
m = transformListToTransform(canvas.getTransformList(selected)).matrix, m = getMatrix(selected),
center = transformPoint(cx,cy,m); center = transformPoint(cx,cy,m);
cx = center.x; cx = center.x;
cy = center.y; cy = center.y;
@ -4215,8 +4208,8 @@ function BatchCommand(text) {
textbb = canvas.getBBox(curtext); textbb = canvas.getBBox(curtext);
if(xform) { if(xform) {
var tlist = canvas.getTransformList(curtext); var matrix = getMatrix(curtext);
var matrix = transformListToTransform(tlist).matrix;
imatrix = matrix.inverse(); imatrix = matrix.inverse();
// var tbox = transformBox(textbb.x, textbb.y, textbb.width, textbb.height, matrix); // var tbox = transformBox(textbb.x, textbb.y, textbb.width, textbb.height, matrix);
// transbb = { // transbb = {
@ -4766,8 +4759,7 @@ function BatchCommand(text) {
// Update position of all points // Update position of all points
this.update = function() { this.update = function() {
if(canvas.getRotationAngle(p.elem)) { if(canvas.getRotationAngle(p.elem)) {
var tlist = canvas.getTransformList(path.elem); p.matrix = getMatrix(path.elem);
p.matrix = transformListToTransform(tlist).matrix;
p.imatrix = p.matrix.inverse(); p.imatrix = p.matrix.inverse();
} }
@ -5410,10 +5402,17 @@ function BatchCommand(text) {
started = false; started = false;
if(subpath) { if(subpath) {
if(path.matrix) {
remapElement(newpath, {}, path.matrix.inverse());
}
var new_d = newpath.getAttribute("d"); var new_d = newpath.getAttribute("d");
var orig_d = $(path.elem).attr("d"); var orig_d = $(path.elem).attr("d");
$(path.elem).attr("d", orig_d + new_d); $(path.elem).attr("d", orig_d + new_d);
$(newpath).remove(); $(newpath).remove();
if(path.matrix) {
recalcRotatedPath();
}
path.init(); path.init();
pathActions.toEditMode(path.elem); pathActions.toEditMode(path.elem);
path.selectPt(); path.selectPt();
@ -5551,7 +5550,8 @@ function BatchCommand(text) {
this.resetOrientation(elem); this.resetOrientation(elem);
addCommandToHistory(batchCmd); addCommandToHistory(batchCmd);
getPath(elem).show(false); // Set matrix to null
getPath(elem).show(false).matrix = null;
this.clear(); this.clear();