Bug found by:

Submitted by:
Requested by:
Reviewed by:
Approved by:
Obtained from:
Bug fixing in  arrangeNodes function.

diff --git a/ns2imunes.tcl b/ns2imunes.tcl
index dfb860952777b34728bda06c2451c9a549221f1f..2562758ec9fd61e373d37f8a2f667673772e699a 100755 (executable)
--- a/ns2imunes.tcl
+++ b/ns2imunes.tcl
@@ -60,7 +60,6 @@ proc ns2im { srcfile } {
     global link_list
     global canvas_list
     global curcanvas
-    puts $curcanvas
     global cfg
     set cfg {}
     set node_list {}
@@ -307,15 +306,15 @@ proc arrangeNodes {} {
     global node_list
     global activetool
 #with next foreach loop we divide nodes on layer3/router
-#nodes and peripheral (pc, host) nodes
+#nodes and edge (pc, host) nodes
     set routers {}
-    set peripheralNodes {}
+    set edgeNodes {}
     foreach node $node_list {
        set type [nodeType $node]
        if { $type == "router" } {
            lappend routers $node
        } else {
-           lappend peripheralNodes $node
+           lappend edgeNodes $node
        }
     }
     set center {450 310}
@@ -327,7 +326,7 @@ proc arrangeNodes {} {
 #regular peers (pc or host) are placed above them
     foreach rnode $routers {
        set fi [expr $i*(2*$pi)/$rnum]
-       set r [expr 200*(1.0-0.5*abs(sin($fi)))]
+       set r [expr 200*(1.0-0.4*abs(sin($fi)))]
        set ximage [expr [lindex $center 0] - $r*cos($fi)]
        set yimage [expr [lindex $center 1] - $r*sin($fi)]
        
@@ -351,14 +350,17 @@ proc arrangeNodes {} {
        incr i
     }
     if { $routers == "" } {
-       set fi [expr $i*(2*$pi)/[llength $peripheralNodes]]
-       set r [expr 200*(1.0-0.5*abs(sin($fi)))]
-       set ximage [expr [lindex $center 0] - $r*cos($fi)]
-       set yimage [expr [lindex $center 1] - $r*sin($fi)]
-       setNodeCoords $peer "$ximage1 $yimage1"
-       set dy 32
-       
-       setNodeLabelCoords $peer "$ximage1 [expr $yimage1 + $dy]"
+       set i 0
+       foreach node $edgeNodes {
+           set fi [expr $i*(2*$pi)/[llength $edgeNodes]]
+           set r [expr 200*(1.0-0.5*abs(sin($fi)))]
+           set ximage [expr [lindex $center 0] - $r*cos($fi)]
+           set yimage [expr [lindex $center 1] - $r*sin($fi)]
+           setNodeCoords $node "$ximage $yimage"
+           set dy 32
+           setNodeLabelCoords $node "$ximage [expr $yimage + $dy]"
+           incr i
+       }
     }
 }