zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug for free positioning of balanced sorted nodes

Browse Source
This commit is contained in:
Gonzalo Bellver
2012-02-02 12:58:25 -03:00
parent 7c3ffebc84
commit 4391afdf7b
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mindplot/src/main/javascript/layout/AbstractBasicSorter.js
View File

@@ -62,7 +62,7 @@ mindplot.layout.AbstractBasicSorter = new Class({
_getRelativeDirection: function(reference, position) {
var offset = position.x - reference.x;
return offset > 0 ? 1 : (offset < 0 ? -1 : 0);
return offset >= 0 ? 1 : -1;
}
});

10
mindplot/src/main/javascript/layout/BalancedSorter.js
View File

@@ -26,14 +26,16 @@ mindplot.layout.BalancedSorter = new Class({
// If its a free node...
if (free) {
$assert($defined(position), "position cannot be null for predict in free positioning");
$assert($defined(node), "node cannot be null for predict in free positioning");
//TODO(gb): check this. Should direction be obtained by the sorter?
var rootNode = graph.getRootNode(parent);
var direction = parent.getPosition().x > rootNode.getPosition().x ? 1 : -1;
var direction = this._getRelativeDirection(rootNode.getPosition(), node.getPosition());
var limitXPos = parent.getPosition().x + direction * (parent.getSize().width/2 + node.getSize().width/2 + mindplot.layout.BalancedSorter.INTERNODE_HORIZONTAL_PADDING);
var xPos = direction > 0 ?
(position.x >= parent.getPosition().x ? position.x : parent.getPosition().x) :
(position.x <= parent.getPosition().x ? position.x : parent.getPosition().x);
(position.x >= limitXPos ? position.x : limitXPos) :
(position.x <= limitXPos ? position.x : limitXPos) ;
return [0, {x: xPos, y:position.y}];
}