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

Fixed multiple path node selection/move on zoom 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1250 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-01-20 17:26:12 +00:00
parent 220bd72b7a
commit 828dfa2f9f
2 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
editor/svg-editor.js
View File

@ -141,6 +141,22 @@ function svg_edit_setup() {
svgCanvas.setMode('select'); svgCanvas.setMode('select');
}; };
var togglePathEditMode = function(editmode) {
$('#path_node_panel').toggle(editmode);
$('#tools_bottom_2,#tools_bottom_3').toggle(!editmode);
var size = $('#tool_select > svg, #tool_select > img')[0].getAttribute('width');
if(editmode) {
// Change select icon
$('.tool_button').removeClass('tool_button_current');
$('#tool_select').addClass('tool_button_current')
.empty().append($.getSvgIcon('select_node'));
multiselected = false;
} else {
$('#tool_select').empty().append($.getSvgIcon('select'));
}
$.resizeSvgIcons({'#tool_select .svg_icon':size});
}
// used to make the flyouts stay on the screen longer the very first time // used to make the flyouts stay on the screen longer the very first time
var flyoutspeed = 1250; var flyoutspeed = 1250;
var textBeingEntered = false; var textBeingEntered = false;
@ -164,15 +180,8 @@ function svg_edit_setup() {
// called when we've selected a different element // called when we've selected a different element
var selectedChanged = function(window,elems) { var selectedChanged = function(window,elems) {
var mode = svgCanvas.getMode();
if (selectedElement && selectedElement.id.indexOf('pathpointgrip') == 0) { var is_node = (mode == "pathedit");
$('#path_node_panel').hide();
$('#tools_bottom_2,#tools_bottom_3').show();
var size = $('#tool_select > svg, #tool_select > img')[0].getAttribute('width');
$('#tool_select').empty().append($.getSvgIcon('select'));
$.resizeSvgIcons({'#tool_select .svg_icon':size});
}
// if elems[1] is present, then we have more than one element // if elems[1] is present, then we have more than one element
selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null); selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null);
multiselected = (elems.length >= 2 && elems[1] != null); multiselected = (elems.length >= 2 && elems[1] != null);
@ -181,38 +190,19 @@ function svg_edit_setup() {
// upon creation of a text element the editor is switched into // upon creation of a text element the editor is switched into
// select mode and this event fires - we need our UI to be in sync // select mode and this event fires - we need our UI to be in sync
if (svgCanvas.getMode() != "multiselect") { if (mode != "multiselect" && !is_node) {
setSelectMode(); setSelectMode();
updateToolbar(); updateToolbar();
} }
} // if (elem != null) } // if (elem != null)
// Deal with pathedit mode
togglePathEditMode(is_node);
updateContextPanel(); updateContextPanel();
}; };
// called when we've selected a different path node
var selectedPathNodeChanged = function(window, elems) {
$('#path_node_panel').show();
$('#tools_bottom_2,#tools_bottom_3').hide();
var size = $('#tool_select > svg, #tool_select > img')[0].getAttribute('width');
// Change select icon
$('.tool_button').removeClass('tool_button_current');
$('#tool_select').addClass('tool_button_current')
.empty().append($.getSvgIcon('select_node'));
$.resizeSvgIcons({'#tool_select .svg_icon':size});
updateContextPanel();
if(elems.length) {
selectedElement = elems[0];
// multiselected = (elems.length >= 2);
}
};
// called when any element has changed // called when any element has changed
var elementChanged = function(window,elems) { var elementChanged = function(window,elems) {
for (var i = 0; i < elems.length; ++i) { for (var i = 0; i < elems.length; ++i) {
@ -220,7 +210,12 @@ function svg_edit_setup() {
// if the element changed was the svg, then it could be a resolution change // if the element changed was the svg, then it could be a resolution change
if (elem && elem.tagName == "svg") { if (elem && elem.tagName == "svg") {
// var vb = elem.getAttribute("viewBox").split(' ');
// changeResolution(parseInt(vb[2]),
// parseInt(vb[3]));
populateLayers(); populateLayers();
updateCanvas();
} }
// Update selectedElement if element is no longer part of the image. // Update selectedElement if element is no longer part of the image.
// This occurs for the text elements in Firefox // This occurs for the text elements in Firefox
@ -371,7 +366,7 @@ function svg_edit_setup() {
$('#tool_reorient').toggleClass('tool_button_disabled', ang == 0); $('#tool_reorient').toggleClass('tool_button_disabled', ang == 0);
return; return;
} }
var is_node = elem ? (elem.id && elem.id.indexOf('pathpointgrip') == 0) : false; var is_node = currentMode == 'pathedit'; //elem ? (elem.id && elem.id.indexOf('pathpointgrip') == 0) : false;
$('#selected_panel, #multiselected_panel, #g_panel, #rect_panel, #circle_panel,\ $('#selected_panel, #multiselected_panel, #g_panel, #rect_panel, #circle_panel,\
#ellipse_panel, #line_panel, #text_panel, #image_panel').hide(); #ellipse_panel, #line_panel, #text_panel, #image_panel').hide();
@ -516,7 +511,6 @@ function svg_edit_setup() {
// bind the selected event to our function that handles updates to the UI // bind the selected event to our function that handles updates to the UI
svgCanvas.bind("selected", selectedChanged); svgCanvas.bind("selected", selectedChanged);
svgCanvas.bind("nodeselected", selectedPathNodeChanged);
svgCanvas.bind("changed", elementChanged); svgCanvas.bind("changed", elementChanged);
svgCanvas.bind("saved", saveHandler); svgCanvas.bind("saved", saveHandler);
svgCanvas.bind("zoomed", zoomChanged); svgCanvas.bind("zoomed", zoomChanged);

21
editor/svgcanvas.js
View File

@ -2624,6 +2624,8 @@ function BatchCommand(text) {
case "path": case "path":
// Fall through // Fall through
case "pathedit": case "pathedit":
start_x *= current_zoom;
start_y *= current_zoom;
pathActions.mouseDown(evt, mouse_target, start_x, start_y); pathActions.mouseDown(evt, mouse_target, start_x, start_y);
started = true; started = true;
break; break;
@ -2906,6 +2908,8 @@ function BatchCommand(text) {
case "path": case "path":
// fall through // fall through
case "pathedit": case "pathedit":
x *= current_zoom;
y *= current_zoom;
if(rubberBox && rubberBox.getAttribute('display') != 'none') { if(rubberBox && rubberBox.getAttribute('display') != 'none') {
assignAttributes(rubberBox, { assignAttributes(rubberBox, {
'x': Math.min(start_x,x), 'x': Math.min(start_x,x),
@ -3340,7 +3344,7 @@ function BatchCommand(text) {
updateSegLine(); updateSegLine();
updateSegLine(true); updateSegLine(true);
call("nodeselected", grips); call("selected", grips);
}; };
var removeNodeFromSelection = function(point) { var removeNodeFromSelection = function(point) {
@ -3361,7 +3365,7 @@ function BatchCommand(text) {
updateSegLine(); updateSegLine();
updateSegLine(true); updateSegLine(true);
// call("nodeselected", grips); // call("selected", grips);
}; };
var removeAllNodesFromSelection = function() { var removeAllNodesFromSelection = function() {
@ -3371,7 +3375,7 @@ function BatchCommand(text) {
$('#pathpointgrip_container circle').attr('stroke','#EEE'); $('#pathpointgrip_container circle').attr('stroke','#EEE');
$('#ctrlpointgrip_container circle').attr('fill', '#EEE'); $('#ctrlpointgrip_container circle').attr('fill', '#EEE');
selected_pts = []; selected_pts = [];
// call("nodeselected", []); // call("selected", []);
}; };
var selectNode = function(point) { var selectNode = function(point) {
@ -4005,14 +4009,15 @@ function BatchCommand(text) {
// if we are dragging a point, let's move it // if we are dragging a point, let's move it
if (current_path_pt_drag != -1 && current_path) { if (current_path_pt_drag != -1 && current_path) {
var old_path_pts = $.map(current_path_pts, function(n){return n/current_zoom;}); var old_path_pts = $.map(current_path_pts, function(n){return n/current_zoom;});
var diff_x = mouse_x - old_path_pts[current_path_pt*2]; var diff_x = mouse_x - current_path_pts[current_path_pt*2];
var diff_y = mouse_y - old_path_pts[current_path_pt*2+1]; var diff_y = mouse_y - current_path_pts[current_path_pt*2+1];
// console.log(diff_x, diff_y);
for(var i=0; i<selected_pts.length; i++) { for(var i=0; i<selected_pts.length; i++) {
var sel_pt = selected_pts[i]; var sel_pt = selected_pts[i];
var sel_pt_x = old_path_pts[sel_pt*2] + diff_x;
var sel_pt_y = old_path_pts[sel_pt*2+1] + diff_y;
var sel_pt_x = current_path_pts[sel_pt*2] + diff_x;
var sel_pt_y = current_path_pts[sel_pt*2+1] + diff_y;
//
current_path_pt_drag = sel_pt; current_path_pt_drag = sel_pt;
updatePath(sel_pt_x, sel_pt_y, old_path_pts); updatePath(sel_pt_x, sel_pt_y, old_path_pts);
} }