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

More work on SVGEditTransformList - update now works properly with rotations around a point 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@892 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-11-01 20:55:01 +00:00
parent 57518c6087
commit eb85ba8061
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
editor/svgcanvas.js
View File

@ -593,10 +593,12 @@ function BatchCommand(text) {
var SVGEditTransformList = function(elem) { var SVGEditTransformList = function(elem) {
this._elem = elem || null; this._elem = elem || null;
this._xforms = []; this._xforms = [];
// TODO: how do we capture the undo-ability in the changed transform list?
this._update = function() { this._update = function() {
var tstr = ""; var tstr = "";
for (var i = 0; i < _this.numberOfItems; ++i) { var concatMatrix = svgroot.createSVGMatrix();
var xform = _this.getItem(i); for (var i = 0; i < this.numberOfItems; ++i) {
var xform = this._list.getItem(i);
var m = xform.matrix; var m = xform.matrix;
switch (xform.type) { switch (xform.type) {
case 2: // translate case 2: // translate
@ -606,30 +608,34 @@ function BatchCommand(text) {
if (m.a == m.d) tstr += "scale(" + m.a + ") "; if (m.a == m.d) tstr += "scale(" + m.a + ") ";
else tstr += "scale(" + m.a + "," + m.d + ") "; else tstr += "scale(" + m.a + "," + m.d + ") ";
break; break;
case 4: // rotate (with a translate?) case 4: // rotate (with a translate)
// TODO: can i get the center right here and now from bbox? var bbox = canvas.getBBox(this._elem);
tstr += "rotate(" + xform.angle + ") "; var K = 1 - m.a;
var ty = ( K * m.f + m.b*m.e ) / ( K*K + m.b*m.b );
var tx = ( m.e - m.b * ty ) / K;
console.log("wooo! tx=" + tx + ", ty=" + ty);
tstr += "rotate(" + xform.angle + " " + [tx,ty].join(",") + ") ";
break; break;
} }
} }
_this._elem.setAttribute("transform", tstr); this._elem.setAttribute("transform", tstr);
}; };
_this = this; this._list = this;
this.numberOfItems = 0; this.numberOfItems = 0;
this.clear = function() { this.clear = function() {
_this.numberOfItems = 0; this.numberOfItems = 0;
_this._xforms = []; this._xforms = [];
}; };
this.initialize = function(newItem) { this.initialize = function(newItem) {
_this.numberOfItems = 1; this.numberOfItems = 1;
_this._xforms = [newItem]; this._xforms = [newItem];
}; };
this.getItem = function(index) { this.getItem = function(index) {
if (index < _this.numberOfItems && index >= 0) { if (index < this.numberOfItems && index >= 0) {
return _this._xforms[index]; return this._xforms[index];
} }
return null; return null;
}; };
@ -637,23 +643,23 @@ function BatchCommand(text) {
this.insertItemBefore = function(newItem, index) { this.insertItemBefore = function(newItem, index) {
var retValue = null; var retValue = null;
if (index >= 0) { if (index >= 0) {
if (index < _this.numberOfItems) { if (index < this.numberOfItems) {
var newxforms = new Array(_this.numberOfItems + 1); var newxforms = new Array(this.numberOfItems + 1);
// TODO: use array copying and slicing // TODO: use array copying and slicing
for ( var i = 0; i < index; ++i) { for ( var i = 0; i < index; ++i) {
newxforms[i] = _this._xforms[i]; newxforms[i] = this._xforms[i];
} }
newxforms[i] = newItem; newxforms[i] = newItem;
for ( var j = i+1; i < _this.numberOfItems; ++j, ++i) { for ( var j = i+1; i < this.numberOfItems; ++j, ++i) {
newxforms[j] = _this._xforms[i]; newxforms[j] = this._xforms[i];
} }
_this.numberOfItems++; this.numberOfItems++;
_this._xforms = newxforms; this._xforms = newxforms;
retValue = newItem; retValue = newItem;
_this._update(); this._list._update();
} }
else { else {
retValue = _this.appendItem(newItem); retValue = this._list.appendItem(newItem);
} }
} }
return retValue; return retValue;
@ -661,36 +667,36 @@ function BatchCommand(text) {
this.replaceItem = function(newItem, index) { this.replaceItem = function(newItem, index) {
var retValue = null; var retValue = null;
if (index < _this.numberOfItems && index >= 0) { if (index < this.numberOfItems && index >= 0) {
_this._xforms[index] = newItem; this._xforms[index] = newItem;
retValue = newItem; retValue = newItem;
_this._update(); this._list._update();
} }
return retValue; return retValue;
}; };
this.removeItem = function(index) { this.removeItem = function(index) {
var retValue = null; var retValue = null;
if (index < _this.numberOfItems && index >= 0) { if (index < this.numberOfItems && index >= 0) {
var retValue = _this._xforms[index]; var retValue = this._xforms[index];
var newxforms = new Array(_this.numberOfItems - 1); var newxforms = new Array(this.numberOfItems - 1);
for (var i = 0; i < index; ++i) { for (var i = 0; i < index; ++i) {
newxforms[i] = _this._xforms[i]; newxforms[i] = this._xforms[i];
} }
for (var j = i; j < _this.numberOfItems-1; ++j, ++i) { for (var j = i; j < this.numberOfItems-1; ++j, ++i) {
newxforms[j] = _this._xforms[i+1]; newxforms[j] = this._xforms[i+1];
} }
_this.numberOfItems--; this.numberOfItems--;
_this._xforms = newxforms; this._xforms = newxforms;
_this._update(); this._list._update();
} }
return retValue; return retValue;
}; };
this.appendItem = function(newItem) { this.appendItem = function(newItem) {
_this._xforms.push(newItem); this._xforms.push(newItem);
_this.numberOfItems++; this.numberOfItems++;
_this._update(); this._list._update();
return newItem; return newItem;
}; };
}; };