vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed branch overlapping bug

Browse Source
This commit is contained in:
Gonzalo Bellver 2012-03-06 18:01:56 -03:00
parent dc4f47ab7a
commit 6506b60977
4 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mindplot/src/main/javascript/layout/OriginalLayout.js
View File

@ -157,7 +157,8 @@ mindplot.layout.OriginalLayout = new Class({
}, this); }, this);
if (!sibling.isFree() || overlappingOccurs) { if (!sibling.isFree() || overlappingOccurs) {
this._treeSet.shiftBranchPosition(sibling, 0, node.getFreeDisplacement().y); var sAmount = node.getFreeDisplacement().y;
this._treeSet.shiftBranchPosition(sibling, 0, sAmount);
shiftedBranches.push(sibling); shiftedBranches.push(sibling);
} }
}, this); }, this);
@ -167,14 +168,9 @@ mindplot.layout.OriginalLayout = new Class({
}); });
branchesToShift.forEach(function(branch) { branchesToShift.forEach(function(branch) {
var overlappingOccurs = shiftedBranches.some(function(shiftedBranch) { var bAmount = node.getFreeDisplacement().y;
return this._branchesOverlap(shiftedBranch, branch, heightById); this._treeSet.shiftBranchPosition(branch, 0, bAmount);
}, this); shiftedBranches.push(branch);
if (overlappingOccurs) {
this._treeSet.shiftBranchPosition(branch, 0, node.getFreeDisplacement().y);
shiftedBranches.push(branch);
}
last = branch; last = branch;
},this); },this);
}, },

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

@ -176,6 +176,10 @@ mindplot.layout.SymmetricSorter = new Class({
toString:function() { toString:function() {
return "Symmetric Sorter"; return "Symmetric Sorter";
},
_getVerticalPadding: function() {
return mindplot.layout.SymmetricSorter.INTERNODE_VERTICAL_PADDING;
} }
}); });

5
mindplot/src/test/javascript/static/layout.html
View File

@ -181,7 +181,10 @@
<h3>testFreeReorder:</h3> <h3>testFreeReorder:</h3>
<div id="testFreeReorder1" class="col"></div> <div id="testFreeReorder1" class="col"></div>
<div id="testFreeReorder2" class="col"></div>
<h3>testFreeOverlap:</h3>
<div id="testFreeOverlap1" class="col"></div>
<div id="testFreeOverlap2" class="col"></div>
</div> </div>
</body> </body>

41
mindplot/src/test/javascript/static/test/FreeTestSuite.js
View File

@ -28,6 +28,7 @@ mindplot.layout.FreeTestSuite = new Class({
this.testRootNodeChildrenPositioning(); this.testRootNodeChildrenPositioning();
this.testBalancedFreePredict(); this.testBalancedFreePredict();
this.testFreeReorder(); this.testFreeReorder();
this.testFreeOverlap();
}, },
testFreePosition: function() { testFreePosition: function() {
@ -389,14 +390,46 @@ mindplot.layout.FreeTestSuite = new Class({
manager.addNode(16, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,16,5); manager.addNode(16, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,16,5);
manager.layout(); manager.layout();
// var graph1 = manager.plot("testFreeReorder1", {width:800, height:800});
manager.moveNode(14, {x:270, y:-160}); manager.moveNode(14, {x:270, y:-160});
manager.layout(); manager.layout();
var graph1 = manager.plot("testFreeReorder2", {width:800, height:1200}); manager.plot("testFreeReorder1", {width:800, height:1200});
$assert(manager.find(14).getPosition().y > manager.find(10).getPosition().y, "Node 14 should be below branch 2"); $assert(manager.find(14).getPosition().y > manager.find(10).getPosition().y, "Node 14 should be below branch 2");
console.log("OK!\n\n");
},
testFreeOverlap: function() {
console.log("testFreeOverlap:");
var position = {x:0,y:0};
var manager = new mindplot.layout.LayoutManager(0, mindplot.layout.TestSuite.ROOT_NODE_SIZE);
// Prepare a sample graph ...
manager.addNode(1, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,1,0);
manager.addNode(4, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(1,4,0);
manager.addNode(5, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(1,5,1);
manager.addNode(6, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(1,6,2);
manager.addNode(2, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,2,2);
manager.addNode(7, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(2,7,0);
manager.addNode(8, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(2,8,1);
manager.addNode(9, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(2,9,2);
manager.addNode(10, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(2,10,3);
manager.addNode(3, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,3,4);
manager.addNode(11, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,11,0);
manager.addNode(12, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,12,1);
manager.addNode(13, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,13,2);
manager.addNode(14, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,14,3);
manager.addNode(15, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,15,4);
manager.addNode(16, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(3,16,5);
manager.layout();
manager.plot("testFreeOverlap1", {width:800, height:1200});
manager.moveNode(14, {x:270, y:7});
manager.layout();
manager.plot("testFreeOverlap2", {width:800, height:1200});
$assert(manager.find(2).getPosition().y > manager.find(1).getPosition().y, "Branches 1 and 2 are overlapping");
console.log("OK!\n\n"); console.log("OK!\n\n");
}, },