vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-25 15:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug for free positioning of balance sorted nodes

Browse Source
This commit is contained in:
Gonzalo Bellver 2012-01-26 17:20:48 -03:00
parent 015703d5b8
commit 306133cd5e
4 changed files with 82 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,10 @@ mindplot.layout.OriginalLayout = new Class({
}
}, this);
var branchesToShift = this._treeSet.getBranchesInVerticalDirection(node, node.getFreeDisplacement().y);
var branchesToShift = this._treeSet.getBranchesInVerticalDirection(node, node.getFreeDisplacement().y).filter(function(branch) {
return !shiftedBranches.contains(branch);
});
branchesToShift.forEach(function(branch) {
var overlappingOccurs = shiftedBranches.some(function(shiftedBranch) {
return this._branchesOverlap(shiftedBranch, branch, heightById);
@ -177,6 +180,11 @@ mindplot.layout.OriginalLayout = new Class({
},
_branchesOverlap: function(branchA, branchB, heightById) {
// a branch doesn't really overlap with itself
if (branchA == branchB) {
return false;
}
var topA = branchA.getPosition().y - heightById[branchA.getId()]/2;
var bottomA = branchA.getPosition().y + heightById[branchA.getId()]/2;
var topB = branchB.getPosition().y - heightById[branchB.getId()]/2;

7
mindplot/src/main/javascript/layout/RootedTreeSet.js
View File

@ -233,9 +233,12 @@ mindplot.layout.RootedTreeSet = new Class({
},
getSiblingsInVerticalDirection: function(node, yOffset) {
// siblings with lower or higher order, depending on the direction of the offset
// siblings with lower or higher order, depending on the direction of the offset and on the same side as their parent
var parent = this.getParent(node);
var siblings = this.getSiblings(node).filter(function(sibling) {
return yOffset < 0 ? sibling.getOrder() < node.getOrder() : sibling.getOrder() > node.getOrder();
var sameSide = node.getPosition().x > parent.getPosition().x ? sibling.getPosition().x > parent.getPosition().x : sibling.getPosition().x < parent.getPosition().x;
var orderOK = yOffset < 0 ? sibling.getOrder() < node.getOrder() : sibling.getOrder() > node.getOrder();
return orderOK && sameSide;
});
if (yOffset < 0 ) {

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

@ -156,10 +156,17 @@
<div id="testReconnectFreeNode6" class="col"></div>
<div id="testReconnectFreeNode7" class="col"></div>
<h3>testsiblingOverlappingBug:</h3>
<div id="siblingOverlappingBug1" class="col"></div>
<div id="siblingOverlappingBug2" class="col"></div>
<div id="siblingOverlappingBug3" class="col"></div>
<h3>testSiblingOverlapping:</h3>
<div id="testSiblingOverlapping1" class="col"></div>
<div id="testSiblingOverlapping2" class="col"></div>
<div id="testSiblingOverlapping3" class="col"></div>
<h3>testRootNodeChildrenPositioning:</h3>
<div id="testRootNodeChildrenPositioning1" class="col"></div>
<div id="testRootNodeChildrenPositioning2" class="col"></div>
<div id="testRootNodeChildrenPositioning3" class="col"></div>
<div id="testRootNodeChildrenPositioning4" class="col"></div>
<div id="testRootNodeChildrenPositioning5" class="col"></div>
</div>
</body>

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

@ -24,7 +24,8 @@ mindplot.layout.FreeTestSuite = new Class({
this.testFreePosition();
this.testFreePredict();
this.testReconnectFreeNode();
this.siblingOverlappingBug();
this.testSiblingOverlapping();
this.testRootNodeChildrenPositioning();
},
testFreePosition: function() {
@ -75,16 +76,19 @@ mindplot.layout.FreeTestSuite = new Class({
this._assertFreePosition(manager, 12, {x:300, y:30})
console.log("\tmove node 13 to (340,180):");
manager.moveNode(13, {x:340, y:180});
var node13Pos = {x:340, y:180};
manager.moveNode(13, node13Pos);
manager.layout(true);
manager.plot("testFreePosition3", {width:1400, height:600});
this._assertFreePosition(manager, 13, {x:340, y:180});
this._assertFreePosition(manager, 13, node13Pos);
console.log("\tmove node 11 to (250,-50):");
manager.moveNode(11, {x:250, y:-50});
manager.layout(true);
manager.plot("testFreePosition4", {width:1400, height:600});
this._assertFreePosition(manager, 11, {x:250, y:-50});
$assert(manager.find(13).getPosition().x == node13Pos.x && manager.find(13).getPosition().y == node13Pos.y,
"Node 13 shouldn't have moved");
console.log("\tmove node 7 to (350,-190):");
manager.moveNode(7, {x:350, y:-190});
@ -265,8 +269,8 @@ mindplot.layout.FreeTestSuite = new Class({
console.log("OK!\n\n");
},
siblingOverlappingBug: function() {
console.log("siblingOverlappingBug:");
testSiblingOverlapping: function() {
console.log("testSiblingOverlapping:");
var position = {x:0,y:0};
var manager = new mindplot.layout.LayoutManager(0, mindplot.layout.TestSuite.ROOT_NODE_SIZE);
@ -281,19 +285,64 @@ mindplot.layout.FreeTestSuite = new Class({
manager.addNode(8, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(1,8,6);
manager.addNode(9, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,9,4);
manager.layout();
manager.plot("siblingOverlappingBug1", {width:800, height:600});
manager.plot("testSiblingOverlapping1", {width:800, height:600});
console.log("\tmove node 2");
manager.moveNode(2, {x:250, y: -30});
manager.layout();
manager.plot("siblingOverlappingBug2", {width:800, height:600});
manager.plot("testSiblingOverlapping2", {width:800, height:600});
this._assertFreePosition(manager, 2, {x:250, y: -30});
console.log("\tmove node 7");
manager.moveNode(7, {x:250, y: 100});
manager.layout();
manager.plot("siblingOverlappingBug3", {width:800, height:600});
manager.plot("testSiblingOverlapping3", {width:800, height:600});
this._assertFreePosition(manager, 7, {x:250, y: 100});
console.log("OK!\n\n");
},
testRootNodeChildrenPositioning: function() {
console.log("testRootNodeChildrenPositioning:");
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(2, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,2,1);
manager.addNode(3, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,3,2);
manager.addNode(4, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,4,3);
manager.addNode(5, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,5,4);
manager.addNode(6, mindplot.layout.TestSuite.NODE_SIZE, position).connectNode(0,6,5);
manager.layout();
manager.plot("testRootNodeChildrenPositioning1", {width:800, height:600});
console.log("\tmove node 1");
manager.moveNode(1, {x:150, y:0});
manager.layout();
manager.plot("testRootNodeChildrenPositioning2", {width:800, height:600});
this._assertFreePosition(manager, 1, {x:150, y:0});
console.log("\tmove node 4");
manager.moveNode(4, {x:-140, y:30});
manager.layout();
manager.plot("testRootNodeChildrenPositioning3", {width:800, height:600});
this._assertFreePosition(manager, 4, {x:-140, y:30});
console.log("\tmove node 2");
manager.moveNode(2, {x:-150, y:-50});
manager.layout();
manager.plot("testRootNodeChildrenPositioning4", {width:800, height:600});
this._assertFreePosition(manager, 2, {x:-150, y:-50});
//TODO(gb): fix this. It's not working
// console.log("\tmove node 6");
// manager.moveNode(6, {x:-150, y:-50});
// manager.layout();
// manager.plot("testRootNodeChildrenPositioning5", {width:800, height:600});
// this._assertFreePosition(manager, 6, {x:-150, y:-50});
console.log("OK!\n\n");
},
_assertFreePosition: function(manager, id, position) {