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

Fixed behavior of last node on open path 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@805 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-10-12 20:26:03 +00:00
parent 9d24318b2b
commit 3509ab975f
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/svg-editor.js
View File

@ -211,9 +211,14 @@ function svg_edit_setup() {
$('#poly_node_panel').show(); $('#poly_node_panel').show();
var point = svgCanvas.getNodePoint(); var point = svgCanvas.getNodePoint();
if(point) { if(point) {
var seg_type = $('#seg_type');
$('#poly_node_x').val(point.x); $('#poly_node_x').val(point.x);
$('#poly_node_y').val(point.y); $('#poly_node_y').val(point.y);
$('#seg_type').val(point.type); if(point.type) {
seg_type.val(point.type).removeAttr('disabled');
} else {
seg_type.val(4).attr('disabled','disabled');
}
} }
return; return;
} }

17
editor/svgcanvas.js
View File

@ -1401,7 +1401,9 @@ function BatchCommand(text) {
this.addNodeToSelection = function(point) { this.addNodeToSelection = function(point) {
// Currently only one node can be selected at a time, should allow more later // Currently only one node can be selected at a time, should allow more later
// Should point be the index or the grip element? // Should point be the index or the grip element?
if(point == current_poly_pts.length/2 - 1) { var is_closed = current_poly.getAttribute('d').toLowerCase().indexOf('z') != -1;
if(is_closed && point == current_poly_pts.length/2 - 1) {
current_poly_pt = 0; current_poly_pt = 0;
} else { } else {
current_poly_pt = point; current_poly_pt = point;
@ -3390,7 +3392,13 @@ function BatchCommand(text) {
this.getNodePoint = function() { this.getNodePoint = function() {
if(current_poly_pt != -1) { if(current_poly_pt != -1) {
var pt = getPolyPoint(current_poly_pt, true); var pt = getPolyPoint(current_poly_pt, true);
var segtype = current_poly.pathSegList.getItem(current_poly_pt+1).pathSegType; var list = current_poly.pathSegList;
var segtype;
if(list.numberOfItems > current_poly_pt+1) {
segtype = list.getItem(current_poly_pt+1).pathSegType;
} else {
segtype = false;
}
return { return {
x: pt[0], x: pt[0],
y: pt[1], y: pt[1],
@ -3971,7 +3979,7 @@ function BatchCommand(text) {
var last_index = current_poly_pts.length/2 - 1; var last_index = current_poly_pts.length/2 - 1;
var is_closed = current_poly.getAttribute('d').toLowerCase().indexOf('z') != -1; var is_closed = current_poly.getAttribute('d').toLowerCase().indexOf('z') != -1;
if(!is_closed && index == last_index) { if(!is_closed && index == last_index) {
return; // Last point of unclosed poly should do nothing return; // Last point of unclosed poly should do nothing
} else if(index >= last_index && is_closed) { } else if(index >= last_index && is_closed) {
@ -3984,9 +3992,6 @@ function BatchCommand(text) {
var next_x = getPolyPoint(next_index)[0]; var next_x = getPolyPoint(next_index)[0];
var next_y = getPolyPoint(next_index)[1]; var next_y = getPolyPoint(next_index)[1];
// var next_rel_x = next_x - cur_x;
// var next_rel_y = next_y - cur_y;
if(!new_type) { // double-click, so just toggle if(!new_type) { // double-click, so just toggle
var batchCmd = new BatchCommand("Toggle Poly Segment Type"); var batchCmd = new BatchCommand("Toggle Poly Segment Type");