Changeset 1294 for trunk/gui/scripts/visviewer.tcl

Timestamp:

Mar 6, 2009, 8:41:16 PM (16 years ago)

Author:

dkearney

Message:

code clean up, hate tabs

File:

• trunk/gui/scripts/visviewer.tcl (modified) (11 diffs)

trunk/gui/scripts/visviewer.tcl

@@ -35 +35 @@
     private variable idleTimeout_ 43200000; # 12 hours
     #private variable idleTimeout_ 5000;    # 5 seconds
-    #private variable idleTimeout_ 0;       # No timeout
+    #private variable idleTimeout_ 0;       # No timeout
 
     protected variable _dispatcher ""   ;# dispatcher for !events
@@ -133 +133 @@
     #
     itk_component add drawer {
-        panedwindow $itk_interior.drawer \
-            -orient horizontal -opaqueresize 1 -handlepad 0 \
-            -handlesize 1 -sashwidth 2     
+        panedwindow $itk_interior.drawer \
+            -orient horizontal -opaqueresize 1 -handlepad 0 \
+            -handlesize 1 -sashwidth 2
     }
     pack $itk_component(drawer) -expand yes -fill both
@@ -207 +207 @@
 # Connect --
 #
-#    Connect to the visualization server (e.g. nanovis, pymolproxy).  
-#    Creates an event callback that is triggered when we are idle 
-#    (no I/O with the server) for some specified time. Sends the server 
-#    some estimate of the size of our job [soon to be deprecated].  
-#    If it's too busy, that server may forward us to another [this 
+#    Connect to the visualization server (e.g. nanovis, pymolproxy).
+#    Creates an event callback that is triggered when we are idle
+#    (no I/O with the server) for some specified time. Sends the server
+#    some estimate of the size of our job [soon to be deprecated].
+#    If it's too busy, that server may forward us to another [this
 #    was been turned off in nanoscale].
 #
@@ -260 +260 @@
             # release the busy window over the hull.
             $_dispatcher cancel !serverDown
-            if { $idleTimeout_ > 0 } {
-                $_dispatcher event -after $idleTimeout_ !timeout
-            }
+            if { $idleTimeout_ > 0 } {
+                $_dispatcher event -after $idleTimeout_ !timeout
+            }
             blt::busy release $itk_component(hull)
             fconfigure $sid_ -buffering line
@@ -308 +308 @@
 itcl::body Rappture::VisViewer::_CheckConnection {} {
     if { [IsConnected] } {
-        if { [eof $sid_] } {
-            error "unexpected eof on socket"
-        }
-        $_dispatcher cancel !timeout
-        if { $idleTimeout_ > 0 } {
-            $_dispatcher event -after $idleTimeout_ !timeout
-        }
-        return 1
+        if { [eof $sid_] } {
+            error "unexpected eof on socket"
+        }
+        $_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
@@ -326 +326 @@
     set code [catch { Connect } ok]
     if { $code == 0 && $ok} {
-        $_dispatcher event -idle !rebuild
-        Rappture::Tooltip::cue hide 
-        return 1
+        $_dispatcher event -idle !rebuild
+        Rappture::Tooltip::cue hide
+        return 1
     } else {
-        Rappture::Tooltip::cue @$x,$y "Can't connect to visualization server.  This may be a network problem.  Wait a few moments and try resetting the view."
-        return 0
+        Rappture::Tooltip::cue @$x,$y "Can't connect to visualization server.  This may be a network problem.  Wait a few moments and try resetting the view."
+        return 0
     }
 }
@@ -356 +356 @@
 itcl::body Rappture::VisViewer::_SendHelper {} {
     if { ![_CheckConnection] } {
-        return 0
+        return 0
     }
     puts $sid_ $buffer_(out)
@@ -374 +374 @@
 itcl::body Rappture::VisViewer::_SendHelper.old {} {
     if { ![_CheckConnection] } {
-        return 0
+        return 0
     }
     set bytesLeft [string length $buffer_(out)]
@@ -407 +407 @@
 
     if { ![_CheckConnection] } {
-        return 0
+        return 0
     }
     # Even though the data is sent in only 1 "puts", we need to verify that
@@ -429 +429 @@
 itcl::body Rappture::VisViewer::ReceiveBytes { size } {
     if { ![_CheckConnection] } {
-        return 0
+        return 0
     }
     set bytes [read $sid_ $size]
@@ -457 +457 @@
 itcl::body Rappture::VisViewer::_ReceiveHelper {} {
     if { ![_CheckConnection] } {
-        return 0
+        return 0
     }
     set n [gets $sid_ line]
-    
+
     if { $n < 0 } {
-        Disconnect
-        return 0
+        Disconnect
+        return 0
     }
     set line [string trim $line]
     if { $line == "" } {
-        return
+        return
     }
     if { [string compare -length 3 $line "nv>"] == 0 } {
-        ReceiveEcho <<line $line
-        append buffer_(in) [string range $line 3 end]
-        append buffer_(in) "\n"
-        if {[info complete $buffer_(in)]} {
-            set request $buffer_(in)
-            set buffer_(in) ""
-            $_parser eval $request
-        }
+        ReceiveEcho <<line $line
+        append buffer_(in) [string range $line 3 end]
+        append buffer_(in) "\n"
+        if {[info complete $buffer_(in)]} {
+            set request $buffer_(in)
+            set buffer_(in) ""
+            $_parser eval $request
+        }
     } elseif { [string compare -length 20 $line "NanoVis Server Error:"] == 0} {
-        # this shows errors coming back from the engine
-        ReceiveEcho <<error $line
-        puts stderr "Render Server Error: $line\n"
+        # this shows errors coming back from the engine
+        ReceiveEcho <<error $line
+        puts stderr "Render Server Error: $line\n"
     } else {
-        # this shows errors coming back from the engine
-        ReceiveEcho <<error $line
-        puts stderr "Garbled message: $line\n"
+        # this shows errors coming back from the engine
+        ReceiveEcho <<error $line
+        puts stderr "Garbled message: $line\n"
     }
 }