From 6506b60977359367729dae0c50bdb04ee106aa3e Mon Sep 17 00:00:00 2001
From: Gonzalo Bellver <gonzalo.bellver@gmail.com>
Date: Tue, 6 Mar 2012 18:01:56 -0300
Subject: [PATCH] Fixed branch overlapping bug

---
 .../main/javascript/layout/OriginalLayout.js  | 14 +++----
 .../main/javascript/layout/SymmetricSorter.js |  4 ++
 .../src/test/javascript/static/layout.html    |  5 ++-
 .../javascript/static/test/FreeTestSuite.js   | 41 +++++++++++++++++--
 4 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/mindplot/src/main/javascript/layout/OriginalLayout.js b/mindplot/src/main/javascript/layout/OriginalLayout.js
index b8b4064f..6c39ca74 100644
--- a/mindplot/src/main/javascript/layout/OriginalLayout.js
+++ b/mindplot/src/main/javascript/layout/OriginalLayout.js
@@ -157,7 +157,8 @@ mindplot.layout.OriginalLayout = new Class({
             }, this);
 
             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);
             }
         }, this);
@@ -167,14 +168,9 @@ mindplot.layout.OriginalLayout = new Class({
         });
 
         branchesToShift.forEach(function(branch) {
-            var overlappingOccurs = shiftedBranches.some(function(shiftedBranch) {
-                return this._branchesOverlap(shiftedBranch, branch, heightById);
-            }, this);
-
-            if (overlappingOccurs) {
-                this._treeSet.shiftBranchPosition(branch, 0, node.getFreeDisplacement().y);
-                shiftedBranches.push(branch);
-            }
+            var bAmount = node.getFreeDisplacement().y;
+            this._treeSet.shiftBranchPosition(branch, 0, bAmount);
+            shiftedBranches.push(branch);
             last = branch;
         },this);
     },
diff --git a/mindplot/src/main/javascript/layout/SymmetricSorter.js b/mindplot/src/main/javascript/layout/SymmetricSorter.js
index 56ae4cc3..b611b79f 100644
--- a/mindplot/src/main/javascript/layout/SymmetricSorter.js
+++ b/mindplot/src/main/javascript/layout/SymmetricSorter.js
@@ -176,6 +176,10 @@ mindplot.layout.SymmetricSorter = new Class({
 
     toString:function() {
         return "Symmetric Sorter";
+    },
+
+    _getVerticalPadding: function() {
+        return mindplot.layout.SymmetricSorter.INTERNODE_VERTICAL_PADDING;
     }
 });
 
diff --git a/mindplot/src/test/javascript/static/layout.html b/mindplot/src/test/javascript/static/layout.html
index 68288fd0..49c8d415 100644
--- a/mindplot/src/test/javascript/static/layout.html
+++ b/mindplot/src/test/javascript/static/layout.html
@@ -181,7 +181,10 @@
 
     <h3>testFreeReorder:</h3>
     <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>
 
 </body>
diff --git a/mindplot/src/test/javascript/static/test/FreeTestSuite.js b/mindplot/src/test/javascript/static/test/FreeTestSuite.js
index e43b9c72..bdb0d2c8 100644
--- a/mindplot/src/test/javascript/static/test/FreeTestSuite.js
+++ b/mindplot/src/test/javascript/static/test/FreeTestSuite.js
@@ -28,6 +28,7 @@ mindplot.layout.FreeTestSuite = new Class({
         this.testRootNodeChildrenPositioning();
         this.testBalancedFreePredict();
         this.testFreeReorder();
+        this.testFreeOverlap();
     },
 
     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.layout();
-//        var graph1 = manager.plot("testFreeReorder1", {width:800, height:800});
-
         manager.moveNode(14, {x:270, y:-160});
         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");
 
+        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");
     },