Merge pull request #34 from SVG-Edit/intersection-list
Use getIntersectionList when available, remove suspendRedraws callsmaster
Philip Rogers
commit
0f13c0570d
|
|
@ -93,6 +93,7 @@ svgedit.select.Selector.prototype.reset = function(e) {
|
|||
this.selectorGroup.setAttribute('display', 'inline');
|
||||
};
|
||||
|
||||
|
||||
// Function: svgedit.select.Selector.updateGripCursors
|
||||
// Updates cursors for corner grips on rotation so arrows point the right way
|
||||
//
|
||||
|
|
@ -123,7 +124,6 @@ svgedit.select.Selector.prototype.updateGripCursors = function(angle) {
|
|||
// Parameters:
|
||||
// show - boolean indicating whether grips should be shown or not
|
||||
svgedit.select.Selector.prototype.showGrips = function(show) {
|
||||
// TODO: use suspendRedraw() here
|
||||
var bShow = show ? 'inline' : 'none';
|
||||
selectorManager_.selectorGripsGroup.setAttribute('display', bShow);
|
||||
var elem = this.selectedElement;
|
||||
|
|
@ -222,7 +222,6 @@ svgedit.select.Selector.prototype.resize = function() {
|
|||
nbaw = (maxx-minx);
|
||||
nbah = (maxy-miny);
|
||||
}
|
||||
var sr_handle = svgFactory_.svgRoot().suspendRedraw(100);
|
||||
|
||||
var dstr = 'M' + nbax + ',' + nbay
|
||||
+ ' L' + (nbax+nbaw) + ',' + nbay
|
||||
|
|
@ -261,8 +260,6 @@ svgedit.select.Selector.prototype.resize = function() {
|
|||
mgr.rotateGrip.setAttribute('cx', nbax + (nbaw)/2);
|
||||
mgr.rotateGrip.setAttribute('cy', nbay - (gripRadius*5));
|
||||
// }
|
||||
|
||||
svgFactory_.svgRoot().unsuspendRedraw(sr_handle);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -450,12 +447,12 @@ svgedit.select.SelectorManager.prototype.releaseSelector = function(elem) {
|
|||
var i,
|
||||
N = this.selectors.length,
|
||||
sel = this.selectorMap[elem.id];
|
||||
if (!sel.locked) {
|
||||
// TODO(codedread): Ensure this exists in this module.
|
||||
console.log('WARNING! selector was released but was already unlocked');
|
||||
}
|
||||
for (i = 0; i < N; ++i) {
|
||||
if (this.selectors[i] && this.selectors[i] == sel) {
|
||||
if (sel.locked == false) {
|
||||
// TODO(codedread): Ensure this exists in this module.
|
||||
console.log('WARNING! selector was released but was already unlocked');
|
||||
}
|
||||
delete this.selectorMap[elem.id];
|
||||
sel.locked = false;
|
||||
sel.selectedElement = null;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ var cur_shape = all_properties.shape;
|
|||
|
||||
// Array with all the currently selected elements
|
||||
// default size of 1 until it needs to grow bigger
|
||||
var selectedElements = new Array(1);
|
||||
var selectedElements = [];
|
||||
|
||||
// Function: addSvgElementFromJson
|
||||
// Create a new SVG element based on the given object keys/values and add it to the current layer
|
||||
|
|
@ -472,7 +472,7 @@ var encodableImages = {},
|
|||
// DOM element for selection rectangle drawn by the user
|
||||
rubberBox = null,
|
||||
|
||||
// Array of current BBoxes (still needed?)
|
||||
// Array of current BBoxes, used in getIntersectionList().
|
||||
curBBoxes = [],
|
||||
|
||||
// Object to contain all included extensions
|
||||
|
|
@ -537,42 +537,37 @@ var round = this.round = function(val) {
|
|||
// This method sends back an array or a NodeList full of elements that
|
||||
// intersect the multi-select rubber-band-box on the current_layer only.
|
||||
//
|
||||
// Since the only browser that supports the SVG DOM getIntersectionList is Opera,
|
||||
// we need to provide an implementation here. We brute-force it for now.
|
||||
// We brute-force getIntersectionList for browsers that do not support it (Firefox).
|
||||
//
|
||||
// Reference:
|
||||
// Firefox does not implement getIntersectionList(), see https://bugzilla.mozilla.org/show_bug.cgi?id=501421
|
||||
// Webkit does not implement getIntersectionList(), see https://bugs.webkit.org/show_bug.cgi?id=11274
|
||||
var getIntersectionList = this.getIntersectionList = function(rect) {
|
||||
if (rubberBox == null) { return null; }
|
||||
|
||||
var parent = current_group || getCurrentDrawing().getCurrentLayer();
|
||||
|
||||
if (!curBBoxes.length) {
|
||||
// Cache all bboxes
|
||||
curBBoxes = getVisibleElementsAndBBoxes(parent);
|
||||
|
||||
var rubberBBox;
|
||||
if (!rect) {
|
||||
rubberBBox = rubberBox.getBBox();
|
||||
} else {
|
||||
rubberBBox = svgcontent.createSVGRect(rect.x, rect.y, rect.width, rect.height);
|
||||
}
|
||||
|
||||
var resultList = null;
|
||||
try {
|
||||
resultList = parent.getIntersectionList(rect, null);
|
||||
} catch(e) { }
|
||||
if (typeof(svgroot.getIntersectionList) == 'function') {
|
||||
// Offset the bbox of the rubber box by the offset of the svgcontent element.
|
||||
rubberBBox.x += parseInt(svgcontent.getAttribute('x'), 10);
|
||||
rubberBBox.y += parseInt(svgcontent.getAttribute('y'), 10);
|
||||
|
||||
resultList = svgroot.getIntersectionList(rubberBBox, parent);
|
||||
}
|
||||
|
||||
if (resultList == null || typeof(resultList.item) != 'function') {
|
||||
resultList = [];
|
||||
var rubberBBox;
|
||||
if (!rect) {
|
||||
rubberBBox = rubberBox.getBBox();
|
||||
var o,
|
||||
bb = {};
|
||||
|
||||
for (o in rubberBBox) {
|
||||
bb[o] = rubberBBox[o] / current_zoom;
|
||||
}
|
||||
rubberBBox = bb;
|
||||
|
||||
} else {
|
||||
rubberBBox = rect;
|
||||
|
||||
if (!curBBoxes.length) {
|
||||
// Cache all bboxes
|
||||
curBBoxes = getVisibleElementsAndBBoxes(parent);
|
||||
}
|
||||
var i = curBBoxes.length;
|
||||
while (i--) {
|
||||
|
|
@ -582,6 +577,7 @@ var getIntersectionList = this.getIntersectionList = function(rect) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// addToSelection expects an array, but it's ok to pass a NodeList
|
||||
// because using square-bracket notation is allowed:
|
||||
// http://www.w3.org/TR/DOM-Level-2-Core/ecma-script-binding.html
|
||||
|
|
@ -602,47 +598,48 @@ getStrokedBBox = this.getStrokedBBox = function(elems) {
|
|||
if (!elems.length) {return false;}
|
||||
// Make sure the expected BBox is returned if the element is a group
|
||||
var getCheckedBBox = function(elem) {
|
||||
// TODO: Fix issue with rotated groups. Currently they work
|
||||
// fine in FF, but not in other browsers (same problem mentioned
|
||||
// in Issue 339 comment #2).
|
||||
|
||||
try {
|
||||
// TODO: Fix issue with rotated groups. Currently they work
|
||||
// fine in FF, but not in other browsers (same problem mentioned
|
||||
// in Issue 339 comment #2).
|
||||
var bb = svgedit.utilities.getBBox(elem);
|
||||
if (!bb) {
|
||||
return null;
|
||||
}
|
||||
var angle = svgedit.utilities.getRotationAngle(elem);
|
||||
|
||||
var bb = svgedit.utilities.getBBox(elem);
|
||||
var angle = svgedit.utilities.getRotationAngle(elem);
|
||||
|
||||
if ((angle && angle % 90) ||
|
||||
svgedit.math.hasMatrixTransform(svgedit.transformlist.getTransformList(elem))) {
|
||||
// Accurate way to get BBox of rotated element in Firefox:
|
||||
// Put element in group and get its BBox
|
||||
var good_bb = false;
|
||||
// Get the BBox from the raw path for these elements
|
||||
var elemNames = ['ellipse', 'path', 'line', 'polyline', 'polygon'];
|
||||
if (elemNames.indexOf(elem.tagName) >= 0) {
|
||||
if ((angle && angle % 90) ||
|
||||
svgedit.math.hasMatrixTransform(svgedit.transformlist.getTransformList(elem))) {
|
||||
// Accurate way to get BBox of rotated element in Firefox:
|
||||
// Put element in group and get its BBox
|
||||
var good_bb = false;
|
||||
// Get the BBox from the raw path for these elements
|
||||
var elemNames = ['ellipse', 'path', 'line', 'polyline', 'polygon'];
|
||||
if (elemNames.indexOf(elem.tagName) >= 0) {
|
||||
bb = good_bb = canvas.convertToPath(elem, true);
|
||||
} else if (elem.tagName == 'rect') {
|
||||
// Look for radius
|
||||
var rx = elem.getAttribute('rx');
|
||||
var ry = elem.getAttribute('ry');
|
||||
if (rx || ry) {
|
||||
bb = good_bb = canvas.convertToPath(elem, true);
|
||||
} else if (elem.tagName == 'rect') {
|
||||
// Look for radius
|
||||
var rx = elem.getAttribute('rx');
|
||||
var ry = elem.getAttribute('ry');
|
||||
if (rx || ry) {
|
||||
bb = good_bb = canvas.convertToPath(elem, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!good_bb) {
|
||||
// Must use clone else FF freaks out
|
||||
var clone = elem.cloneNode(true);
|
||||
var g = document.createElementNS(NS.SVG, 'g');
|
||||
var parent = elem.parentNode;
|
||||
parent.appendChild(g);
|
||||
g.appendChild(clone);
|
||||
bb = svgedit.utilities.bboxToObj(g.getBBox());
|
||||
parent.removeChild(g);
|
||||
}
|
||||
if (!good_bb) {
|
||||
// Must use clone else FF freaks out
|
||||
var clone = elem.cloneNode(true);
|
||||
var g = document.createElementNS(NS.SVG, 'g');
|
||||
var parent = elem.parentNode;
|
||||
parent.appendChild(g);
|
||||
g.appendChild(clone);
|
||||
bb = svgedit.utilities.bboxToObj(g.getBBox());
|
||||
parent.removeChild(g);
|
||||
}
|
||||
|
||||
// Old method: Works by giving the rotated BBox,
|
||||
// this is (unfortunately) what Opera and Safari do
|
||||
// natively when getting the BBox of the parent group
|
||||
// Old method: Works by giving the rotated BBox,
|
||||
// this is (unfortunately) what Opera and Safari do
|
||||
// natively when getting the BBox of the parent group
|
||||
// var angle = angle * Math.PI / 180.0;
|
||||
// var rminx = Number.MAX_VALUE, rminy = Number.MAX_VALUE,
|
||||
// rmaxx = Number.MIN_VALUE, rmaxy = Number.MIN_VALUE;
|
||||
|
|
@ -672,12 +669,8 @@ getStrokedBBox = this.getStrokedBBox = function(elems) {
|
|||
// bb.y = rminy;
|
||||
// bb.width = rmaxx - rminx;
|
||||
// bb.height = rmaxy - rminy;
|
||||
}
|
||||
return bb;
|
||||
} catch(e) {
|
||||
console.log(elem, e);
|
||||
return null;
|
||||
}
|
||||
return bb;
|
||||
};
|
||||
|
||||
var full_bb;
|
||||
|
|
@ -753,11 +746,9 @@ var getVisibleElements = this.getVisibleElements = function(parent) {
|
|||
|
||||
var contentElems = [];
|
||||
$(parent).children().each(function(i, elem) {
|
||||
try {
|
||||
if (elem.getBBox()) {
|
||||
contentElems.push(elem);
|
||||
}
|
||||
} catch(e) {}
|
||||
if (elem.getBBox) {
|
||||
contentElems.push(elem);
|
||||
}
|
||||
});
|
||||
return contentElems.reverse();
|
||||
};
|
||||
|
|
@ -780,11 +771,9 @@ var getVisibleElementsAndBBoxes = this.getVisibleElementsAndBBoxes = function(pa
|
|||
}
|
||||
var contentElems = [];
|
||||
$(parent).children().each(function(i, elem) {
|
||||
try {
|
||||
if (elem.getBBox()) {
|
||||
contentElems.push({'elem':elem, 'bbox':getStrokedBBox([elem])});
|
||||
}
|
||||
} catch(e) {}
|
||||
if (elem.getBBox) {
|
||||
contentElems.push({'elem':elem, 'bbox':getStrokedBBox([elem])});
|
||||
}
|
||||
});
|
||||
return contentElems.reverse();
|
||||
};
|
||||
|
|
@ -1762,22 +1751,22 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
|
|||
// - if newList contains selected, do nothing
|
||||
// - if newList doesn't contain selected, remove it from selected
|
||||
// - for any newList that was not in selectedElements, add it to selected
|
||||
var elemsToRemove = [], elemsToAdd = [],
|
||||
var elemsToRemove = selectedElements.slice(), elemsToAdd = [],
|
||||
newList = getIntersectionList();
|
||||
len = selectedElements.length;
|
||||
|
||||
for (i = 0; i < len; ++i) {
|
||||
var ind = newList.indexOf(selectedElements[i]);
|
||||
if (ind == -1) {
|
||||
elemsToRemove.push(selectedElements[i]);
|
||||
} else {
|
||||
newList[ind] = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// For every element in the intersection, add if not present in selectedElements.
|
||||
len = newList.length;
|
||||
for (i = 0; i < len; ++i) {
|
||||
if (newList[i]) {elemsToAdd.push(newList[i]);}
|
||||
var intElem = newList[i];
|
||||
// Found an element that was not selected before, so we should add it.
|
||||
if (selectedElements.indexOf(intElem) == -1) {
|
||||
elemsToAdd.push(intElem);
|
||||
}
|
||||
// Found an element that was already selected, so we shouldn't remove it.
|
||||
var foundInd = elemsToRemove.indexOf(intElem);
|
||||
if (foundInd != -1) {
|
||||
elemsToRemove.splice(foundInd, 1)
|
||||
}
|
||||
}
|
||||
|
||||
if (elemsToRemove.length > 0) {
|
||||
|
|
@ -1785,7 +1774,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
|
|||
}
|
||||
|
||||
if (elemsToAdd.length > 0) {
|
||||
addToSelection(elemsToAdd);
|
||||
canvas.addToSelection(elemsToAdd);
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
@ -1896,10 +1885,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
|
|||
}, 1000);
|
||||
break;
|
||||
case 'line':
|
||||
// Opera has a problem with suspendRedraw() apparently
|
||||
var handle = null;
|
||||
if (!window.opera) {svgroot.suspendRedraw(1000);}
|
||||
|
||||
if (curConfig.gridSnapping) {
|
||||
x = svgedit.utilities.snapToGrid(x);
|
||||
y = svgedit.utilities.snapToGrid(y);
|
||||
|
|
@ -1916,7 +1901,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
|
|||
|
||||
shape.setAttributeNS(null, 'x2', x2);
|
||||
shape.setAttributeNS(null, 'y2', y2);
|
||||
if (!window.opera) {svgroot.unsuspendRedraw(handle);}
|
||||
break;
|
||||
case 'foreignObject':
|
||||
// fall through
|
||||
|
|
@ -1967,9 +1951,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
|
|||
c = $(shape).attr(['cx', 'cy']);
|
||||
cx = c.cx;
|
||||
cy = c.cy;
|
||||
// Opera has a problem with suspendRedraw() apparently
|
||||
handle = null;
|
||||
if (!window.opera) {svgroot.suspendRedraw(1000);}
|
||||
if (curConfig.gridSnapping) {
|
||||
x = svgedit.utilities.snapToGrid(x);
|
||||
cx = svgedit.utilities.snapToGrid(cx);
|
||||
|
|
@ -1979,7 +1960,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
|
|||
shape.setAttributeNS(null, 'rx', Math.abs(x - cx) );
|
||||
var ry = Math.abs(evt.shiftKey?(x - cx):(y - cy));
|
||||
shape.setAttributeNS(null, 'ry', ry );
|
||||
if (!window.opera) {svgroot.unsuspendRedraw(handle);}
|
||||
break;
|
||||
case 'fhellipse':
|
||||
case 'fhrect':
|
||||
|
|
@ -5681,7 +5661,6 @@ this.setResolution = function(x, y) {
|
|||
}
|
||||
}
|
||||
if (x != w || y != h) {
|
||||
var handle = svgroot.suspendRedraw(1000);
|
||||
if (!batchCmd) {
|
||||
batchCmd = new svgedit.history.BatchCommand('Change Image Dimensions');
|
||||
}
|
||||
|
|
@ -5700,7 +5679,6 @@ this.setResolution = function(x, y) {
|
|||
batchCmd.addSubCommand(new svgedit.history.ChangeElementCommand(svgcontent, {'viewBox': ['0 0', w, h].join(' ')}));
|
||||
|
||||
addCommandToHistory(batchCmd);
|
||||
svgroot.unsuspendRedraw(handle);
|
||||
call('changed', [svgcontent]);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -6770,7 +6748,6 @@ this.convertToPath = function(elem, getBBox) {
|
|||
// newValue - String or number with the new attribute value
|
||||
// elems - The DOM elements to apply the change to
|
||||
var changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
|
||||
var handle = svgroot.suspendRedraw(1000);
|
||||
if (current_mode == 'pathedit') {
|
||||
// Editing node
|
||||
pathActions.moveNode(attr, newValue);
|
||||
|
|
@ -6883,7 +6860,6 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
|
|||
}
|
||||
} // if oldValue != newValue
|
||||
} // for each elem
|
||||
svgroot.unsuspendRedraw(handle);
|
||||
};
|
||||
|
||||
// Function: changeSelectedAttribute
|
||||
|
|
|
|||
|
|
@ -476,14 +476,14 @@ svgedit.utilities.getBBox = function(elem) {
|
|||
ret = selected.getBBox();
|
||||
selected.textContent = '';
|
||||
} else {
|
||||
try { ret = selected.getBBox();} catch(e){}
|
||||
if (selected.getBBox) { ret = selected.getBBox(); }
|
||||
}
|
||||
break;
|
||||
case 'path':
|
||||
if(!svgedit.browser.supportsPathBBox()) {
|
||||
ret = svgedit.utilities.getPathBBox(selected);
|
||||
} else {
|
||||
try { ret = selected.getBBox();} catch(e2){}
|
||||
if (selected.getBBox) { ret = selected.getBBox(); }
|
||||
}
|
||||
break;
|
||||
case 'g':
|
||||
|
|
@ -509,18 +509,14 @@ svgedit.utilities.getBBox = function(elem) {
|
|||
ret = bb;
|
||||
//}
|
||||
} else if(~visElems_arr.indexOf(elname)) {
|
||||
try { ret = selected.getBBox();}
|
||||
catch(e3) {
|
||||
if (selected) { ret = selected.getBBox(); }
|
||||
else {
|
||||
// Check if element is child of a foreignObject
|
||||
var fo = $(selected).closest('foreignObject');
|
||||
if(fo.length) {
|
||||
try {
|
||||
if (fo.length) {
|
||||
if (fo[0].getBBox) {
|
||||
ret = fo[0].getBBox();
|
||||
} catch(e4) {
|
||||
ret = null;
|
||||
}
|
||||
} else {
|
||||
ret = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -603,11 +599,6 @@ if (svgedit.browser.supportsSelectors()) {
|
|||
// suspendLength - Optional integer of milliseconds to suspend redraw
|
||||
// unitCheck - Boolean to indicate the need to use svgedit.units.setUnitAttr
|
||||
svgedit.utilities.assignAttributes = function(node, attrs, suspendLength, unitCheck) {
|
||||
if(!suspendLength) {suspendLength = 0;}
|
||||
// Opera has a problem with suspendRedraw() apparently
|
||||
var handle = null;
|
||||
if (!svgedit.browser.isOpera()) {svgroot_.suspendRedraw(suspendLength);}
|
||||
|
||||
var i;
|
||||
for (i in attrs) {
|
||||
var ns = (i.substr(0,4) === 'xml:' ? NS.XML :
|
||||
|
|
@ -621,7 +612,6 @@ svgedit.utilities.assignAttributes = function(node, attrs, suspendLength, unitCh
|
|||
svgedit.units.setUnitAttr(node, i, attrs[i]);
|
||||
}
|
||||
}
|
||||
if (!svgedit.browser.isOpera()) {svgroot_.unsuspendRedraw(handle);}
|
||||
};
|
||||
|
||||
// Function: cleanupElement
|
||||
|
|
@ -630,7 +620,6 @@ svgedit.utilities.assignAttributes = function(node, attrs, suspendLength, unitCh
|
|||
// Parameters:
|
||||
// element - DOM element to clean up
|
||||
svgedit.utilities.cleanupElement = function(element) {
|
||||
var handle = svgroot_.suspendRedraw(60);
|
||||
var defaults = {
|
||||
'fill-opacity':1,
|
||||
'stop-opacity':1,
|
||||
|
|
@ -652,8 +641,6 @@ svgedit.utilities.cleanupElement = function(element) {
|
|||
element.removeAttribute(attr);
|
||||
}
|
||||
}
|
||||
|
||||
svgroot_.unsuspendRedraw(handle);
|
||||
};
|
||||
|
||||
// Function: snapToGrid
|
||||
|
|
|
|||
Loading…
Reference in New Issue