From 6ac2227faeef4a9b3f82ad87e1d039f5f51805be Mon Sep 17 00:00:00 2001 From: Jeff Schiller Date: Tue, 23 Jun 2009 05:17:53 +0000 Subject: [PATCH] Fix Issue 27: Allow resizing of all elements except text, properly compute new sizes, shuffled some code around git-svn-id: http://svg-edit.googlecode.com/svn/trunk@173 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.js | 6 + editor/svgcanvas.js | 281 +++++++++++++++++++++++++++++-------------- 2 files changed, 195 insertions(+), 92 deletions(-) diff --git a/editor/svg-editor.js b/editor/svg-editor.js index ea5c538f..d3d5ac43 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -1,3 +1,9 @@ +if(!window.console) { + window.console = new function() { + this.log = function(str) {}; + this.dir = function(str) {}; + }; +} var palette = ["#000000","#202020","#404040","#606060","#808080","#a0a0a0","#c0c0c0","#e0e0e0","#ffffff","#800000","#ff0000","#808000","#ffff00","#008000","#00ff00","#008080","#00ffff","#000080","#0000ff","#800080","#ff00ff","#2b0000","#550000","#800000","#aa0000","#d40000","#ff0000","#ff2a2a","#ff5555","#ff8080","#ffaaaa","#ffd5d5","#280b0b","#501616","#782121","#a02c2c","#c83737","#d35f5f","#de8787","#e9afaf","#f4d7d7","#241c1c","#483737","#6c5353","#916f6f","#ac9393","#c8b7b7","#e3dbdb","#2b1100","#552200","#803300","#aa4400","#d45500","#ff6600","#ff7f2a","#ff9955","#ffb380","#ffccaa","#ffe6d5","#28170b","#502d16","#784421","#a05a2c","#c87137","#d38d5f","#deaa87","#e9c6af","#f4e3d7","#241f1c","#483e37","#6c5d53","#917c6f","#ac9d93","#c8beb7","#e3dedb","#2b2200","#554400","#806600","#aa8800","#d4aa00","#ffcc00","#ffd42a","#ffdd55","#ffe680","#ffeeaa","#fff6d5","#28220b","#504416","#786721","#a0892c","#c8ab37","#d3bc5f","#decd87","#e9ddaf","#f4eed7","#24221c","#484537","#6c6753","#918a6f","#aca793","#c8c4b7","#e3e2db","#222b00","#445500","#668000","#88aa00","#aad400","#ccff00","#d4ff2a","#ddff55","#e5ff80","#eeffaa","#f6ffd5","#22280b","#445016","#677821","#89a02c","#abc837","#bcd35f","#cdde87","#dde9af","#eef4d7","#22241c","#454837","#676c53","#8a916f","#a7ac93","#c4c8b7","#e2e3db","#112b00","#225500","#338000","#44aa00","#55d400","#66ff00","#7fff2a","#99ff55","#b3ff80","#ccffaa","#e5ffd5","#17280b","#2d5016","#447821","#5aa02c","#71c837","#8dd35f","#aade87","#c6e9af","#e3f4d7","#1f241c","#3e4837","#5d6c53","#7c916f","#9dac93","#bec8b7","#dee3db","#002b00","#005500","#008000","#00aa00","#00d400","#00ff00","#2aff2a","#55ff55","#80ff80","#aaffaa","#d5ffd5","#0b280b","#165016","#217821","#2ca02c","#37c837","#5fd35f","#87de87","#afe9af","#d7f4d7","#1c241c","#374837","#536c53","#6f916f","#93ac93","#b7c8b7","#dbe3db","#002b11","#005522","#008033","#00aa44","#00d455","#00ff66","#2aff80","#55ff99","#80ffb3","#aaffcc","#d5ffe6","#0b2817","#16502d","#217844","#2ca05a","#37c871","#5fd38d","#87deaa","#afe9c6","#d7f4e3","#1c241f","#37483e","#536c5d","#6f917c","#93ac9d","#b7c8be","#dbe3de","#002b22","#005544","#008066","#00aa88","#00d4aa","#00ffcc","#2affd5","#55ffdd","#80ffe6","#aaffee","#d5fff6","#0b2822","#165044","#217867","#2ca089","#37c8ab","#5fd3bc","#87decd","#afe9dd","#d7f4ee","#1c2422","#374845","#536c67","#6f918a","#93aca7","#b7c8c4","#dbe3e2","#00222b","#004455","#006680","#0088aa","#00aad4","#00ccff","#2ad4ff","#55ddff","#80e5ff","#aaeeff","#d5f6ff","#0b2228","#164450","#216778","#2c89a0","#37abc8","#5fbcd3","#87cdde","#afdde9","#d7eef4","#1c2224","#374548","#53676c","#6f8a91","#93a7ac","#b7c4c8","#dbe2e3","#00112b","#002255","#003380","#0044aa","#0055d4","#0066ff","#2a7fff","#5599ff","#80b3ff","#aaccff","#d5e5ff","#0b1728","#162d50","#214478","#2c5aa0","#3771c8","#5f8dd3","#87aade","#afc6e9","#d7e3f4","#1c1f24","#373e48","#535d6c","#6f7c91","#939dac","#b7bec8","#dbdee3","#00002b","#000055","#000080","#0000aa","#0000d4","#0000ff","#2a2aff","#5555ff","#8080ff","#aaaaff","#d5d5ff","#0b0b28","#161650","#212178","#2c2ca0","#3737c8","#5f5fd3","#8787de","#afafe9","#d7d7f4","#1c1c24","#373748","#53536c","#6f6f91","#9393ac","#b7b7c8","#dbdbe3","#11002b","#220055","#330080","#4400aa","#5500d4","#6600ff","#7f2aff","#9955ff","#b380ff","#ccaaff","#e5d5ff","#170b28","#2d1650","#442178","#5a2ca0","#7137c8","#8d5fd3","#aa87de","#c6afe9","#e3d7f4","#1f1c24","#3e3748","#5d536c","#7c6f91","#9d93ac","#beb7c8","#dedbe3","#22002b","#440055","#660080","#8800aa","#aa00d4","#cc00ff","#d42aff","#dd55ff","#e580ff","#eeaaff","#f6d5ff","#220b28","#441650","#672178","#892ca0","#ab37c8","#bc5fd3","#cd87de","#ddafe9","#eed7f4","#221c24","#453748","#67536c","#8a6f91","#a793ac","#c4b7c8","#e2dbe3","#2b0022","#550044","#800066","#aa0088","#d400aa","#ff00cc","#ff2ad4","#ff55dd","#ff80e5","#ffaaee","#ffd5f6","#280b22","#501644","#782167","#a02c89","#c837ab","#d35fbc","#de87cd","#e9afdd","#f4d7ee","#241c22","#483745","#6c5367","#916f8a","#ac93a7","#c8b7c4","#e3dbe2","#2b0011","#550022","#800033","#aa0044","#d40055","#ff0066","#ff2a7f","#ff5599","#ff80b2","#ffaacc","#ffd5e5","#280b17","#50162d","#782144","#a02c5a","#c83771","#d35f8d","#de87aa","#e9afc6","#f4d7e3","#241c1f","#48373e","#6c535d","#916f7c","#ac939d","#c8b7be","#e3dbde"] function svg_edit_setup() { diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 314bb117..ae7909ae 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -1,5 +1,12 @@ var svgcanvas = null; +if(!window.console) { + window.console = new function() { + this.log = function(str) {}; + this.dir = function(str) {}; + }; +} + function SvgCanvas(c) { @@ -23,6 +30,7 @@ function SvgCanvas(c) var start_x = null; var start_y = null; var current_mode = "path"; + var current_resize_mode = "none"; var current_fill = "none"; var current_stroke = "black"; var current_stroke_width = 1; @@ -38,6 +46,7 @@ function SvgCanvas(c) var freehand_max_y = null; var selected = null; var selectedOutline = null; + var selectedBBox = null; var selectedGrips = { "nw":null, "n":null, "ne":null, @@ -130,6 +139,120 @@ function SvgCanvas(c) return out; } // end svgToString() + function recalculateSelectedDimensions() { + var box = selected.getBBox(); + // normalize selectedBBox + if (selectedBBox.width < 0) { + selectedBBox.x += selectedBBox.width; + selectedBBox.width = -selectedBBox.width; + } + if (selectedBBox.height < 0) { + selectedBBox.y += selectedBBox.height; + selectedBBox.height = -selectedBBox.height; + } + var remapx = function(x) {return ((x-box.x)/box.width)*selectedBBox.width + selectedBBox.x;} + var remapy = function(y) {return ((y-box.y)/box.height)*selectedBBox.height + selectedBBox.y;} + var scalew = function(w) {return w*selectedBBox.width/box.width;} + var scaleh = function(h) {return h*selectedBBox.height/box.height;} + + selected.removeAttribute("transform"); + switch (selected.tagName) + { + case "path": + // extract the x,y from the path, adjust it and write back the new path + var M = selected.pathSegList.getItem(0); + var curx = M.x, cury = M.y; + var newd = "M" + remapx(curx) + "," + remapy(cury); + for (var i = 1; i < selected.pathSegList.numberOfItems; ++i) { + var l = selected.pathSegList.getItem(i); + var x = l.x, y = l.y; + // webkit browsers normalize things and this becomes an absolute + // line segment! we need to turn this back into a rel line segment + // see https://bugs.webkit.org/show_bug.cgi?id=26487 + if (l.pathSegType == 4) { + x -= curx; + y -= cury; + curx += x; + cury += y; + } + // we only need to scale the relative coordinates (no need to translate) + newd += " l" + scalew(x) + "," + scaleh(y); + } + selected.setAttributeNS(null, "d", newd); + break; + case "line": + selected.x1.baseVal.value = remapx(selected.x1.baseVal.value); + selected.y1.baseVal.value = remapy(selected.y1.baseVal.value); + selected.x2.baseVal.value = remapx(selected.x2.baseVal.value); + selected.y2.baseVal.value = remapy(selected.y2.baseVal.value); + break; + case "circle": + selected.cx.baseVal.value = remapx(selected.cx.baseVal.value); + selected.cy.baseVal.value = remapy(selected.cy.baseVal.value); + // take the minimum of the new selected box's dimensions for the new circle radius + selected.r.baseVal.value = Math.min(selectedBBox.width/2,selectedBBox.height/2); + break; + case "ellipse": + selected.cx.baseVal.value = remapx(selected.cx.baseVal.value); + selected.cy.baseVal.value = remapy(selected.cy.baseVal.value); + selected.rx.baseVal.value = scalew(selected.rx.baseVal.value); + selected.ry.baseVal.value = scaleh(selected.ry.baseVal.value); + break; + case "text": + // cannot use x.baseVal.value here because x is a SVGLengthList + selected.setAttribute("x", remapx(selected.getAttribute("x"))); + selected.setAttribute("y", remapy(selected.getAttribute("y"))); + break; + case "rect": + selected.x.baseVal.value = remapx(selected.x.baseVal.value); + selected.y.baseVal.value = remapy(selected.y.baseVal.value); + selected.width.baseVal.value = scalew(selected.width.baseVal.value); + selected.height.baseVal.value = scaleh(selected.height.baseVal.value); + break; + default: // rect + console.log("Unknown shape type: " + selected.tagName); + break; + } + // fire changed event + call("changed", selected); + } + + var recalculateSelectedOutline = function() { + if (selected != null && selectedOutline != null) { + var bbox = selectedBBox; + var selectedBox = selectedOutline.firstChild; + var sw = parseInt(selected.getAttribute("stroke-width")); + var offset = 1; + if (!isNaN(sw)) { + offset += sw/2; + } + if (selected.tagName == "text") { + offset += 2; + } + var l=bbox.x-offset, t=bbox.y-offset, w=bbox.width+(offset<<1), h=bbox.height+(offset<<1); + selectedBox.x.baseVal.value = l; + selectedBox.y.baseVal.value = t; + selectedBox.width.baseVal.value = w; + selectedBox.height.baseVal.value = h; + selectedGrips.nw.cx.baseVal.value = l; + selectedGrips.nw.cy.baseVal.value = t; + selectedGrips.ne.cx.baseVal.value = l+w; + selectedGrips.ne.cy.baseVal.value = t; + selectedGrips.sw.cx.baseVal.value = l; + selectedGrips.sw.cy.baseVal.value = t+h; + selectedGrips.se.cx.baseVal.value = l+w; + selectedGrips.se.cy.baseVal.value = t+h; + selectedGrips.n.cx.baseVal.value = l+w/2; + selectedGrips.n.cy.baseVal.value = t; + selectedGrips.w.cx.baseVal.value = l; + selectedGrips.w.cy.baseVal.value = t+h/2; + selectedGrips.e.cx.baseVal.value = l+w; + selectedGrips.e.cy.baseVal.value = t+h/2; + selectedGrips.s.cx.baseVal.value = l+w/2; + selectedGrips.s.cy.baseVal.value = t+h; + } + } + // public events // call this function to set the selected element // call this function with null to clear the selected element @@ -149,6 +272,8 @@ function SvgCanvas(c) selected = newSelected; if (selected != null) { + selectedBBox = selected.getBBox(); + // we create this element for the first time here if (selectedOutline == null) { // create a group that will hold all the elements that make @@ -178,15 +303,20 @@ function SvgCanvas(c) // add the corner grips for (dir in selectedGrips) { + var cursType = (dir+"-resize"); selectedGrips[dir] = selectedOutline.appendChild( addSvgElementFromJson({ "element": "circle", "attr": { - "id": ("selected_"+dir+"_grip"), + "id": (dir+"_grip"), "fill": "blue", "r": 3, - "cursor": (dir+"-resize"), + "style": ("cursor:"+cursType), } }) ); + $('#'+selectedGrips[dir].id).mousedown( function() { + current_mode = "resize"; + current_resize_mode = this.id.substr(0,this.id.indexOf("_")); + }); } } // recalculate size and then re-append to bottom of document @@ -204,47 +334,17 @@ function SvgCanvas(c) current_font_size = selected.getAttribute("font-size"); current_font_family = selected.getAttribute("font-family"); } + + // do now show resize grips on text elements + var gripDisplay = (selected.tagName == "text" ? "none" : "inline"); + for (dir in selectedGrips) { + selectedGrips[dir].setAttribute("display", gripDisplay); + } } call("selected", selected); } - var recalculateSelectedOutline = function() { - if (selected != null && selectedOutline != null) { - var selectedBox = selectedOutline.firstChild; - var bbox = selected.getBBox(); - var sw = parseInt(selected.getAttribute("stroke-width")); - var offset = 1; - if (!isNaN(sw)) { - offset += sw/2; - } - if (selected.tagName == "text") { - offset += 2; - } - var l=bbox.x-offset, t=bbox.y-offset, w=bbox.width+(offset<<1), h=bbox.height+(offset<<1); - selectedBox.x.baseVal.value = l; - selectedBox.setAttribute("y", t); - selectedBox.setAttribute("width", w); - selectedBox.setAttribute("height", h); - selectedGrips.nw.cx.baseVal.value = l; - selectedGrips.nw.cy.baseVal.value = t; - selectedGrips.ne.cx.baseVal.value = l+w; - selectedGrips.ne.cy.baseVal.value = t; - selectedGrips.sw.cx.baseVal.value = l; - selectedGrips.sw.cy.baseVal.value = t+h; - selectedGrips.se.cx.baseVal.value = l+w; - selectedGrips.se.cy.baseVal.value = t+h; - selectedGrips.n.cx.baseVal.value = l+w/2; - selectedGrips.n.cy.baseVal.value = t; - selectedGrips.w.cx.baseVal.value = l; - selectedGrips.w.cy.baseVal.value = t+h/2; - selectedGrips.e.cx.baseVal.value = l+w; - selectedGrips.e.cy.baseVal.value = t+h/2; - selectedGrips.s.cx.baseVal.value = l+w/2; - selectedGrips.s.cy.baseVal.value = t+h; - } - } - var mouseDown = function(evt) { var x = evt.pageX - container.offsetLeft; @@ -261,6 +361,11 @@ function SvgCanvas(c) } selectElement(t); break; + case "resize": + started = true; + start_x = x; + start_y = y; + break; case "fhellipse": case "fhrect": case "path": @@ -287,6 +392,8 @@ function SvgCanvas(c) freehand_max_y = y; break; case "square": + // TODO: once we create the rect, we lose information that this was a square + // (for resizing purposes this is important) case "rect": started = true; start_x = x; @@ -407,10 +514,47 @@ function SvgCanvas(c) if (selected != null && selectedOutline != null) { var dx = x - start_x; var dy = y - start_y; - selected.setAttributeNS(null, "transform", "translate(" + dx + "," + dy + ")"); - selectedOutline.setAttributeNS(null, "transform", "translate(" + dx + "," + dy + ")"); + selectedBBox = selected.getBBox(); + selectedBBox.x += dx; + selectedBBox.y += dy; + var ts = "translate(" + dx + "," + dy + ")"; + selected.setAttribute("transform", ts); + recalculateSelectedOutline(); } break; + case "resize": + // we track the resize bounding box and translate/scale the selected element + // while the mouse is down, when mouse goes up, we use this to recalculate + // the shape's coordinates + var box=selected.getBBox(), left=box.x, top=box.y, width=box.width, + height=box.height, dx=(x-start_x), dy=(y-start_y); + var tx=0, ty=0, sx=1, sy=1; + var ts = null; + if(current_resize_mode.indexOf("n") != -1) { + ty = dy; + sy = (height-dy)/height; + } + else if(current_resize_mode.indexOf("s") != -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; + } + + selectedBBox.x = left+tx; + selectedBBox.y = top+ty; + selectedBBox.width = width*sx; + selectedBBox.height = height*sy; + + ts = "translate(" + (left+tx) + "," + (top+ty) + ") scale(" + (sx) + "," + (sy) + + ") translate(" + (-left) + "," + (-top) + ")"; + selected.setAttribute("transform", ts); + recalculateSelectedOutline(); + break; case "text": shape.setAttribute("x", x); shape.setAttribute("y", y); @@ -462,7 +606,7 @@ function SvgCanvas(c) break; } } - + var mouseUp = function(evt) { if (!started) return; @@ -472,59 +616,12 @@ function SvgCanvas(c) var keep = false; switch (current_mode) { + // fall-through to select here + case "resize": + current_mode = "select"; case "select": if (selected != null) { - var dx = evt.pageX - container.offsetLeft - start_x; - var dy = evt.pageY - container.offsetTop - start_y; - selected.removeAttribute("transform"); - selectedOutline.removeAttribute("transform"); - switch (selected.tagName) - { - case "path": - // extract the x,y from the path, adjust it and write back the new path - var M = selected.pathSegList.getItem(0); - var curx = M.x, cury = M.y; - var newd = "M" + (curx+dx) + "," + (cury+dy); - for (var i = 1; i < selected.pathSegList.numberOfItems; ++i) { - var l = selected.pathSegList.getItem(i); - var x = l.x, y = l.y; - // webkit browsers normalize things and this becomes an absolute - // line segment! we need to turn this back into a rel line segment - // see https://bugs.webkit.org/show_bug.cgi?id=26487 - if (l.pathSegType == 4) { - x -= curx; - y -= cury; - curx += x; - cury += y; - } - newd += " l" + x + "," + y; - } - selected.setAttributeNS(null, "d", newd); - break; - case "line": - var x1 = parseInt(selected.getAttributeNS(null, "x1")); - var y1 = parseInt(selected.getAttributeNS(null, "y1")); - var x2 = parseInt(selected.getAttributeNS(null, "x2")); - var y2 = parseInt(selected.getAttributeNS(null, "y2")); - selected.setAttributeNS(null, "x1", x1+dx); - selected.setAttributeNS(null, "y1", y1+dy); - selected.setAttributeNS(null, "x2", x2+dx); - selected.setAttributeNS(null, "y2", y2+dy); - break; - case "circle": - case "ellipse": - var cx = parseInt(selected.getAttributeNS(null, "cx")); - var cy = parseInt(selected.getAttributeNS(null, "cy")); - selected.setAttributeNS(null, "cx", cx+dx); - selected.setAttributeNS(null, "cy", cy+dy); - break; - default: // rect - var x = parseInt(selected.getAttributeNS(null, "x")); - var y = parseInt(selected.getAttributeNS(null, "y")); - selected.setAttributeNS(null, "x", x+dx); - selected.setAttributeNS(null, "y", y+dy); - break; - } + recalculateSelectedDimensions(); recalculateSelectedOutline(); // we return immediately from select so that the obj_num is not incremented return;