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

update for issues 556, 569, 570, 571

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1586 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Will Schleter
2010-06-03 07:30:56 +00:00
parent f4f738d2bd
commit fbfe17eac9
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
editor/svg-editor.js
View File

@@ -45,7 +45,7 @@
imgPath: 'images/', imgPath: 'images/',
langPath: 'locale/', langPath: 'locale/',
extPath: 'extensions/', extPath: 'extensions/',
extensions: ['ext-arrows.js', 'ext-connector.js', 'ext-eyedropper.js'], extensions: ['ext-markers.js','ext-connector.js', 'ext-eyedropper.js'],
initTool: 'select', initTool: 'select',
wireframe: false wireframe: false
}, },
@@ -816,7 +816,7 @@
}); });
break; break;
case 'button-select': case 'button-select':
var html = '<div id="' + tool.id + '" class="dropdown toolset">' var html = '<div id="' + tool.id + '" class="dropdown toolset" title="' + tool.title + '">'
+ '<div id="cur_' + tool.id + '" class="icon_label"></div><button></button></div>'; + '<div id="cur_' + tool.id + '" class="icon_label"></div><button></button></div>';
var list = $('<ul id="' + tool.id + '_opts"></ul>').appendTo('#option_lists'); var list = $('<ul id="' + tool.id + '_opts"></ul>').appendTo('#option_lists');
@@ -827,6 +827,7 @@
btn_selects.push({ btn_selects.push({
elem: ('#' + tool.id), elem: ('#' + tool.id),
list: ('#' + tool.id + '_opts'), list: ('#' + tool.id + '_opts'),
title: tool.title,
callback: tool.events.change, callback: tool.events.change,
cur: ('#cur_' + tool.id) cur: ('#cur_' + tool.id)
}); });
@@ -883,7 +884,8 @@
icon = $('<img src="' + btn.icon + '">'); icon = $('<img src="' + btn.icon + '">');
} else { } else {
fallback_obj[id] = btn.icon; fallback_obj[id] = btn.icon;
placement_obj['#' + id] = btn.id; var svgicon = btn.svgicon?btn.svgicon:btn.id;
placement_obj['#' + id] = svgicon;
} }
var cls, parent; var cls, parent;
@@ -915,7 +917,8 @@
$('#' + btn.list + '_opts').append(button); $('#' + btn.list + '_opts').append(button);
if(btn.isDefault) { if(btn.isDefault) {
$('#cur_' + btn.list).append(button.children().clone()); $('#cur_' + btn.list).append(button.children().clone());
placement_obj['#cur_' + btn.list] = btn.id; var svgicon = btn.svgicon?btn.svgicon:btn.id;
placement_obj['#cur_' + btn.list] = svgicon;
} }
} else if(btn.includeWith) { } else if(btn.includeWith) {
// Add to flyout menu / make flyout menu // Add to flyout menu / make flyout menu
@@ -2333,7 +2336,7 @@
svgCanvas.setBackground(color, url); svgCanvas.setBackground(color, url);
} }
var setIcon = function(elem, icon_id, forcedSize) { var setIcon = Editor.setIcon = function(elem, icon_id, forcedSize) {
var icon = (typeof icon_id == 'string') ? $.getSvgIcon(icon_id).clone() : icon_id.clone(); var icon = (typeof icon_id == 'string') ? $.getSvgIcon(icon_id).clone() : icon_id.clone();
$(elem).empty().append(icon); $(elem).empty().append(icon);
if(forcedSize) { if(forcedSize) {

51
editor/svgcanvas.js
View File

@@ -3278,6 +3278,7 @@ function BatchCommand(text) {
}); });
}; };
// in this function we do not record any state changes yet (but we do update // in this function we do not record any state changes yet (but we do update
// any elements that are still being created, moved or resized on the canvas) // any elements that are still being created, moved or resized on the canvas)
// TODO: svgcanvas should just retain a reference to the image being dragged instead // TODO: svgcanvas should just retain a reference to the image being dragged instead
@@ -3308,10 +3309,7 @@ function BatchCommand(text) {
var dx = x - start_x; var dx = x - start_x;
var dy = y - start_y; var dy = y - start_y;
if(evt.shiftKey) { // restrict to movement up/down/left/right (WRS) if(evt.shiftKey) { var xya = snapToAngle(start_x,start_y,x,y); x=xya.x; y=xya.y; }
if (Math.abs(dx)>Math.abs(dy)) dy=0;
else dx=0;
}
if (dx != 0 || dy != 0) { if (dx != 0 || dy != 0) {
var len = selectedElements.length; var len = selectedElements.length;
@@ -3487,16 +3485,7 @@ function BatchCommand(text) {
var x2 = x; var x2 = x;
var y2 = y; var y2 = y;
if(evt.shiftKey) { if(evt.shiftKey) { var xya=Utils.snapToAngle(start_x,start_y,x2,y2); x2=xya.x; y2=xya.y; }
var snap = Math.PI/4; // 45 degrees
var diff_x = x - start_x;
var diff_y = y - start_y;
var angle = Math.atan2(diff_y,diff_x);
var dist = Math.sqrt(diff_x * diff_x + diff_y * diff_y);
var snapangle= Math.round(angle/snap)*snap;
x2 = start_x + dist*Math.cos(snapangle);
y2 = start_y + dist*Math.sin(snapangle);
}
shape.setAttributeNS(null, "x2", x2); shape.setAttributeNS(null, "x2", x2);
shape.setAttributeNS(null, "y2", y2); shape.setAttributeNS(null, "y2", y2);
@@ -3567,9 +3556,11 @@ function BatchCommand(text) {
x *= current_zoom; x *= current_zoom;
y *= current_zoom; y *= current_zoom;
if(evt.shiftKey) { // restrict path segments to horizontal/vertical (WRS) if(evt.shiftKey) {
if (Math.abs(start_x-x)>Math.abs(start_y-y)) {y=start_y; mouse_y=y;} var x1 = path.dragging?path.dragging[0]:start_x;
else {x=start_x; mouse_x=x;} var y1 = path.dragging?path.dragging[1]:start_y;
var xya=Utils.snapToAngle(x1,y1,x,y);
x=xya.x; y=xya.y;
} }
if(rubberBox && rubberBox.getAttribute('display') != 'none') { if(rubberBox && rubberBox.getAttribute('display') != 'none') {
@@ -3581,7 +3572,7 @@ function BatchCommand(text) {
},100); },100);
} }
pathActions.mouseMove(mouse_x, mouse_y); pathActions.mouseMove(x, y);
break; break;
case "textedit": case "textedit":
@@ -3610,9 +3601,9 @@ function BatchCommand(text) {
var angle = ((Math.atan2(cy-y,cx-x) * (180/Math.PI))-90) % 360; var angle = ((Math.atan2(cy-y,cx-x) * (180/Math.PI))-90) % 360;
if(evt.shiftKey) { // restrict rotations to nice angles (WRS) if(evt.shiftKey) { // restrict rotations to nice angles (WRS)
var snap = 45; var snap = 45;
angle= Math.round(angle/snap)*snap; angle= Math.round(angle/snap)*snap;
} }
canvas.setRotationAngle(angle<-180?(360+angle):angle, true); canvas.setRotationAngle(angle<-180?(360+angle):angle, true);
call("changed", selectedElements); call("changed", selectedElements);
@@ -5542,10 +5533,7 @@ function BatchCommand(text) {
var lastx = current_path_pts[len-2], lasty = current_path_pts[len-1]; var lastx = current_path_pts[len-2], lasty = current_path_pts[len-1];
if (evt.shiftKey) { // restrict to horizonontal/vertical (WRS) if(evt.shiftKey) { var xya=Utils.snapToAngle(lastx,lasty,x,y); x=xya.x; y=xya.y; }
if (Math.abs(x-lastx)>Math.abs(y-lasty)) y=lasty;
else x=lastx;
}
// we store absolute values in our path points array for easy checking above // we store absolute values in our path points array for easy checking above
current_path_pts.push(x); current_path_pts.push(x);
@@ -9437,6 +9425,19 @@ var Utils = {
(r2.y+r2.height) > r1.y; (r2.y+r2.height) > r1.y;
}, },
"snapToAngle": function(x1,y1,x2,y2) {
var snap = Math.PI/4; // 45 degrees
var dx = x2 - x1;
var dy = y2 - y1;
var angle = Math.atan2(dy,dx);
var dist = Math.sqrt(dx * dx + dy * dy);
var snapangle= Math.round(angle/snap)*snap;
var x = x1 + dist*Math.cos(snapangle);
var y = y1 + dist*Math.sin(snapangle);
//console.log(x1,y1,x2,y2,x,y,angle)
return {x:x, y:y, a:snapangle};
},
// found this function http://groups.google.com/group/jquery-dev/browse_thread/thread/c6d11387c580a77f // found this function http://groups.google.com/group/jquery-dev/browse_thread/thread/c6d11387c580a77f
"text2xml": function(sXML) { "text2xml": function(sXML) {
// NOTE: I'd like to use jQuery for this, but jQuery makes all tags uppercase // NOTE: I'd like to use jQuery for this, but jQuery makes all tags uppercase