Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source

Conflicts:
	mindplot/src/main/javascript/nlayout/TestSuite.js
This commit is contained in:
Paulo Veiga
2011-12-31 15:08:56 -03:00
11 changed files with 180 additions and 17 deletions

View File

@@ -47,12 +47,15 @@ mindplot.nlayout.OriginalLayout = new Class({
layout: function() {
var roots = this._treeSet.getTreeRoots();
roots.forEach(function(node) {
console.log('node = ' + node.getId()); //TODO(gb): Remove trace!!!
// Calculate all node heights ...
var sorter = node.getSorter();
console.log('sorter = ' + sorter); //TODO(gb): Remove trace!!!
// @Todo: This must not be implemented in this way.Each sorter could have different notion of heights ...
var heightById = sorter.computeChildrenIdByHeights(this._treeSet, node);
console.log('heightById = ' + heightById[0]); //TODO(gb): Remove trace!!!
this._layoutChildren(node, heightById);
}, this);