# HG changeset patch
# User Nobuyasu Oshiro  <dimolto@cr.ie.u-ryukyu.ac.jp>
# Date 1363540289 -32400
# Node ID 5ad0ba30c78566fd4a9cc470ede392ab32045206
# Parent  409e8fd797941b0952234826f62552a10f195fad
modified recursiveShowRelationNode

diff -r 409e8fd79794 -r 5ad0ba30c785 public/viewer/viewer_white.html
--- a/public/viewer/viewer_white.html	Mon Mar 18 01:15:27 2013 +0900
+++ b/public/viewer/viewer_white.html	Mon Mar 18 02:11:29 2013 +0900
@@ -473,7 +473,7 @@
     jsPlumb.draggable($('.graphNode'));
 }
 
-var BASE_THETA = -30;
+var BASE_THETA = -60;
 var BASE_ANGLE = 180;
 var BASE_DISTANCE = 150;
 function calcChildNodePosition(parent, num) {
@@ -498,16 +498,30 @@
 function recursiveShowRelationNodes(graphData, node) {
     if (!node.view) updateNode(node);
     childNodeIds = getRelationNodeIds(graphData, node);
+    /* calcration of childNode position */
+    var numCalcChild = 0;
     for (var i=0; i<childNodeIds.length; i++) {
 	var id = childNodeIds[i];
 	var childNode = graphData.nodes[id];
-	if (!childNode.view) {
-	    childNode.position = calcChildNodePosition(node, i);
+	if (!childNode.position) {
+	    childNode.position = calcChildNodePosition(node, numCalcChild);
 	    updateNode(childNode);
-	    recursiveShowRelationNodes(graphData, childNode);
+	    numCalcChild++;
+//	    recursiveShowRelationNodes(graphData, childNode);
 	}
     }
-    showAllEdge(graphData);
+    /* calcration of grandchildNode position  */
+    for (var i=0; i<childNodeIds.length; i++) {
+	var id = childNodeIds[i];
+	var childNode = graphData.nodes[id];
+	var ids = getRelationNodeIds(graphData, childNode);
+	for (var j=0; j<ids.length; j++) {
+	    var n = graphData.nodes[ids[j]];
+	    if (!n.position) {
+		recursiveShowRelationNodes(graphData, childNode);
+	    }
+	}
+    }
 }
 
 function testStart() {
@@ -517,6 +531,7 @@
     var rootNodeId = "1";
     var rootNode = graphData.nodes[rootNodeId];
     recursiveShowRelationNodes(graphData, rootNode);
+    showAllEdge(graphData);
     
 /*
     updateNode(rootNode);