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

Predict functions now support null position

Browse Source
This commit is contained in:
Gonzalo Bellver
2012-01-13 16:26:37 -03:00
parent 2bb68de4f1
commit 78c1de5c67
5 changed files with 77 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mindplot/src/main/javascript/nlayout/BalancedSorter.js
View File

@@ -52,12 +52,25 @@ mindplot.nlayout.BalancedSorter = new Class({
},
predict : function(parent, graph, position) {
if (!position) {
var right = this._getChildrenForOrder(parent, graph, 0);
var left = this._getChildrenForOrder(parent, graph, 1);
}
// Filter nodes on one side..
var children = this._getChildrenForSide(parent, graph, position);
var order = position ? (position.x > 0 ? 0 : 1) : ((right.length - left.length) > 0 ? 1 : 0);
var children = this._getChildrenForOrder(parent, graph, order);
// No children?
if (children.length == 0) {
return [0, {x:parent.getPosition().x + parent.getSize().width + mindplot.nlayout.BalancedSorter.INTERNODE_HORIZONTAL_PADDING * 2, y:parent.getPosition().y}];
}
// Try to fit within ...
var result = null;
var last = children.getLast();
position = position || {x: last.getPosition().x, y:last.getPosition().y + 1};
children.each(function(child, index) {
var cpos = child.getPosition();
if (position.y > cpos.y) {
@@ -165,6 +178,7 @@ mindplot.nlayout.BalancedSorter = new Class({
},
_getChildrenForSide: function(parent, graph, position) {
position = position || {x: parent.getPosition().x + 1, y:parent.getPosition().y + 1};
return graph.getChildren(parent).filter(function(child) {
return position.x > 0 ? child.getPosition().x > 0 : child.getPosition().x < 0;
});
@@ -184,7 +198,8 @@ mindplot.nlayout.BalancedSorter = new Class({
// All even numbered nodes should be "continuous" by themselves
var factor = node.getOrder() % 2 == 0 ? 2 : 1;
for (var i = 0; i < children.length; i++) {
$assert(children[i].getOrder() == (i*factor), "missing order elements");
var order = i == 0 && factor == 1 ? 1 : (factor * i);
$assert(children[i].getOrder() == order, "Missing order elements. Missing order: " + (i*factor));
}
},

6
mindplot/src/main/javascript/nlayout/LayoutManager.js
View File

@@ -57,11 +57,15 @@ mindplot.nlayout.LayoutManager = new Class({
$assert($defined(order), "order can not be null");
this._layout.connectNode(parentId, childId, order);
return this;
},
disconnectNode: function(id) {
$assert($defined(id), "id can not be null");
this._layout.disconnectNode(id);
return this;
},
addNode:function(id, size, position) {
@@ -82,11 +86,11 @@ mindplot.nlayout.LayoutManager = new Class({
// Remove the all the branch ...
this._treeSet.remove(id);
return this;
},
predict: function(parentId, position) {
$assert($defined(parentId), "parentId can not be null");
$assert(position, "childId can not be null");
var parent = this._treeSet.find(parentId);
var sorter = parent.getSorter();

4
mindplot/src/main/javascript/nlayout/SymmetricSorter.js
View File

@@ -22,11 +22,12 @@ mindplot.nlayout.SymmetricSorter = new Class({
},
predict : function(parent, graph, position) {
var direction = parent.getPosition().x > 0 ? 1 : -1;
// No children...
var children = graph.getChildren(parent);
var direction = parent.getPosition().x > 0 ? 1 : -1;
if (children.length == 0) {
position = position || {x:parent.getPosition().x + direction, y:parent.getPosition().y};
var position = {
x: parent.getPosition().x + direction * (parent.getSize().width + mindplot.nlayout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING),
y:parent.getPosition().y
@@ -37,6 +38,7 @@ mindplot.nlayout.SymmetricSorter = new Class({
// Try to fit within ...
var result = null;
var last = children.getLast();
position = position || {x:last.getPosition().x + direction, y:last.getPosition().y + 1};
children.each(function(child, index) {
var cpos = child.getPosition();
if (position.y > cpos.y) {