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

Fixed bug for predict in free positioning

Browse Source
This commit is contained in:
Gonzalo Bellver
2012-02-02 12:41:53 -03:00
parent a0b838a7a6
commit 7c3ffebc84
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ mindplot.layout.BalancedSorter = new Class({
(position.x >= parent.getPosition().x ? position.x : parent.getPosition().x) :
(position.x <= parent.getPosition().x ? position.x : parent.getPosition().x);
return {order:0, position:{x: xPos, y:position.y}};
return [0, {x: xPos, y:position.y}];
}
var rootNode = graph.getRootNode(parent);

3
mindplot/src/main/javascript/layout/LayoutManager.js
View File

@@ -110,9 +110,6 @@ mindplot.layout.LayoutManager = new Class({
var sorter = parent.getSorter();
var result = sorter.predict(this._treeSet, parent, node, position, free);
$assert(result[0] != null, "Prediction order cannot be null");
$assert(result[1] != null, "Prediction position cannot be null");
$assert(result[1].x != null && result[1].y != null, "Prediction position is not valid");
return {order:result[0],position:result[1]};
},

9
mindplot/src/main/javascript/layout/SymmetricSorter.js
View File

@@ -25,14 +25,15 @@ mindplot.layout.SymmetricSorter = 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(), parent.getPosition());
var limitXPos = parent.getPosition().x + direction * (parent.getSize().width/2 + node.getSize().width/2 + mindplot.layout.SymmetricSorter.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}];
}