Changeset 2353 for trunk/gui

Timestamp:

Aug 13, 2011, 7:15:14 PM (13 years ago)

Author:

gah

Message:

new nanoscale

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (1 diff)
• nanovisviewer.tcl (modified) (3 diffs)
• unirect2d.tcl (modified) (1 diff)
• visviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -913 +913 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::SendDataObjs {} {
-    puts stderr "in SendDataObjs"
-
     blt::busy hold $itk_component(hull)
     foreach dataobj $_sendobjs {

trunk/gui/scripts/nanovisviewer.tcl

@@ -205 +205 @@
 
     array set _settings [subst {
-        $this-pan-x                $_view(pan-x)
-        $this-pan-y                $_view(pan-y)
-        $this-phi                $_view(phi)
-        $this-psi                $_view(psi)
-        $this-theta                $_view(theta)
-        $this-volume                1
-        $this-xcutplane                0
-        $this-xcutposition        0
-        $this-ycutplane                0
-        $this-ycutposition        0
-        $this-zcutplane                0
-        $this-zcutposition        0
-        $this-zoom                $_view(zoom)
+        $this-pan-x                     $_view(pan-x)
+        $this-pan-y                     $_view(pan-y)
+        $this-phi                       $_view(phi)
+        $this-psi                       $_view(psi)
+        $this-theta                     $_view(theta)
+        $this-volume                    1
+        $this-xcutplane                 0
+        $this-xcutposition              0
+        $this-ycutplane                 0
+        $this-ycutposition              0
+        $this-zcutplane                 0
+        $this-zcutposition              0
+        $this-zoom                      $_view(zoom)
     }]
 
@@ -945 +945 @@
             }
             array set style [lindex [$_first components -style $comp] 0]
-            if {$what != "-cutplanes" || $style(-cutplanes)} {
+            if { $what != "-cutplanes" || $style(-cutplanes) } {
                 lappend rlist $vol
             }
@@ -1223 +1223 @@
             if { [isconnected] } {
                 set vols [CurrentVolumes -cutplanes] 
+ puts stderr "cutplanes=$cutplanes"
                 SendCmd "cutplane state $bool $axis $vols"
             }

trunk/gui/scripts/unirect2d.tcl

@@ -147 +147 @@
     set dx [expr {($_xMax - $_xMin) / double($_xNum)}]
     set dy [expr {($_yMax - $_yMin) / double($_yNum)}]
-    for { set i 0 } { $i < $_xNum } { incr i } {
+    foreach {a b} $_axisOrder break
+    for { set i 0 } { $i < [set _${a}Num] } { incr i } {
         set x [expr {$_xMin + (double($i) * $dx)}]
-        for { set j 0 } { $j < $_yNum } { incr j } {
+        for { set j 0 } { $j < [set _${b}Num] } { incr j } {
             set y [expr {$_yMin + (double($i) * $dy)}]
             lappend data $x $y

trunk/gui/scripts/visviewer.tcl

@@ -206 +206 @@
     set servers [Shuffle $hostlist]
 
-    set memorySize 10000
     # Get the first server
     foreach {hostname port} [split [lindex $servers 0] :] break
@@ -212 +211 @@
 
     while {1} {
-        SendEcho <<line "connecting to $hostname:$port..."
+        puts stderr "connecting to $hostname:$port..."
         if { [catch {socket $hostname $port} _sid] != 0 } {
+            set _sid ""
             if {[llength $servers] == 0} {
                 blt::busy release $itk_component(hull)
@@ -226 +226 @@
         fconfigure $_sid -translation binary -encoding binary
 
-        # Send memory requirement to the load balancer
-        puts -nonewline $_sid [binary format I $memorySize]
-        flush $_sid
-
-        # Read back a reconnection order
-        set data [read $_sid 4]
-        if {[binary scan $data cccc b1 b2 b3 b4] != 4} {
-            blt::busy release $itk_component(hull)
-            error "couldn't read redirection request"
-        }
-        set addr [format "%u.%u.%u.%u" \
-            [expr {$b1 & 0xff}] \
-            [expr {$b2 & 0xff}] \
-            [expr {$b3 & 0xff}] \
-            [expr {$b4 & 0xff}]]
-
-        if { [string equal $addr "0.0.0.0"] } {
-            # We're connected. Cancel any pending serverDown events and
-            # release the busy window over the hull.
-            $_dispatcher cancel !serverDown
-            if { $_idleTimeout > 0 } {
-                $_dispatcher event -after $_idleTimeout !timeout
-            }
-            blt::busy release $itk_component(hull)
-            fconfigure $_sid -buffering line
-            fileevent $_sid readable [itcl::code $this ReceiveHelper]
-            return 1
-        }
-        set hostname $addr
+        # We're connected. Cancel any pending serverDown events and
+        # release the busy window over the hull.
+        $_dispatcher cancel !serverDown
+        if { $_idleTimeout > 0 } {
+            $_dispatcher event -after $_idleTimeout !timeout
+        }
+        blt::busy release $itk_component(hull)
+        fconfigure $_sid -buffering line
+        fileevent $_sid readable [itcl::code $this ReceiveHelper]
+        return 1
     }
     #NOTREACHED
@@ -295 +276 @@
     if { [IsConnected] } {
         if { [eof $_sid] } {
-            error "unexpected eof on socket"
-        }
-        $_dispatcher cancel !timeout
-        if { $_idleTimeout > 0 } {
-            $_dispatcher event -after $_idleTimeout !timeout
-        }
-        return 1
+            Disconnect
+        } else {
+            $_dispatcher cancel !timeout
+            if { $_idleTimeout > 0 } {
+                $_dispatcher event -after $_idleTimeout !timeout
+            }
+            return 1
+        }
     }
     # If we aren't connected, assume it's because the connection to the