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

Tiny bit of refactoring. Tentative removal of selectedBBoxes from svgcanvas.js 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2005 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2011-02-24 16:13:26 +00:00
parent 7575794281
commit 13cee8b672
2 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editor/path.js
View File

@ -879,7 +879,32 @@ svgedit.path.Path.prototype.update = function() {
return this; return this;
}; };
// TODO: This creates svgedit.path.getRotVals_ = function(x, y) {
dx = x - oldcx;
dy = y - oldcy;
// rotate the point around the old center
r = Math.sqrt(dx*dx + dy*dy);
theta = Math.atan2(dy,dx) + angle;
dx = r * Math.cos(theta) + oldcx;
dy = r * Math.sin(theta) + oldcy;
// dx,dy should now hold the actual coordinates of each
// point after being rotated
// now we want to rotate them around the new center in the reverse direction
dx -= newcx;
dy -= newcy;
r = Math.sqrt(dx*dx + dy*dy);
theta = Math.atan2(dy,dx) - angle;
return {'x':(r * Math.cos(theta) + newcx)/1,
'y':(r * Math.sin(theta) + newcy)/1};
};
svgedit.path.getPath_ = function(elem) { svgedit.path.getPath_ = function(elem) {
var p = pathData[elem.id]; var p = pathData[elem.id];
if(!p) p = pathData[elem.id] = new svgedit.path.Path(elem); if(!p) p = pathData[elem.id] = new svgedit.path.Path(elem);

118
editor/svgcanvas.js
View File

@ -517,7 +517,7 @@ var cur_text = all_properties.text,
cur_properties = cur_shape, cur_properties = cur_shape,
// Array with selected elements' Bounding box object // Array with selected elements' Bounding box object
selectedBBoxes = new Array(1), // selectedBBoxes = new Array(1),
// The DOM element that was just selected // The DOM element that was just selected
justSelected = null, justSelected = null,
@ -1013,7 +1013,7 @@ this.setRotationAngle = function(val, preventUndo) {
val = parseFloat(val); val = parseFloat(val);
var elem = selectedElements[0]; var elem = selectedElements[0];
var oldTransform = elem.getAttribute("transform"); var oldTransform = elem.getAttribute("transform");
var bbox = getBBox(elem); var bbox = svgedit.utilities.getBBox(elem);
var cx = bbox.x+bbox.width/2, cy = bbox.y+bbox.height/2; var cx = bbox.x+bbox.width/2, cy = bbox.y+bbox.height/2;
var tlist = getTransformList(elem); var tlist = getTransformList(elem);
@ -1105,7 +1105,7 @@ var remapElement = this.remapElement = function(selected,changes,m) {
if(doSnapping) for(var o in changes) changes[o] = snapToGrid(changes[o]); if(doSnapping) for(var o in changes) changes[o] = snapToGrid(changes[o]);
assignAttributes(selected, changes, 1000, true); assignAttributes(selected, changes, 1000, true);
} }
box = getBBox(selected); box = svgedit.utilities.getBBox(selected);
for(var i = 0; i < 2; i++) { for(var i = 0; i < 2; i++) {
var type = i === 0 ? 'fill' : 'stroke'; var type = i === 0 ? 'fill' : 'stroke';
@ -1553,7 +1553,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
// if it's a regular group, we have special processing to flatten transforms // if it's a regular group, we have special processing to flatten transforms
if ((selected.tagName == "g" && !gsvg) || selected.tagName == "a") { if ((selected.tagName == "g" && !gsvg) || selected.tagName == "a") {
var box = getBBox(selected), var box = svgedit.utilities.getBBox(selected),
oldcenter = {x: box.x+box.width/2, y: box.y+box.height/2}, oldcenter = {x: box.x+box.width/2, y: box.y+box.height/2},
newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2, newcenter = transformPoint(box.x+box.width/2, box.y+box.height/2,
transformListToTransform(tlist).matrix), transformListToTransform(tlist).matrix),
@ -1910,7 +1910,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
else { else {
// FIXME: box might be null for some elements (<metadata> etc), need to handle this // FIXME: box might be null for some elements (<metadata> etc), need to handle this
var box = getBBox(selected); var box = svgedit.utilities.getBBox(selected);
// Paths (and possbly other shapes) will have no BBox while still in <defs>, // Paths (and possbly other shapes) will have no BBox while still in <defs>,
// but we still may need to recalculate them (see issue 595). // but we still may need to recalculate them (see issue 595).
@ -2141,7 +2141,7 @@ var clearSelection = this.clearSelection = function(noCall) {
selectorManager.releaseSelector(elem); selectorManager.releaseSelector(elem);
selectedElements[i] = null; selectedElements[i] = null;
} }
selectedBBoxes[0] = null; // selectedBBoxes[0] = null;
} }
if(!noCall) call("selected", selectedElements); if(!noCall) call("selected", selectedElements);
}; };
@ -2171,7 +2171,7 @@ var addToSelection = this.addToSelection = function(elemsToAdd, showGrips) {
var i = elemsToAdd.length; var i = elemsToAdd.length;
while (i--) { while (i--) {
var elem = elemsToAdd[i]; var elem = elemsToAdd[i];
if (!elem || !getBBox(elem)) continue; if (!elem || !svgedit.utilities.getBBox(elem)) continue;
if(elem.tagName === 'a' && elem.childNodes.length === 1) { if(elem.tagName === 'a' && elem.childNodes.length === 1) {
// Make "a" element's child be the selected element // Make "a" element's child be the selected element
@ -2184,7 +2184,7 @@ var addToSelection = this.addToSelection = function(elemsToAdd, showGrips) {
selectedElements[j] = elem; selectedElements[j] = elem;
// only the first selectedBBoxes element is ever used in the codebase these days // only the first selectedBBoxes element is ever used in the codebase these days
if (j == 0) selectedBBoxes[j] = getBBox(elem); // if (j == 0) selectedBBoxes[0] = svgedit.utilities.getBBox(elem);
j++; j++;
var sel = selectorManager.requestSelector(elem); var sel = selectorManager.requestSelector(elem);
@ -2495,7 +2495,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
// Getting the BBox from the selection box, since we know we // Getting the BBox from the selection box, since we know we
// want to orient around it // want to orient around it
init_bbox = getBBox($('#selectedBox0')[0]); init_bbox = svgedit.utilities.getBBox($('#selectedBox0')[0]);
var bb = {}; var bb = {};
$.each(init_bbox, function(key, val) { $.each(init_bbox, function(key, val) {
bb[key] = val/current_zoom; bb[key] = val/current_zoom;
@ -2740,11 +2740,11 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
for (var i = 0; i < len; ++i) { for (var i = 0; i < len; ++i) {
var selected = selectedElements[i]; var selected = selectedElements[i];
if (selected == null) break; if (selected == null) break;
if (i==0) { // if (i==0) {
var box = getBBox(selected); // var box = svgedit.utilities.getBBox(selected);
// selectedBBoxes[i].x = box.x + dx; // selectedBBoxes[i].x = box.x + dx;
// selectedBBoxes[i].y = box.y + dy; // selectedBBoxes[i].y = box.y + dy;
} // }
// update the dummy transform in our transform list // update the dummy transform in our transform list
// to be a translate // to be a translate
@ -2813,7 +2813,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
// the shape's coordinates // the shape's coordinates
var tlist = getTransformList(selected), var tlist = getTransformList(selected),
hasMatrix = hasMatrixTransform(tlist), hasMatrix = hasMatrixTransform(tlist),
box=hasMatrix?init_bbox:getBBox(selected), box = hasMatrix ? init_bbox : svgedit.utilities.getBBox(selected),
left=box.x, top=box.y, width=box.width, 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);
@ -3057,7 +3057,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
break; break;
case "rotate": case "rotate":
var box = getBBox(selected), var box = svgedit.utilities.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 = getMatrix(selected), m = getMatrix(selected),
@ -3846,7 +3846,7 @@ var textActions = canvas.textActions = function() {
var xform = curtext.getAttribute('transform'); var xform = curtext.getAttribute('transform');
textbb = getBBox(curtext); textbb = svgedit.utilities.getBBox(curtext);
matrix = xform?getMatrix(curtext):null; matrix = xform?getMatrix(curtext):null;
@ -4026,11 +4026,11 @@ var pathActions = canvas.pathActions = function() {
// be optimized or even taken care of by recalculateDimensions // be optimized or even taken care of by recalculateDimensions
var recalcRotatedPath = function() { var recalcRotatedPath = function() {
var current_path = svgedit.path.path.elem; var current_path = svgedit.path.path.elem;
var angle = getRotationAngle(current_path, true); var angle = svgedit.utilities.getRotationAngle(current_path, true);
if(!angle) return; if(!angle) return;
selectedBBoxes[0] = svgedit.path.path.oldbbox; // selectedBBoxes[0] = svgedit.path.path.oldbbox;
var box = getBBox(current_path), var box = svgedit.utilities.getBBox(current_path),
oldbox = selectedBBoxes[0], oldbox = svgedit.path.path.oldbbox,//selectedBBoxes[0],
oldcx = oldbox.x + oldbox.width/2, oldcx = oldbox.x + oldbox.width/2,
oldcy = oldbox.y + oldbox.height/2, oldcy = oldbox.y + oldbox.height/2,
newcx = box.x + box.width/2, newcx = box.x + box.width/2,
@ -4045,30 +4045,6 @@ var pathActions = canvas.pathActions = function() {
newcx = r * Math.cos(theta) + oldcx; newcx = r * Math.cos(theta) + oldcx;
newcy = r * Math.sin(theta) + oldcy; newcy = r * Math.sin(theta) + oldcy;
var getRotVals = function(x, y) {
dx = x - oldcx;
dy = y - oldcy;
// rotate the point around the old center
r = Math.sqrt(dx*dx + dy*dy);
theta = Math.atan2(dy,dx) + angle;
dx = r * Math.cos(theta) + oldcx;
dy = r * Math.sin(theta) + oldcy;
// dx,dy should now hold the actual coordinates of each
// point after being rotated
// now we want to rotate them around the new center in the reverse direction
dx -= newcx;
dy -= newcy;
r = Math.sqrt(dx*dx + dy*dy);
theta = Math.atan2(dy,dx) - angle;
return {'x':(r * Math.cos(theta) + newcx)/1,
'y':(r * Math.sin(theta) + newcy)/1};
}
var list = current_path.pathSegList, var list = current_path.pathSegList,
i = list.numberOfItems; i = list.numberOfItems;
while (i) { while (i) {
@ -4077,23 +4053,23 @@ var pathActions = canvas.pathActions = function() {
type = seg.pathSegType; type = seg.pathSegType;
if(type == 1) continue; if(type == 1) continue;
var rvals = getRotVals(seg.x,seg.y), var rvals = svgedit.path.getRotVals_(seg.x,seg.y),
points = [rvals.x, rvals.y]; points = [rvals.x, rvals.y];
if(seg.x1 != null && seg.x2 != null) { if(seg.x1 != null && seg.x2 != null) {
c_vals1 = getRotVals(seg.x1, seg.y1); c_vals1 = svgedit.path.getRotVals_(seg.x1, seg.y1);
c_vals2 = getRotVals(seg.x2, seg.y2); c_vals2 = svgedit.path.getRotVals_(seg.x2, seg.y2);
points.splice(points.length, 0, c_vals1.x , c_vals1.y, c_vals2.x, c_vals2.y); points.splice(points.length, 0, c_vals1.x , c_vals1.y, c_vals2.x, c_vals2.y);
} }
svgedit.path.replacePathSeg(type, i, points); svgedit.path.replacePathSeg(type, i, points);
} // loop for each point } // loop for each point
box = getBBox(current_path); box = svgedit.utilities.getBBox(current_path);
selectedBBoxes[0].x = box.x; selectedBBoxes[0].y = box.y; // selectedBBoxes[0].x = box.x; selectedBBoxes[0].y = box.y;
selectedBBoxes[0].width = box.width; selectedBBoxes[0].height = box.height; // selectedBBoxes[0].width = box.width; selectedBBoxes[0].height = box.height;
// now we must set the new transform to be rotated around the new center // now we must set the new transform to be rotated around the new center
var R_nc = svgroot.createSVGTransform(), var R_nc = svgroot.createSVGTransform(),
tlist = getTransformList(current_path); tlist = svgedit.transformlist.getTransformList(current_path);
R_nc.setRotate((angle * 180.0 / Math.PI), newcx, newcy); R_nc.setRotate((angle * 180.0 / Math.PI), newcx, newcy);
tlist.replaceItem(R_nc,0); tlist.replaceItem(R_nc,0);
} }
@ -4506,7 +4482,7 @@ var pathActions = canvas.pathActions = function() {
current_mode = "pathedit"; current_mode = "pathedit";
clearSelection(); clearSelection();
svgedit.path.path.show(true).update(); svgedit.path.path.show(true).update();
svgedit.path.path.oldbbox = getBBox(svgedit.path.path.elem); svgedit.path.path.oldbbox = svgedit.utilities.getBBox(svgedit.path.path.elem);
subpath = false; subpath = false;
}, },
toSelectMode: function(elem) { toSelectMode: function(elem) {
@ -5592,7 +5568,7 @@ var convertGradients = this.convertGradients = function(elem) {
if(!elems.length) return; if(!elems.length) return;
// get object's bounding box // get object's bounding box
var bb = getBBox(elems[0]); var bb = svgedit.utilities.getBBox(elems[0]);
// This will occur if the element is inside a <defs> or a <symbol>, // This will occur if the element is inside a <defs> or a <symbol>,
// in which we shouldn't need to convert anyway. // in which we shouldn't need to convert anyway.
@ -6933,7 +6909,7 @@ var findDuplicateGradient = function(grad) {
}; };
function reorientGrads(elem, m) { function reorientGrads(elem, m) {
var bb = getBBox(elem); var bb = svgedit.utilities.getBBox(elem);
for(var i = 0; i < 2; i++) { for(var i = 0; i < 2; i++) {
var type = i === 0 ? 'fill' : 'stroke'; var type = i === 0 ? 'fill' : 'stroke';
var attrVal = elem.getAttribute(type); var attrVal = elem.getAttribute(type);
@ -7791,7 +7767,7 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
if (oldval == null) oldval = ""; if (oldval == null) oldval = "";
if (oldval !== String(newValue)) { if (oldval !== String(newValue)) {
if (attr == "#text") { if (attr == "#text") {
var old_w = getBBox(elem).width; var old_w = svgedit.utilities.getBBox(elem).width;
elem.textContent = newValue; elem.textContent = newValue;
// FF bug occurs on on rotated elements // FF bug occurs on on rotated elements
@ -7819,8 +7795,8 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
setHref(elem, newValue); setHref(elem, newValue);
} }
else elem.setAttribute(attr, newValue); else elem.setAttribute(attr, newValue);
if (i==0) // if (i==0)
selectedBBoxes[i] = getBBox(elem); // selectedBBoxes[0] = svgedit.utilities.getBBox(elem);
// Use the Firefox ffClone hack for text elements with gradients or // Use the Firefox ffClone hack for text elements with gradients or
// where other text attributes are changed. // where other text attributes are changed.
if(svgedit.browser.isGecko() && elem.nodeName === 'text' && /rotate/.test(elem.getAttribute('transform'))) { if(svgedit.browser.isGecko() && elem.nodeName === 'text' && /rotate/.test(elem.getAttribute('transform'))) {
@ -7852,7 +7828,7 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
// remove old rotate // remove old rotate
tlist.removeItem(n); tlist.removeItem(n);
var box = getBBox(elem); var box = svgedit.utilities.getBBox(elem);
var center = transformPoint(box.x+box.width/2, box.y+box.height/2, transformListToTransform(tlist).matrix); var center = transformPoint(box.x+box.width/2, box.y+box.height/2, transformListToTransform(tlist).matrix);
var cx = center.x, var cx = center.x,
cy = center.y; cy = center.y;
@ -8197,7 +8173,7 @@ var pushGroupProperties = this.pushGroupProperties = function(g, undoable) {
} }
// get child's old center of rotation // get child's old center of rotation
var cbox = getBBox(elem); var cbox = svgedit.utilities.getBBox(elem);
var ceqm = transformListToTransform(chtlist).matrix; var ceqm = transformListToTransform(chtlist).matrix;
var coldc = transformPoint(cbox.x+cbox.width/2, cbox.y+cbox.height/2,ceqm); var coldc = transformPoint(cbox.x+cbox.width/2, cbox.y+cbox.height/2,ceqm);
@ -8450,28 +8426,28 @@ this.moveSelectedElements = function(dx, dy, undoable) {
while (i--) { while (i--) {
var selected = selectedElements[i]; var selected = selectedElements[i];
if (selected != null) { if (selected != null) {
if (i==0) // if (i==0)
selectedBBoxes[i] = getBBox(selected); // selectedBBoxes[0] = svgedit.utilities.getBBox(selected);
var b = {}; // var b = {};
for(var j in selectedBBoxes[i]) b[j] = selectedBBoxes[i][j]; // for(var j in selectedBBoxes[i]) b[j] = selectedBBoxes[i][j];
selectedBBoxes[i] = b; // selectedBBoxes[i] = b;
var xform = svgroot.createSVGTransform(); var xform = svgroot.createSVGTransform();
var tlist = getTransformList(selected); var tlist = getTransformList(selected);
// dx and dy could be arrays // dx and dy could be arrays
if (dx.constructor == Array) { if (dx.constructor == Array) {
if (i==0) { // if (i==0) {
selectedBBoxes[i].x += dx[i]; // selectedBBoxes[0].x += dx[0];
selectedBBoxes[i].y += dy[i]; // selectedBBoxes[0].y += dy[0];
} // }
xform.setTranslate(dx[i],dy[i]); xform.setTranslate(dx[i],dy[i]);
} else { } else {
if (i==0) { // if (i==0) {
selectedBBoxes[i].x += dx; // selectedBBoxes[0].x += dx;
selectedBBoxes[i].y += dy; // selectedBBoxes[0].y += dy;
} // }
xform.setTranslate(dx,dy); xform.setTranslate(dx,dy);
} }