Changeset 919 for trunk/gui

Timestamp:

Mar 5, 2008 4:31:15 PM (16 years ago)

Author:

gah

Message:

replumbed all visualization viewers to use new visviewer base class

Location:

trunk/gui/scripts

Files:

• deviceEditor.tcl (modified) (5 diffs)
• heightmapviewer.tcl (modified) (16 diffs)
• isomarker.tcl (modified) (8 diffs)
• molvisviewer.tcl (modified) (48 diffs)
• nanovisviewer.tcl (modified) (27 diffs)
• unirect2d.tcl (modified) (1 diff)
• visviewer.tcl (modified) (13 diffs)

trunk/gui/scripts/deviceEditor.tcl

@@ -51 +51 @@
 }
 
-# must use this name -- plugs into Rappture::resources::load
-proc deviceEditor_init_resources {} {
-    Rappture::resources::register \
-        molvis_server Rappture::DeviceEditor::setMolvisServer
-}
-
 # ----------------------------------------------------------------------
 # CONSTRUCTOR
@@ -127 +121 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::DeviceEditor::add {dataobj {settings ""}} {
-
     set _xmlobj $dataobj
-
     if {"" == $_current} {    # Make sure viewer instance exists
         _redraw
     }
-
     eval $_current add $dataobj [list $settings]
 }
@@ -144 +135 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::DeviceEditor::delete {args} {
-
     if {"" != $_current} {
         eval $_current delete $args
@@ -183 +173 @@
     switch -- [_type $_xmlobj] {
         molecule {
-            if {![winfo exists $itk_component(hull).mol]} {
-                catch {destroy $itk_component(hull).dev}
-                if {"" != $_molvisHosts} {
-                    Rappture::MolvisViewer $itk_component(hull).mol $_molvisHosts
+            if { ![winfo exists $itk_component(hull).mol] } {
+                catch {
+                    destroy $itk_component(hull).dev
+                }
+                set servers [Rappture::VisViewer::GetServerList "pymol"]
+                if { "" != $servers } {
+                    Rappture::MolvisViewer $itk_component(hull).mol $servers
                 } else {
                     Rappture::MoleculeViewer $itk_component(hull).mol $this
@@ -192 +185 @@
                 pack $itk_component(hull).mol -expand yes -fill both
             }
-
             set _current $itk_component(hull).mol
         }
         device1D {
-            if {![winfo exists $itk_component(hull).dev]} {
-                catch {destroy $itk_component(hull).mol}
+            if { ![winfo exists $itk_component(hull).dev] } {
+                catch {
+                    destroy $itk_component(hull).mol
+                }
                 Rappture::DeviceViewer1D $itk_component(hull).dev $this
                 pack $itk_component(hull).dev -expand yes -fill both
             }
-
             set _current $itk_component(hull).dev
         }

trunk/gui/scripts/heightmapviewer.tcl

@@ -67 +67 @@
     protected method _receive_legend {ivol vmin vmax size}
     protected method _receive_echo {channel {data ""}}
-    protected method _receive_data {args}
 
     protected method _rebuild {}
@@ -124 +123 @@
     $_parser alias image [itcl::code $this _receive_image]
     $_parser alias legend [itcl::code $this _receive_legend]
-    $_parser alias data [itcl::code $this _receive_data]
-
-    set _view(theta) 45
-    set _view(phi) 45
-    set _view(psi) 0
-    set _view(zoom) 1
-    set _view(xfocus) 0
-    set _view(yfocus) 0
-    set _view(zfocus) 0
+
+    # Initialize the view to some default parameters.
+    array set _view {
+        theta   45
+        phi     45
+        psi     0
+        zoom    1.0
+        xfocus  0
+        yfocus  0
+        zfocus  0
+    }
     set _obj2id(count) 0
 
@@ -469 +470 @@
 
 # ----------------------------------------------------------------------
+# USAGE: isconnected
+#
+# Clients use this method to see if we are currently connected to
+# a server.
+# ----------------------------------------------------------------------
+itcl::body Rappture::HeightmapViewer::isconnected {} {
+    return [VisViewer::IsConnected]
+}
+
+# ----------------------------------------------------------------------
 # USAGE: Connect ?<host:port>,<host:port>...?
 #
@@ -503 +514 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: isconnected
-#
-# Clients use this method to see if we are currently connected to
-# a server.
-# ----------------------------------------------------------------------
-itcl::body Rappture::HeightmapViewer::isconnected {} {
-    return [VisViewer::IsConnected]
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _send <string>
-#
-# Used internally to send commands off to the rendering server.
-# ----------------------------------------------------------------------
+#
+# _send
+#
+#       Send commands off to the rendering server.  If we're currently
+#       sending data objects to the server, buffer the commands to be 
+#       sent later.
+#
 itcl::body Rappture::HeightmapViewer::_send {string} {
-    if { ![isconnected] } {
-        $_dispatcher cancel !serverDown
-        set x [expr {[winfo rootx $itk_component(area)]+10}]
-        set y [expr {[winfo rooty $itk_component(area)]+10}]
-        Rappture::Tooltip::cue @$x,$y "Connecting..."
-
-        set code [catch { Connect } ok]
-        if { $code == 0 && $ok} {
-            set w [winfo width $itk_component(3dview)]
-            set h [winfo height $itk_component(3dview)]
-
-            if { [Send "screen $w $h"] } {
-                set _view(theta) 45
-                set _view(phi) 45
-                set _view(psi) 0
-                set _view(zoom) 1.0
-                $_dispatcher event -idle !rebuild
-                Rappture::Tooltip::cue hide
-            }
-        } 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."
+    if {[llength $_sendobjs] > 0} {
+        append _outbuf $string "\n"
+    } else {
+        if {[SendBytes $string]} {
+            foreach line [split $string \n] {
+                SendEcho >>line $line
+            }
         }
-    } else {
-        # if we're transmitting objects, then buffer this command
-        if {[llength $_sendobjs] > 0} {
-            append _outbuf $string "\n"
-        } else {
-            if { [Send $string] } {
-                foreach line [split $string \n] {
-                    SendEcho >>line $line
-                }
-            }
-        }
     }
 }
@@ -565 +543 @@
     blt::busy hold $itk_component(hull); update idletasks
 
+    # Reset the overall limits 
+    if { $_sendobjs != "" } {
+        set _limits(vmin) ""
+        set _limits(vmax) ""
+    }
     foreach dataobj $_sendobjs {
         foreach comp [$dataobj components] {
@@ -570 +553 @@
             set data [$dataobj blob $comp]
 
+            foreach { vmin vmax }  [$dataobj limits v] break
+            if { $_limits(vmin) == "" || $vmin < $_limits(vmin) } {
+                set _limits(vmin) $vmin
+            }
+            if { $_limits(vmax) == "" || $vmax > $_limits(vmax) } {
+                set _limits(vmax) $vmax
+            }
+
             # tell the engine to expect some data
-            set length [string length $data]
-            set cmdstr "heightmap data follows $length"
-            if { ![Send $cmdstr] } {
+            set nbytes [string length $data]
+            if { ![SendBytes "heightmap data follows $nbytes"] } {
                 return
             }
-            while {[string length $data] > 0} {
-                update
-
-                set chunk [string range $data 0 8095]
-                set data [string range $data 8096 end]
-                if { ![Send $chunk -nonewline] } {
-                    return
-                }
-                Flush
-            }
-            Send ""
-
+            if { ![SendBytes $data] } {
+                return
+            }
             set id $_obj2id(count)
             incr _obj2id(count)
@@ -600 +581 @@
             foreach {sname cmap wmap} [_getTransfuncData $dataobj $comp] break
             set cmdstr [list "transfunc" "define" $sname $cmap $wmap]
-            if {![Send $cmdstr]} {
+            if {![SendBytes $cmdstr]} {
                 return
             }
@@ -627 +608 @@
 
     # if there are any commands in the buffer, send them now that we're done
-    Send $_outbuf
+    SendBytes $_outbuf
     set _outbuf ""
 
@@ -642 +623 @@
 itcl::body Rappture::HeightmapViewer::_receive_image {option size} {
     if {[isconnected]} {
-        set bytes [Receive $size]
+        set bytes [ReceiveBytes $size]
         $_image(plot) configure -data $bytes
         ReceiveEcho <<line "<read $size bytes for [image width $_image(plot)]x[image height $_image(plot)] image>"
@@ -657 +638 @@
 itcl::body Rappture::HeightmapViewer::_receive_legend {ivol vmin vmax size} {
     if { [isconnected] } {
-        set bytes [Receive $size]
+        set bytes [ReceiveBytes $size]
         $_image(legend) configure -data $bytes
         ReceiveEcho <<line "<read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
@@ -673 +654 @@
                  -fill $itk_option(-plotforeground) -tags vmax
         }
-        $c itemconfigure vmin -text $vmin
+        $c itemconfigure vmin -text $_limits(vmin)
         $c coords vmin 10 [expr {$h-8}]
-        $c itemconfigure vmax -text $vmax
+        $c itemconfigure vmax -text $_limits(vmax)
         $c coords vmax [expr {$w-10}] [expr {$h-8}]
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _receive_data <id> <vmin> <vmax> 
-#
-# Invoked automatically whenever the "legend" command comes in from
-# the rendering server.  Indicates that binary image data with the
-# specified <size> will follow.
-# ----------------------------------------------------------------------
-itcl::body Rappture::HeightmapViewer::_receive_data { args } {
-    if { [isconnected] } {
-        array set info $args
-        set id $info(id)
-        foreach { dataobj comp } $_id2obj($id) break
-        if { ![info exists _limits($dataobj-vmin] } {
-            set _limits($dataobj-vmin) $info(min)
-            set _limits($dataobj-vmax) $info(max)
-        } else {
-            if { $_limits($dataobj-vmin) > $info(min) } {
-                set _limits($dataobj-vmin) $info(min)
-            } 
-            if { $_limits($dataobj-vmax) > $info(max) } {
-                set _limits($dataobj-vmax) $info(max)
-            } 
-        }           
-        set _limits(vmin) $info(vmin)
-        set _limits(vmax) $info(vmax)
-        lappend _sendobjs2 $dataobj
-        unset _receiveids($info(id))
-        if { [array size _receiveids] == 0 } {
-            #$_dispatcher event -idle !send_transfuncs
-        }
     }
 }
@@ -725 +673 @@
         return
     }
-
-    #
-    # Find any new data that needs to be sent to the server.
-    # Queue this up on the _sendobjs list, and send it out
-    # a little at a time.  Do this first, before we rebuild
-    # the rest.
-    #
+    # Find any new data that needs to be sent to the server.  Queue this up on
+    # the _sendobjs list, and send it out a little at a time.  Do this first,
+    # before we rebuild the rest.
     foreach dataobj [get] {
         set comp [lindex [$dataobj components] 0]
@@ -742 +686 @@
     }
     if {[llength $_sendobjs] > 0} {
-        # send off new data objects
+        # Send off new data objects
         $_dispatcher event -idle !send_dataobjs
     } else {
-        # nothing to send -- activate the proper volume
+        # Nothing to send -- activate the proper volume
         set first [lindex [get] 0]
         if {"" != $first} {
@@ -787 +731 @@
 itcl::body Rappture::HeightmapViewer::_zoom {option} {
     switch -- $option {
-        in {
+        "in" {
             set _view(zoom) [expr {$_view(zoom)*1.25}]
-            _send "camera zoom $_view(zoom)"
-        }
-        out {
+        }
+        "out" {
             set _view(zoom) [expr {$_view(zoom)*0.8}]
-            _send "camera zoom $_view(zoom)"
-        }
-        reset {
-            set _view(theta) 45
-            set _view(phi) 45
-            set _view(psi) 0
-            set _view(zoom) 1.0
+        }
+        "reset" {
+            array set _view {
+                theta   45
+                phi     45
+                psi     0
+                zoom    1.0
+            }
             set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
             _send "camera angle $xyz"
-            _send "camera zoom $_view(zoom)"
-        }
-    }
+        }
+    }
+    _send "camera zoom $_view(zoom)"
 }
 
@@ -819 +763 @@
         click {
             $itk_component(3dview) configure -cursor fleur
-            set _click(x) $x
-            set _click(y) $y
-            set _click(theta) $_view(theta)
-            set _click(phi) $_view(phi)
+            set _click(x)       $x
+            set _click(y)       $y
+            set _click(theta)   $_view(theta)
+            set _click(phi)     $_view(phi)
         }
         drag {
@@ -865 +809 @@
                 }
 
-                set _view(theta) $theta
-                set _view(phi) $phi
-                set _view(psi) $psi
+                set _view(theta)        $theta
+                set _view(phi)          $phi
+                set _view(psi)          $psi
                 set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
                 _send "camera angle $xyz"

trunk/gui/scripts/isomarker.tcl

@@ -28 +28 @@
 
     constructor {c obj args} { 
-        puts stderr "call IsoMarker constructor"
         set _canvas $c
         set _nvobj $obj
@@ -40 +39 @@
                 -anchor n -fill white -font "Helvetica 6" \
                 -tags "$this $obj" -state hidden]
-        $c bind $_tick <Enter> [itcl::code $this handle_event "enter"]
-        $c bind $_tick <Leave> [itcl::code $this handle_event "leave"]
+        $c bind $_tick <Enter> [itcl::code $this HandleEvent "enter"]
+        $c bind $_tick <Leave> [itcl::code $this HandleEvent "leave"]
         $c bind $_tick <ButtonPress-1> \
-            [itcl::code $this handle_event "start" %x %y]
+            [itcl::code $this HandleEvent "start" %x %y]
         $c bind $_tick <B1-Motion> \
-            [itcl::code $this handle_event "update" %x %y]
+            [itcl::code $this HandleEvent "update" %x %y]
         $c bind $_tick <ButtonRelease-1> \
-            [itcl::code $this handle_event "end" %x %y]
+            [itcl::code $this HandleEvent "end" %x %y]
     }
     destructor { 
@@ -53 +52 @@
     }
 
-    public method get_absolute_value {} {
+    public method GetAbsoluteValue {} {
         return $_value
     }
-    public method get_relative_value {} {
+    public method GetRelativeValue {} {
         array set limits [$_nvobj get_limits] 
         if { $limits(vmax) == $limits(vmin) } {
@@ -64 +63 @@
         return [expr {($_value-$limits(vmin))/($limits(vmax) - $limits(vmin))}]
     }
-    public method activate { bool } {
+    public method Activate { bool } {
         if  { $bool || $_active_press || $_active_motion } {
             $_canvas itemconfigure $_label -state normal
@@ -73 +72 @@
         }
     }
-    public method show {} {
-        set_absolute_value $_value
+    public method Show {} {
+        SetAbsoluteValue $_value
         $_canvas itemconfigure $_tick -state normal
         $_canvas raise $_tick
     }
-    public method hide {} {
+    public method Hide {} {
         $_canvas itemconfigure $_tick -state hidden
     }
-    public method get_screen_position { } { 
-        set x [get_relative_value]
+    public method GetScreenPosition { } { 
+        set x [GetRelativeValue]
         if { $x < 0.0 } {
             set x 0.0
@@ -94 +93 @@
         return $x
     }
-    public method set_absolute_value { x } {
+    public method SetAbsoluteValue { x } {
         set _value $x
         set y 31
         $_canvas itemconfigure $_label -text [format %.4g $_value]
-        set x [get_screen_position]
+        set x [GetScreenPosition]
         $_canvas coords $_tick $x [expr {$y+3}]
         $_canvas coords $_label $x [expr {$y+5}]
     }
-    public method set_relative_value { x } {
+    public method SetRelativeValue { x } {
         array set limits [$_nvobj get_limits] 
         if { $limits(vmax) == $limits(vmin) } {
@@ -109 +108 @@
         }
         set r [expr $limits(vmax) - $limits(vmin)]
-        set_absolute_value [expr {($x * $r) + $limits(vmin)}]
+        SetAbsoluteValue [expr {($x * $r) + $limits(vmin)}]
     }
-    public method handle_event { option args } {
+    public method HandleEvent { option args } {
         switch -- $option {
             enter {
                 set _active_motion 1
-                activate yes
+                Activate yes
                 $_canvas raise $_tick
             }
             leave {
                 set _active_motion 0
-                activate no
+                Activate no
             }
             start {
                 $_canvas raise $_tick 
                 set _active_press 1
-                activate yes
+                Activate yes
             }
             update {
                 set w [winfo width $_canvas]
                 set x [lindex $args 0]
-                set_relative_value [expr {double($x-10)/($w-20)}]
+                SetRelativeValue [expr {double($x-10)/($w-20)}]
                 $_nvobj OverIsoMarker $this $x
                 $_nvobj UpdateTransferFunction
@@ -137 +136 @@
                 set x [lindex $args 0]
                 if { ![$_nvobj RemoveDuplicateIsoMarker $this $x]} {
-                    eval handle_event update $args
+                    eval HandleEvent update $args
                 }
                 set _active_press 0
-                activate no
+                Activate no
             }
             default {

trunk/gui/scripts/molvisviewer.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: molvisviewer - view a molecule in 3D
@@ -23 +24 @@
 option add *MolvisViewer.font -*-helvetica-medium-r-normal-*-12-* widgetDefault
 
+# must use this name -- plugs into Rappture::resources::load
+proc MolvisViewer_init_resources {} {
+    Rappture::resources::register \
+        molvis_server [list Rappture::VisViewer::SetServerList "pymol"]
+}
+
+set debug 1
+proc debug { args } {
+    global debug
+    if { $debug } {
+        puts stderr "[info level -1]: $args"
+    }
+}
+
 itcl::class Rappture::MolvisViewer {
-    inherit itk::Widget
+    inherit Rappture::VisViewer
+
     itk_option define -device device Device ""
 
-    constructor {hostlist args} { # defined below }
-    destructor { # defined below }
-
-    public method add {dataobj {settings ""}}
+    constructor { hostlist args } { 
+        Rappture::VisViewer::constructor $hostlist 
+    } { 
+        # defined below 
+    }
+    destructor { 
+        # defined below 
+    }
+    public method Connect {}
+    public method Disconnect {}
+    public method isconnected {}
+    public method download {option args}
+
+    public method add {dataobj {options ""}}
     public method get {}
     public method delete {args}
@@ -39 +65 @@
     public method representation {option {model "all"} }
 
-    public method connect {{hostlist ""}}
-    public method disconnect {}
-    public method isconnected {}
-    public method download {option args}
-    protected method _sendit {args}
     protected method _send {args}
-    protected method _receive { {sid ""} }
     protected method _update { args }
     protected method _rebuild { }
@@ -54 +74 @@
     protected method _vmouse2 {option b m x y}
     protected method _vmouse  {option b m x y}
-    protected method _serverDown {}
-
-    private variable _dispatcher "" ;# dispatcher for !events
-    private variable _sid ""       ;# socket connection to nanovis server
-    private variable _image        ;# image displayed in plotting area
+
+    private method _receive_image { args }
 
     private variable _inrebuild 0
@@ -72 +89 @@
     private variable _model
     private variable _mlist
-    private variable _mrepresentation "ball_and_stick"
+    private variable _mrepresentation "ballnstick"
 
     private variable _imagecache
@@ -78 +95 @@
     private variable _labels  "default"
     private variable _cacheid ""
-    private variable _hostlist ""
     private variable _cacheimage ""
     private variable _busy 0
-    private variable _mapped 0
-
-    common settings  ;# array of settings for all known widgets
+
+    private common _settings  ;# array of settings for all known widgets
 }
 
@@ -94 +109 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::constructor {hostlist args} {
-    #puts stderr "MolvisViewer::_constructor()"
+    # Register events to the dispatcher.  Base class expects !rebuild 
+    # event to be registered.
+
+    # Rebuild
+    $_dispatcher register !rebuild
+    $_dispatcher dispatch $this !rebuild "[itcl::code $this _rebuild]; list"
+    # Rocker
+    $_dispatcher register !rocker
+    $_dispatcher dispatch $this !rocker "[itcl::code $this rock step]; list"
+    # Mouse Event
+    $_dispatcher register !mevent
+    $_dispatcher dispatch $this !mevent "[itcl::code $this _mevent]; list"
+
+    # Populate the slave interpreter with commands to handle responses from
+    # the visualization server.
+    $_parser alias image [itcl::code $this _receive_image]
 
     set _rocker(dir) 1
@@ -102 +132 @@
     set _state(server) 1
     set _state(client) 1
-
-    array set settings [list \
-        $this-model $_mrepresentation \
-        $this-modelimg [image create photo -width 64 -height 64] \
-        $this-emblems 0 \
-        $this-rock 0 \
-    ]
-    $settings($this-modelimg) copy [Rappture::icon ballnstick]
-
-    Rappture::dispatcher _dispatcher
-    $_dispatcher register !serverDown
-    $_dispatcher dispatch $this !serverDown "[itcl::code $this _serverDown]; list"
+    set _hostlist $hostlist
+
+    array set _settings [subst {
+        $this-model $_mrepresentation 
+        $this-modelimg [Rappture::icon ballnstick]
+        $this-emblems 0 
+        $this-rock 0 
+    }]
 
     #
     # Set up the widgets in the main body
     #
-    option add hull.width hull.height
-    pack propagate $itk_component(hull) no
-
-    itk_component add controls {
-        frame $itk_interior.cntls
-    } {
-        usual
-        rename -background -controlbackground controlBackground Background
-    }
-    pack $itk_component(controls) -side right -fill y
-
     itk_component add zoom {
         frame $itk_component(controls).zoom
@@ -141 +156 @@
             -borderwidth 1 -padx 1 -pady 1 \
             -bitmap [Rappture::icon reset] \
-            -command [itcl::code $this _send reset]
+            -command [itcl::code $this _send "reset"]
     } {
         usual
@@ -199 +214 @@
     set fg [option get $itk_component(hull) font Font]
 
-    label $inner.model.pict -image $settings($this-modelimg)
+    label $inner.model.pict -image $_settings($this-modelimg)
     pack $inner.model.pict -side left -anchor n
     label $inner.model.heading -text "Method for drawing atoms:"
     pack $inner.model.heading -side top -anchor w
     radiobutton $inner.model.bstick -text "Balls and sticks" \
-        -command [itcl::code $this representation ball_and_stick all] \
-        -variable Rappture::MolvisViewer::settings($this-model) -value ball_and_stick
+        -command [itcl::code $this representation ballnstick all] \
+        -variable Rappture::MolvisViewer::_settings($this-model) \
+        -value ballnstick
     pack $inner.model.bstick -side top -anchor w
     radiobutton $inner.model.spheres -text "Spheres" \
         -command [itcl::code $this representation spheres all] \
-        -variable Rappture::MolvisViewer::settings($this-model) -value spheres
+        -variable Rappture::MolvisViewer::_settings($this-model) \
+        -value spheres
     pack $inner.model.spheres -side top -anchor w
     radiobutton $inner.model.lines -text "Lines" \
         -command [itcl::code $this representation lines all] \
-        -variable Rappture::MolvisViewer::settings($this-model) -value lines
+        -variable Rappture::MolvisViewer::_settings($this-model) \
+        -value lines
     pack $inner.model.lines -side top -anchor w
 
     checkbutton $inner.labels -text "Show labels on atoms" \
         -command [itcl::code $this emblems update] \
-        -variable Rappture::MolvisViewer::settings($this-emblems)
+        -variable Rappture::MolvisViewer::_settings($this-emblems)
     pack $inner.labels -side top -anchor w -pady {4 1}
 
     checkbutton $inner.rock -text "Rock model back and forth" \
         -command [itcl::code $this rock toggle] \
-        -variable Rappture::MolvisViewer::settings($this-rock)
+        -variable Rappture::MolvisViewer::_settings($this-rock)
     pack $inner.rock -side top -anchor w -pady {1 4}
 
@@ -270 +288 @@
     #
 
-    itk_component add area {
-        frame $itk_interior.area
-    }
-    pack $itk_component(area) -expand yes -fill both
-
-    set _image(plot) [image create photo]
     set _image(id) ""
-
-    itk_component add 3dview {
-        label $itk_component(area).vol -image $_image(plot) \
-            -highlightthickness 0
-    } {
-        usual
-        ignore -highlightthickness
-    }
-    pack $itk_component(3dview) -expand yes -fill both
 
     # set up bindings for rotation
@@ -309 +312 @@
     #    [itcl::code $this _vmouse2 move 0 %s %x %y]
 
-    connect $hostlist
-
     bind $itk_component(3dview) <Configure> \
         [itcl::code $this _configure %w %h]
@@ -318 +319 @@
         [itcl::code $this _map]
 
-    $_dispatcher register !rebuild
-    $_dispatcher dispatch $this !rebuild "[itcl::code $this _rebuild]; list"
-    
     eval itk_initialize $args
+    Connect 
 }
 
@@ -328 +327 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::destructor {} {
-    #puts stderr "MolvisViewer::destructor()"
-    disconnect
+    VisViewer::Disconnect
 
     image delete $_image(plot)
-    image delete $settings($this-modelimg)
-    unset settings($this-emblems)
-    unset settings($this-rock)
-    unset settings($this-model)
-    unset settings($this-modelimg)
+    array unset _settings $this-*
 }
 
@@ -362 +356 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: connect ?<host:port>,<host:port>...?
-#
-# Clients use this method to establish a connection to a new
-# server, or to reestablish a connection to the previous server.
-# Any existing connection is automatically closed.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::connect {{hostlist ""}} {
-    #puts stderr "Rappture::MolvisViewer::connect($hostlist)"
-
-    if { "" != $hostlist } { set _hostlist $hostlist }
-
-    set hostlist $_hostlist
-    $_image(plot) blank
-
-    disconnect
-
-    if {"" == $hostlist} {
+#
+# isconnected --
+#
+#       Indicates if we are currently connected to the visualization server.
+#
+itcl::body Rappture::MolvisViewer::isconnected {} {
+    return [VisViewer::IsConnected]
+}
+
+
+#
+# Connect --
+#
+#       Establishes a connection to a new visualization server.
+#
+itcl::body Rappture::MolvisViewer::Connect {} {
+    #$_image(plot) blank
+    set hosts [GetServerList "pymol"]
+    if { "" == $hosts } {
         return 0
     }
-
-    blt::busy hold $itk_component(hull) -cursor watch
-    
-    update idletasks
-
-    # HACK ALERT! punt on this for now
-    set memorySize 10000
-
-    #
-    # Connect to the molvis server.  
-    # If it's too busy, that server may
-    # forward us to another.
-    #
-
-    set hosts [split $hostlist ,]
-
-    foreach {hostname port} [split [lindex $hosts 0] :] break
-
-    set hosts [lrange $hosts 1 end]
-    set result 0
-
-    while {1} {
-        if {[catch {socket $hostname $port} sid]} {
-            if {[llength $hosts] == 0} {
-                break;
-            }
-            foreach {hostname port} [split [lindex $hosts 0] :] break
-            set hosts [lrange $hosts 1 end]
-            continue
-        }
-        fconfigure $sid -translation binary -encoding binary -buffering line -buffersize 1000
-        #puts $sid "pymol"
-        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} {
-            error "couldn't read redirection request"
-        }
-
-        set hostname [format "%u.%u.%u.%u" \
-            [expr {$b1 & 0xff}] \
-            [expr {$b2 & 0xff}] \
-            [expr {$b3 & 0xff}] \
-            [expr {$b4 & 0xff}]]
-
-        if {[string equal $hostname "0.0.0.0"]} {
-            set _sid $sid
-            set _rocker(server) 0
-            set _cacheid 0
-
-            fileevent $_sid readable [itcl::code $this _receive $_sid]
-
-            _send raw -defer set auto_color,0
-            _send raw -defer set auto_show_lines,0
-
-            set result 1
-            break
-        }
-    }
-
-    blt::busy release $itk_component(hull)
-    
+    set result [VisViewer::Connect $hosts]
+    if { $result } {
+        set _rocker(server) 0
+        set _cacheid 0
+        _send "raw -defer {set auto_color,0}"
+        _send "raw -defer {set auto_show_lines,0}"
+    }
     return $result
 }
 
-# ----------------------------------------------------------------------
-# USAGE: disconnect
-#
-# Clients use this method to disconnect from the current rendering
-# server.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::disconnect {} {
-    #puts stderr "MolvisViewer::disconnect()"
-
-    catch { fileevent $_sid readable {} }
+#
+# Disconnect --
+#
+#       Clients use this method to disconnect from the current rendering
+#       server.
+#
+itcl::body Rappture::MolvisViewer::Disconnect {} {
+    VisViewer::Disconnect
+
+    # disconnected -- no more data sitting on server
     catch { after cancel $_rocker(afterid) }
     catch { after cancel $_mevent(afterid) }
-    catch { close $_sid }
-    catch { unset _dataobjs }
-    catch { unset _model }
-    catch { unset _mlist }
-    catch { unset _imagecache }
-
-    set _sid ""
+    array unset _dataobjs
+    array unset _model
+    array unset _mlist
+    array unset _imagecache
+
     set _state(server) 1
     set _state(client) 1
-}
-
-# ----------------------------------------------------------------------
-# USAGE: isconnected
-#
-# Clients use this method to see if we are currently connected to
-# a server.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::isconnected {} {
-    #puts stderr "MolvisViewer::isconnected()"
-    return [expr {"" != $_sid}]
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _send <arg> <arg> ...
-#
-# Used internally to send commands off to the rendering server.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::_sendit {args} {
-    #puts stderr "Rappture::MolvisViewer::_sendit($args)"
-
-    if { $_sid != "" } {
-        if { ![catch { puts $_sid $args }] } {
-            flush $_sid
-            return 0
-        } else {
-            catch { close $_sid }
-            set _sid ""
-        }
-    }
-
-    $_dispatcher event -after 1 !rebuild
-
-    return 1
-}
-
-itcl::body Rappture::MolvisViewer::_send {args} {
-    #puts stderr "Rappture::MolvisViewer::_send($args)"
-
+    set _outbuf ""
+}
+
+itcl::body Rappture::MolvisViewer::_send { args } {
     if { $_state(server) != $_state(client) } {
-        if { [_sendit "frame -defer $_state(client)"] == 0 } {
+        if { ![SendBytes "frame -defer $_state(client)"] } {
             set _state(server) $_state(client)
         }
@@ -517 +417 @@
 
     if { $_rocker(server) != $_rocker(client) } {
-        if { [_sendit "rock -defer $_rocker(client)"]  == 0 } {
+        if { ![SendBytes "rock -defer $_rocker(client)"] } {
             set _rocker(server) $_rocker(client)
         }
     }
-
-    eval _sendit $args
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _receive
-#
-# Invoked automatically whenever a command is received from the
-# rendering server.  Reads the incoming command and executes it in
-# a safe interpreter to handle the action.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::_receive { {sid ""} } {
-    #puts stderr "Rappture::MolvisViewer::_receive($sid)"
-
-    if { $sid == "" } {
-        return
-    }
-
-    fileevent $sid readable {} 
-
-    if { $sid != $_sid } {
-        return
-    }
-
-    fconfigure $_sid -buffering line -blocking 0
-        
-    if {[gets $_sid line] < 0} {
-
-        if { ![fblocked $_sid] } { 
-            catch { close $_sid }
-            set _sid ""
-            $_dispatcher event -after 750 !serverDown
-        }
-
-    }  elseif {[regexp {^\s*nv>\s*image\s+(\d+)\s*(\d+)\s*,\s*(\d+)\s*,\s*(-{0,1}\d+)} $line whole match cacheid frame rock]} {
-
-        set tag "$frame,$rock"
-            
-        if { $cacheid != $_cacheid } {
-            catch { unset _imagecache }
-            set _cacheid $cacheid
-        }
-
-        fconfigure $_sid -buffering none -blocking 1
-        set _imagecache($tag) [read $_sid $match]
-        #puts stderr "CACHED: $tag,$cacheid"
-        $_image(plot) put $_imagecache($tag)
-        set _image(id) $tag
-
-        if { $_busy } {
-            $itk_component(3dview) configure -cursor ""
-            set _busy 0
-        }
-
-    } else {
-        # this shows errors coming back from the engine
-        puts $line
-    }
-    
-    if { $_sid != "" } {
-        fileevent $_sid readable [itcl::code $this _receive $_sid] 
-    } 
-}
+    eval SendBytes $args
+}
+
+#
+# _receive_image -bytes <size>
+#
+#     Invoked automatically whenever the "image" command comes in from
+#     the rendering server.  Indicates that binary image data with the
+#     specified <size> will follow.
+#
+itcl::body Rappture::MolvisViewer::_receive_image { size cacheid frame rock } {
+    set tag "$frame,$rock"
+    if { $cacheid != $_cacheid } {
+        array unset _imagecache 
+        set _cacheid $cacheid
+    }
+    set _imagecache($tag) [ReceiveBytes $size]
+ 
+    #puts stderr "CACHED: $tag,$cacheid"
+    $_image(plot) configure -data $_imagecache($tag)
+    set _image(id) $tag
+}
+
 
 # ----------------------------------------------------------------------
@@ -593 +453 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::_rebuild {} {
-    #puts stderr "Rappture::MolvisViewer::_rebuild()"
-
     if { $_inrebuild } { 
         # don't allow overlapping rebuild calls
@@ -600 +458 @@
     }
 
-    set _inrebuild 1
-
-    if {"" == $_sid} {
-        $_dispatcher cancel !serverDown
-
-        set x [expr {[winfo rootx $itk_component(area)]+10}]
-        set y [expr {[winfo rooty $itk_component(area)]+10}]
-
-        Rappture::Tooltip::cue @$x,$y "Connecting..."
-        update idletasks
-
-        if {[catch {connect} ok] == 0 && $ok} {
-            set w [winfo width $itk_component(3dview)]
-            set h [winfo height $itk_component(3dview)]
-            _send screen -defer $w $h
-            Rappture::Tooltip::cue hide
-        } 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."
-            set _inrebuild 0
-            set _busy 1
-            return
-        }
-    }
-
+    #set _inrebuild 1
     set changed 0
     set _busy 1
@@ -631 +466 @@
     # refresh GUI (primarily to make pending cursor changes visible)
     update idletasks 
-
     set dlist [get]
-
     foreach dev $dlist {
         set model [$dev get components.molecule.model]
@@ -653 +486 @@
             set _mlist($model) 2
         }
-
         if { ![info exists _dataobjs($model-$state)] } {
             set data1      ""
@@ -679 +511 @@
                 incr serial
             }
-
             set data2 [$dev get components.molecule.pdb]
-
             if {"" != $data1} {
-                eval _send loadpdb -defer \"$data1\" $model $state
+                _send "loadpdb -defer \"$data1\" $model $state"
                 set _dataobjs($model-$state)  1
-                #puts stderr "loaded model $model into state $state"
+                puts stderr "loaded model $model into state $state"
             }
-            
             if {"" != $data2} {
-                eval _send loadpdb -defer \"$data2\" $model $state
+                _send "loadpdb -defer \"$data2\" $model $state"
                 set _dataobjs($model-$state)  1
-                #puts stderr "loaded model $model into state $state"
+                puts stderr "loaded model $model into state $state"
             }
         }
-
         if { ![info exists _model($model-transparency)] } {
             set _model($model-transparency) "undefined"
         }
-
         if { ![info exists _model($model-representation)] } {
             set _model($model-representation) "undefined"
             set _model($model-newrepresentation) $_mrepresentation
         }
-
-
         if { $_model($model-transparency) != $_dobj2transparency($dev) } {
-            set  _model($model-newtransparency) $_dobj2transparency($dev)
+            set _model($model-newtransparency) $_dobj2transparency($dev)
         } 
     }
 
-    # enable/disable models as required (0=off->off, 1=on->off, 2=off->on, 3=on->on)
+    # enable/disable models as required (0=off->off, 1=on->off, 2=off->on,
+    # 3=on->on)
 
     foreach obj [array names _mlist] {
         if { $_mlist($obj) == 1 } {
-            _send disable -defer $obj
+            _send "disable -defer $obj"
             set _mlist($obj) 0
             set changed 1
         } elseif { $_mlist($obj) == 2 } {
             set _mlist($obj) 1
-            _send enable -defer $obj
+            _send "enable -defer $obj"
             if { $_labels } {
-                _send label -defer on
+                _send "label -defer on"
             } else {
-                _send label -defer off
+                _send "label -defer off"
             }
             set changed 1
@@ -730 +556 @@
         }
 
-
         if { $_mlist($obj) == 1 } {
-            if {  [info exists _model($obj-newtransparency)] || [info exists _model($obj-newrepresentation)] } {
+            if {  [info exists _model($obj-newtransparency)] || 
+                  [info exists _model($obj-newrepresentation)] } {
                 if { ![info exists _model($obj-newrepresentation)] } {
                     set _model($obj-newrepresentation) $_model($obj-representation)
@@ -739 +565 @@
                     set _model($obj-newtransparency) $_model($obj-transparency)
                 }
-                _send $_model($obj-newrepresentation) -defer -model $obj -$_model($obj-newtransparency)
+                set rep $_model($obj-newrepresentation)
+                set transp $_model($obj-newtransparency)
+                _send "$_model($obj-newrepresentation) -defer -model $obj -$_model($obj-newtransparency)"
                 set changed 1
                 set _model($obj-transparency) $_model($obj-newtransparency)
@@ -751 +579 @@
 
     }
-
     if { $changed } {
-        catch { unset _imagecache }
-    }
-
+        array unset _imagecache
+    }
     if { $dlist == "" } {
         set _state(server) 1
         set _state(client) 1
-        _send frame -push 1
+        _send "frame -push 1"
     } elseif { ![info exists _imagecache($state,$_rocker(client))] } {
         set _state(server) $state
         set _state(client) $state
-        _send frame -push $state
+        _send "frame -push $state"
     } else {
         set _state(client) $state
@@ -770 +596 @@
 
     set _inrebuild 0
-
-    if { $_sid == "" } {
-        # connection failed during rebuild, don't attempt to reconnect/rebuild
-        # until user initiates some action
-
-        disconnect
-        $_dispatcher cancel !rebuild
-        $_dispatcher event -after 750 !serverDown
-    }
     $itk_component(3dview) configure -cursor ""
 }
 
 itcl::body Rappture::MolvisViewer::_unmap { } {
-    #puts stderr "Rappture::MolvisViewer::_unmap()"
-
     #pause rocking loop while unmapped (saves CPU time)
     rock pause
 
-    # blank image, mark current image dirty
-    # this will force reload from cache, or remain blank if cache is cleared
-    # this prevents old image from briefly appearing when a new result is added
+    # Blank image, mark current image dirty
+    # This will force reload from cache, or remain blank if cache is cleared
+    # This prevents old image from briefly appearing when a new result is added
     # by result viewer
 
-    set _mapped 0
-    $_image(plot) blank
+    #$_image(plot) blank
     set _image(id) ""
 }
 
 itcl::body Rappture::MolvisViewer::_map { } {
-    #puts stderr "Rappture::MolvisViewer::_map()"
-
-    set _mapped 1
-
-    # resume rocking loop if it was on
-    rock unpause
-
-    # rebuild image if modified, or redisplay cached image if not
-    $_dispatcher event -idle !rebuild
+    if { [isconnected] } {
+        # resume rocking loop if it was on
+        rock unpause
+        # rebuild image if modified, or redisplay cached image if not
+        $_dispatcher event -idle !rebuild
+    }
 }
 
 itcl::body Rappture::MolvisViewer::_configure { w h } {
-    #puts stderr "Rappture::MolvisViewer::_configure($w $h)"
-
     $_image(plot) configure -width $w -height $h
-    
     # immediately invalidate cache, defer update until mapped
-    
-    catch { unset _imagecache } 
-
-    if { $_mapped } {
-        _send screen $w $h
-    } else {
-        _send screen -defer $w $h
+    array unset _imagecache 
+    if { [isconnected] } {
+        if { [winfo ismapped $itk_component(3dview)] } {
+            _send "screen $w $h"
+            _send "reset -push"
+        } else {
+            _send "screen -defer $w $h"
+            _send "reset -push"
+        }
     }
 }
@@ -835 +645 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::_zoom {option} {
-    #puts stderr "MolvisViewer::_zoom()"
     switch -- $option {
-        in {
-            _send zoom 10
-        }
-        out {
-            _send zoom -10
-        }
-        reset {
-            _send reset
+        "in" {
+            _send "zoom 10"
+        }
+        "out" {
+            _send "zoom -10"
+        }
+        "reset" {
+            _send "reset"
         }
     }
@@ -850 +659 @@
 
 itcl::body Rappture::MolvisViewer::_update { args } {
-    #puts stderr "Rappture::MolvisViewer::_update($args)"
-
-    if { $_image(id) != "$_state(client),$_rocker(client)" } {
-        if { [info exists _imagecache($_state(client),$_rocker(client))] } {
+    set tag "$_state(client),$_rocker(client)"
+    if { $_image(id) != "$tag" } {
+        if { [info exists _imagecache($tag)] } {
             #puts stderr "DISPLAYING CACHED IMAGE"
-            $_image(plot) put $_imagecache($_state(client),$_rocker(client))
-            set _image(id) "$_state(client),$_rocker(client)"
+            $_image(plot) configure -data $_imagecache($tag)
+            set _image(id) "$tag"
         }
     }
@@ -870 +678 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::rock { option } {
-    #puts "MolvisViewer::_rock($option,$_rocker(client))"
-    
     # cancel any pending rocks
     if { [info exists _rocker(afterid)] } { 
@@ -885 +691 @@
         }
     }
-
     if { $option == "on" || ($option == "toggle" && !$_rocker(on)) } {
         set _rocker(on) 1
-        set settings($this-rock) 1
+        set _settings($this-rock) 1
         $itk_component(rock) configure -relief sunken
     } elseif { $option == "off" || ($option == "toggle" && $_rocker(on)) } {
         set _rocker(on) 0
-        set settings($this-rock) 0
+        set _settings($this-rock) 0
         $itk_component(rock) configure -relief raised
     } elseif { $option == "step"} {
-
         if { $_rocker(client) >= 10 } {
             set _rocker(dir) -1
@@ -901 +705 @@
             set _rocker(dir) 1
         }
-
         set _rocker(client) [expr {$_rocker(client) + $_rocker(dir)}]
-   
         if { ![info exists _imagecache($_state(server),$_rocker(client))] } {
             set _rocker(server) $_rocker(client)
-            _send rock $_rocker(client)
+            _send "rock $_rocker(client)"
         }
         _update
     }
-
     if { $_rocker(on) && $option != "pause" } {
          set _rocker(afterid) [after 200 [itcl::code $this rock step]]
@@ -935 +736 @@
 
         catch { set diff [expr $now - $_mevent(time)] } 
-
         if {$diff < 75} { # 75ms between motion updates
             return
         }
     }
-
-     _send vmouse $vButton $vModifier $vState $x $y
-
+    _send "vmouse $vButton $vModifier $vState $x $y"
     set _mevent(time) $now
 }
 
 itcl::body Rappture::MolvisViewer::_vmouse {option b m x y} {
-    #puts stderr "Rappture::MolvisViewer::_vmouse($option,$b,$m,$x,$y)"
-
     set now  [clock clicks -milliseconds]
-
     # cancel any pending delayed dragging events
     if { [info exists _mevent(afterid)] } { 
@@ -960 +755 @@
         set option "click"
     }
-
     if { $option == "click" } { 
         $itk_component(3dview) configure -cursor fleur
     }
-
     if { $option == "drag" || $option == "release" } {
         set diff 0
         catch { set diff [expr $now - $_mevent(time) ] }
-
         if {$diff < 75 && $option == "drag" } { # 75ms between motion updates
             set _mevent(afterid) [after [expr 75 - $diff] [itcl::code $this _vmouse drag $b $m $x $y]]
             return
         }
-
         set w [winfo width $itk_component(3dview)]
         set h [winfo height $itk_component(3dview)]
-
         if {$w <= 0 || $h <= 0} {
             return
         }
-
         set x1 [expr $w / 3]
         set x2 [expr $x1 * 2]
@@ -1006 +795 @@
             set mz $dx
         }
-
-        _send rotate $mx $my $mz
-
-    }
-
+        _send "rotate $mx $my $mz"
+    }
     set _mevent(x) $x
     set _mevent(y) $y
     set _mevent(time) $now
-
     if { $option == "release" } {
         $itk_component(3dview) configure -cursor ""
@@ -1021 +806 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _serverDown
-#
-# Used internally to let the user know when the connection to the
-# visualization server has been lost.  Puts up a tip encouraging the
-# user to press any control to reconnect.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::_serverDown {} {
-    #puts stderr "MolvisViewer::_serverDown()"
-
-    set x [expr {[winfo rootx $itk_component(area)]+10}]
-    set y [expr {[winfo rooty $itk_component(area)]+10}]
-
-    if { $_busy } {
-        $itk_component(3dview) configure -cursor ""
-        set _busy 0
-    }
-
-    Rappture::Tooltip::cue @$x,$y "Lost connection to visualization server.  This happens sometimes when there are too many users and the system runs out of memory.\n\nTo reconnect, reset the view or press any other control.  Your picture should come right back up."
-}
-
-# ----------------------------------------------------------------------
 # USAGE: representation spheres
-# USAGE: representation ball_and_stick
+# USAGE: representation ballnstick
 # USAGE: representation lines
 #
@@ -1050 +814 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::representation {option {model "all"} } {
-    #puts stderr "Rappture::MolvisViewer::representation($option,$model)"
-
-    if { $option == $_mrepresentation } { return }
-
-    switch -- $option {
-        spheres {
-            $settings($this-modelimg) copy [Rappture::icon spheres]
-        }
-        ball_and_stick {
-            $settings($this-modelimg) copy [Rappture::icon ballnstick]
-        }
-        lines {
-            $settings($this-modelimg) copy [Rappture::icon lines]
-        }
-        default {
-            return 
-        }
-    }
-
-    # save the current option to set all radiobuttons -- just in case
-    # this method gets called without the user clicking on a radiobutton
-    set settings($this-model) $option
-
+    if { $option == $_mrepresentation } { 
+        return 
+    }
+    set _settings($this-modelimg) [Rappture::icon $option]
+    set inner [$itk_component(controls).panel component inner]
+    $inner.model.pict configure -image $_settings($this-modelimg)
+
+    # Save the current option to set all radiobuttons -- just in case.
+    # This method gets called without the user clicking on a radiobutton.
+    set _settings($this-model) $option
     set _mrepresentation $option
 
@@ -1080 +831 @@
         set models $model
     }
-
     foreach obj $models {
         if { [info exists _model($obj-representation)] } {
@@ -1090 +840 @@
         }
     }
-
-    $_dispatcher event -idle !rebuild
+    if { [isconnected] } {
+        $_dispatcher event -idle !rebuild
+    }
 }
 
@@ -1102 +853 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::emblems {option} {
-    #puts stderr "MolvisViewer::emblems($option)"
-
     switch -- $option {
         on {
@@ -1112 +861 @@
         }
         toggle {
-            if {$settings($this-emblems)} {
+            if {$_settings($this-emblems)} {
                 set emblem 0
             } else {
@@ -1119 +868 @@
         }
         update {
-            set emblem $settings($this-emblems)
+            set emblem $_settings($this-emblems)
         }
         default {
-            error "bad option \"$option\": should be on, off, toggle, update"
-        }
-    }
-
+            error "bad option \"$option\": should be on, off, toggle, or update"
+        }
+    }
     set _labels $emblem
-
-    if {$emblem == $settings($this-emblems) && $option != "update"} {
+    if {$emblem == $_settings($this-emblems) && $option != "update"} {
         # nothing to do
         return
@@ -1135 +882 @@
     if {$emblem} {
         $itk_component(labels) configure -relief sunken
-        set settings($this-emblems) 1
-        _send label on
+        set _settings($this-emblems) 1
+        _send "label on"
     } else {
         $itk_component(labels) configure -relief raised
-        set settings($this-emblems) 0
-        _send label off
+        set _settings($this-emblems) 0
+        _send "label off"
     }
 }
@@ -1152 +899 @@
 # -brightness and -raise do anything.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::add { dataobj {settings ""}} {
-    #puts stderr "Rappture::MolvisViewer::add($dataobj)"
-
+itcl::body Rappture::MolvisViewer::add { dataobj {options ""}} {
     array set params {
-        -color auto
-        -brightness 0
-        -width 1
-        -raise 0
-        -linestyle solid
-        -description ""
-        -param ""
-    }
-
-    foreach {opt val} $settings {
+        -color          auto
+        -brightness     0
+        -width          1
+        -raise          0
+        -linestyle      solid
+        -description    ""
+        -param          ""
+    }
+
+    foreach {opt val} $options {
         if {![info exists params($opt)]} {
             error "bad settings \"$opt\": should be [join [lsort [array names params]] {, }]"
@@ -1197 +942 @@
         set _dobj2raise($dataobj) $params(-raise)
 
-        $_dispatcher event -idle !rebuild
+        if { [isconnected] } {
+            $_dispatcher event -idle !rebuild
+        }
     }
 }
@@ -1208 +955 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::get {} {
-    #puts stderr "Rappture::MolvisViewer::get()"
-
     # put the dataobj list in order according to -raise options
     set dlist $_dlist
@@ -1231 +976 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::delete {args} {
-    #puts stderr "Rappture::MolvisViewer::delete($args)"
-
     if {[llength $args] == 0} {
         set args $_dlist
@@ -1254 +997 @@
     # if anything changed, then rebuild the plot
     if {$changed} {
-        $_dispatcher event -idle !rebuild
+        if { [isconnected] } {
+            $_dispatcher event -idle !rebuild
+        }
     }
 }
@@ -1262 +1007 @@
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::MolvisViewer::device {
-    #puts stderr "Rappture::MolvisViewer::device($itk_option(-device))"
-
     if {$itk_option(-device) != "" } {
 
@@ -1275 +1018 @@
     }
 
-    $_dispatcher event -idle !rebuild
-}
+    if { [isconnected] } {
+        $_dispatcher event -idle !rebuild
+    }
+}

trunk/gui/scripts/nanovisviewer.tcl

@@ -32 +32 @@
 proc NanovisViewer_init_resources {} {
     Rappture::resources::register \
-        nanovis_server [list Rappture::VisViewer::SetServerList "nanovis" ]
+        nanovis_server [list Rappture::VisViewer::SetServerList "nanovis"]
 }
 
@@ -86 +86 @@
     protected method _fixLegend {}
     protected method GenTransfuncData {dataobj comp}
-    protected method UpdateTransferFunction {}
-    protected method RemoveDuplicateIsoMarker { m x }
-    protected method OverIsoMarker { m x }
-    protected method AddIsoMarker { x y }
-    protected method InitIsoMarkers {dataobj comp}
-    protected method HideIsoMarkers {dataobj}
-    protected method ShowIsoMarkers {dataobj}
+    public method UpdateTransferFunction {}
+    public method RemoveDuplicateIsoMarker { m x }
+    public method OverIsoMarker { m x }
+    private method AddIsoMarker { x y }
+    private method InitIsoMarkers {dataobj comp}
+    private method HideIsoMarkers {dataobj}
+    private method ShowIsoMarkers {dataobj}
 
     private variable _outbuf       ;# buffer for outgoing commands
@@ -151 +151 @@
     $_parser alias data [itcl::code $this _receive_data]
 
-    set _view(theta) 45
-    set _view(phi) 45
-    set _view(psi) 0
-    set _view(zoom) 1
-    set _view(xfocus) 0
-    set _view(yfocus) 0
-    set _view(zfocus) 0
+    # Initialize the view to some default parameters.
+    array set _view {
+        theta   45
+        phi     45
+        psi     0
+        zoom    1.0
+        xfocus  0
+        yfocus  0
+        zfocus  0
+    }
     set _obj2id(count) 0
     set _id2obj(count) 0
@@ -637 +640 @@
         }
         now {
-            #
-            # Hack alert!  Need data in binary format,
-            # so we'll save to a file and read it back.
-            #
-            set tmpfile /tmp/image[pid].jpg
-            $_image(download) write $tmpfile -format jpeg
-            set fid [open $tmpfile r]
-            fconfigure $fid -encoding binary -translation binary
-            set bytes [read $fid]
-            close $fid
-            file delete -force $tmpfile
-
-            return [list .jpg $bytes]
+            # Doing an image base64 encode/decode has to be better than
+            # writing the image to a file and reading it back in.
+            set data [$_image(plot) data -format jpeg]
+            set data [Rappture::encoding::decode -as b64 $data]
+            return [list .jpg $data]
         }
         default {
@@ -665 +660 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::Connect {} {
-    Disconnect
     set _hosts [GetServerList "nanovis"]
     if { "" == $_hosts } {
@@ -674 +668 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: isconnected ?<host:port>,<host:port>...?
-#
-# Clients use this method to establish a connection to a new
-# server, or to reestablish a connection to the previous server.
-# Any existing connection is automatically closed.
-# ----------------------------------------------------------------------
+#
+# isconnected --
+#
+#       Indicates if we are currently connected to the visualization server.
+#
 itcl::body Rappture::NanovisViewer::isconnected {} {
     return [VisViewer::IsConnected]
 }
 
-# ----------------------------------------------------------------------
-# USAGE: Disconnect
-#
-# Clients use this method to disconnect from the current rendering
-# server.
-# ----------------------------------------------------------------------
+#
+# Disconnect --
+#
+#       Clients use this method to disconnect from the current rendering
+#       server.
+#
 itcl::body Rappture::NanovisViewer::Disconnect {} {
     VisViewer::Disconnect
@@ -704 +696 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: _send <string>
-#
-# Used internally to send commands off to the rendering server.
-# ----------------------------------------------------------------------
+#
+# _send
+#
+#       Send commands off to the rendering server.  If we're currently
+#       sending data objects to the server, buffer the commands to be 
+#       sent later.
+#
 itcl::body Rappture::NanovisViewer::_send {string} {
-    if { ![isconnected]} {
-        $_dispatcher cancel !serverDown
-        set x [expr {[winfo rootx $itk_component(area)]+10}]
-        set y [expr {[winfo rooty $itk_component(area)]+10}]
-        Rappture::Tooltip::cue @$x,$y "Connecting..."
-
-        set code [catch { Connect } ok]
-        if { $code == 0 && $ok} {
-            set w [winfo width $itk_component(3dview)]
-            set h [winfo height $itk_component(3dview)]
-
-            if { [Send "screen $w $h"] } {
-                set _view(theta) 45
-                set _view(phi) 45
-                set _view(psi) 0
-                set _view(zoom) 1.0
-                $_dispatcher event -idle !rebuild
-                Rappture::Tooltip::cue hide
-            }
-        } 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."
+    if {[llength $_sendobjs] > 0} {
+        append _outbuf $string "\n"
+    } else {
+        if {[SendBytes $string]} {
+            foreach line [split $string \n] {
+                SendEcho >>line $line
+            }
         }
-    } else {
-        # If we're transmitting objects, then buffer this command.
-        if {[llength $_sendobjs] > 0} {
-            append _outbuf $string "\n"
-        } else {
-            if { [Send $string] } {
-                foreach line [split $string \n] {
-                    SendEcho >>line $line
-                }
-            }
-        }
     }
 }
@@ -762 +731 @@
 
             # tell the engine to expect some data
-            set cmdstr "volume data follows [string length $data]"
-            if { ![Send $cmdstr] } {
+            set nbytes [string length $data]
+            if { ![SendBytes "volume data follows $nbytes"] } {
                 return
             }
-            while {[string length $data] > 0} {
-                update
-
-                set chunk [string range $data 0 8095]
-                set data [string range $data 8096 end]
-                if { ![Send $chunk -nonewline] } {
-                    return
-                }
-                Flush
-            }
-            Send ""
-
+            if { ![SendBytes $data] } {
+                return
+            }
             set volId $_obj2id(count)
             incr _obj2id(count)
@@ -808 +768 @@
 
     # if there are any commands in the buffer, send them now that we're done
-    Send $_outbuf
+    SendBytes $_outbuf
     set _outbuf ""
 
@@ -832 +792 @@
             foreach {sname cmap wmap} [GenTransfuncData $dataobj $comp] break
             set cmdstr [list transfunc define $sname $cmap $wmap]
-            if {![Send $cmdstr] } {
+            if {![SendBytes $cmdstr] } {
                 return
             }
@@ -852 +812 @@
     ShowIsoMarkers $first 
     # if there are any commands in the buffer, send them now that we're done
-    Send $_outbuf
+    SendBytes $_outbuf
     set _outbuf ""
     $_dispatcher event -idle !legend
@@ -866 +826 @@
 itcl::body Rappture::NanovisViewer::_receive_image {option size} {
     if { [isconnected] } {
-        set bytes [Receive $size]
+        set bytes [ReceiveBytes $size]
         $_image(plot) configure -data $bytes
         ReceiveEcho <<line "<read $size bytes for [image width $_image(plot)]x[image height $_image(plot)] image>"
@@ -881 +841 @@
 itcl::body Rappture::NanovisViewer::_receive_legend { ivol vmin vmax size } {
     if { [isconnected] } {
-        set bytes [Receive $size]
+        set bytes [ReceiveBytes $size]
         $_image(legend) configure -data $bytes
         ReceiveEcho <<line "<read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
@@ -975 +935 @@
         $_dispatcher event -idle !send_dataobjs
     } else {
+        set w [winfo width $itk_component(3dview)]
+        set h [winfo height $itk_component(3dview)]
+        _send "screen $w $h"
         # nothing to send -- activate the proper volume
         set first [lindex [get] 0]
@@ -1058 +1021 @@
 itcl::body Rappture::NanovisViewer::_zoom {option} {
     switch -- $option {
-        in {
-            set _view(zoom) [expr {$_view(zoom)*1.25}]
-            _send "camera zoom $_view(zoom)"
-        }
-        out {
-            set _view(zoom) [expr {$_view(zoom)*0.8}]
-            _send "camera zoom $_view(zoom)"
-        }
-        reset {
-            set _view(theta) 45
-            set _view(phi) 45
-            set _view(psi) 0
-            set _view(zoom) 1.0
+        "in" {
+            set _view(zoom) [expr {$_view(zoom)* 1.25}]
+        }
+        "out" {
+            set _view(zoom) [expr {$_view(zoom)* 0.8}]
+        }
+        "reset" {
+            array set _view {
+                theta 45
+                phi 45
+                psi 0
+                zoom 1.0
+            }
             set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
             _send "camera angle $xyz"
-            _send "camera zoom $_view(zoom)"
-        }
-    }
+        }
+    }
+    _send "camera zoom $_view(zoom)"
 }
 
@@ -1136 +1099 @@
                 }
 
-                set _view(theta) $theta
-                set _view(phi) $phi
-                set _view(psi) $psi
-                set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+                array set _view [subst {
+                    theta $theta
+                    phi $phi
+                    psi $psi
+                }]
+                set xyz [Euler2XYZ $theta $phi $psi]
                 _send "camera angle $xyz"
                 set _click(x) $x
@@ -1282 +1247 @@
             }
         }
+
         transp {
             if {[isconnected]} {
@@ -1306 +1272 @@
                     set val [$inner.scales.thickness get]
                     # Scale values between 0.00001 and 0.01000
-                    set sval [expr {0.00001*double($val)}]
+                    set sval [expr {0.0001*double($val)}]
                     set _thickness($dataobj) $sval
                     UpdateTransferFunction
@@ -1387 +1353 @@
     set isovalues {}
     foreach m $_isomarkers($key) {
-        lappend isovalues [$m get_relative_value]
+        lappend isovalues [$m GetRelativeValue]
     }
 
@@ -1475 +1441 @@
     if { [info exists _isomarkers($dataobj)] } {
         foreach m $_isomarkers($dataobj) {
-            $m hide
+            $m Hide
         }
     }
@@ -1488 +1454 @@
     }
     foreach m $_isomarkers($dataobj) {
-        $m show
+        $m Show
     }
 }
@@ -1506 +1472 @@
             set value [expr {$value * 0.01}]
             set m [IsoMarker \#auto $c $this]
-            $m set_relative_value $value
+            $m SetRelativeValue $value
             lappend _isomarkers($dataobj) $m
         } elseif { $n == 2 && $suffix == "x" } {
@@ -1517 +1483 @@
                 set x [expr {double($i)/($nLevels+1)}]
                 set m [IsoMarker \#auto $c $this]
-                $m set_relative_value $x
+                $m SetRelativeValue $x
                 lappend _isomarkers($dataobj) $m 
             }
@@ -1523 +1489 @@
             # ${n} : Set absolute value.
             set m [IsoMarker \#auto $c $this]
-            $m set_absolute_value $value
+            $m SetAbsoluteValue $value
             lappend _isomarkers($dataobj) $m
         }
@@ -1564 +1530 @@
     set m [IsoMarker \#auto $c $this]
     set w [winfo width $c]
-    $m set_relative_value [expr {double($x-10)/($w-20)}]
-    $m show
+    $m SetRelativeValue [expr {double($x-10)/($w-20)}]
+    $m Show
     lappend _isomarkers($dataobj) $m
     UpdateTransferFunction
@@ -1581 +1547 @@
         set marker [namespace tail $marker]
         foreach m $_isomarkers($dataobj) {
-            set sx [$m get_screen_position]
+            set sx [$m GetScreenPosition]
             if { $m != $marker } {
                 if { $x >= ($sx-3) && $x <= ($sx+3) } {
-                    $marker set_relative_value [$m get_relative_value]
+                    $marker SetRelativeValue [$m GetRelativeValue]
                     itcl::delete object $m
                     bell
@@ -1607 +1573 @@
         set marker [namespace tail $marker]
         foreach m $_isomarkers($dataobj) {
-            set sx [$m get_screen_position]
+            set sx [$m GetScreenPosition]
             if { $m != $marker } {
                 set bool [expr { $x >= ($sx-3) && $x <= ($sx+3) }]
-                $m activate $bool
+                $m Activate $bool
             }
         }

trunk/gui/scripts/unirect2d.tcl

@@ -145 +145 @@
             set axis "zaxis"
         }
+        default {
+            error "unknown axis description \"$which\""
+        }
     }
 #     set val [$_field get $axis.min]

trunk/gui/scripts/visviewer.tcl

@@ -5 +5 @@
 #  This class is the base class for the various visualization viewers 
 #  that use the nanoserver render farm.
-#
-#  My plan is to make this class the parent of the NanovisViewer and
-#  HeightmapViewer classes. I'm going to move out all the server-related 
-#  methods like _send*, _receive*, connect, disconnect, etc. from those
-#  classes into this one.
 #
 # ======================================================================
@@ -26 +21 @@
 
     private common _servers          ;# array of visualization server lists
-    set _servers(nanovis) "128.210.189.216:2000" 
-    set _servers(pymol) barney
-
-    protected variable _dispatcher "" ;# dispatcher for !events
-    protected variable _hosts ""     ;# list of hosts for server
-    protected variable _sid ""       ;# socket connection to server
-    protected variable _parser ""    ;# interpreter for incoming commands
-    protected variable _inbuf        ;# buffer for incoming/outgoing commands
-    protected variable _busy 0
+    set _servers(nanovis) "" 
+    set _servers(pymol)   "" 
+
+    protected variable _dispatcher ""   ;# dispatcher for !events
+    protected variable _hosts ""        ;# list of hosts for server
+    protected variable _sid ""          ;# socket connection to server
+    protected variable _parser ""       ;# interpreter for incoming commands
     protected variable _image
+    private common _done                ;# Used to indicate status of send.
+    private variable _buffer            ;# buffer for incoming/outgoing commands
 
     constructor { hostlist args } { 
@@ -46 +41 @@
     private method _CheckNameList {namelist} 
     private method _Shuffle { hostlist } 
-    private method _ReceiveCmd {} 
+    private method _ReceiveHelper {} 
     private method _ServerDown {}
+    private method _SendHelper {}
 
     protected method SendEcho {channel {data ""}}
@@ -54 +50 @@
     protected method Disconnect {}
     protected method IsConnected {}
-    protected method Send { cmdstr { switch "" } }
-    protected method Receive { nbytes }
+    protected method SendBytes { bytes }
+    protected method ReceiveBytes { nbytes }
     protected method Flush {}
     protected method Color2RGB {color}
@@ -80 +76 @@
     _CheckNameList $hostlist
     set _hostlist $hostlist
-
-    set _inbuf ""
-
+    set _buffer(in) ""
+    set _buffer(out) ""
     #
     # Create a parser to handle incoming requests
@@ -191 +186 @@
 itcl::body Rappture::VisViewer::Connect { hostlist } {
     blt::busy hold $itk_component(hull) -cursor watch
-    update idletasks
+    update
 
     # Shuffle the list of servers so as to pick random 
@@ -232 +227 @@
 
         if { [string equal $addr "0.0.0.0"] } {
-            # Success: Cancel any pending serverDown events and release the
-            # busy window over the hull.
+            # We're connected. Cancel any pending serverDown events and
+            # release the busy window over the hull.
             $_dispatcher cancel !serverDown
             blt::busy release $itk_component(hull)
-            fconfigure $_sid -buffering line 
-            fileevent $_sid readable [itcl::code $this _ReceiveCmd]
+            fconfigure $_sid -buffering line
+            fileevent $_sid readable [itcl::code $this _ReceiveHelper]
             return 1
         }
@@ -247 +242 @@
 }
 
-
-#
-# SendEcho --
-#
-#     Used internally to echo sent data to clients interested in this widget.
-#     If the -sendcommand option is set, then it is invoked in the global scope
-#     with the <channel> and <data> values as arguments.  Otherwise, this does
-#     nothing.
-#
-itcl::body Rappture::VisViewer::SendEcho {channel {data ""}} {
-    #puts stderr ">>line $data"
-    if {[string length $itk_option(-sendcommand)] > 0} {
-        uplevel #0 $itk_option(-sendcommand) [list $channel $data]
-    }
-}
-
-# 
-# ReceiveEcho --
-#
-#     Echoes received data tzo clients interested in this widget.  If the
-#     -receivecommand option is set, then it is # invoked in the global
-#     scope with the <channel> and <data> values # as arguments.  Otherwise,
-#     this does nothing.
-#
-itcl::body Rappture::VisViewer::ReceiveEcho {channel {data ""}} {
-    #puts stderr "<<line $data"
-    if {[string length $itk_option(-receivecommand)] > 0} {
-        uplevel #0 $itk_option(-receivecommand) [list $channel $data]
-    }
-}
 
 #
@@ -290 +255 @@
         $_dispatcher event -after 750 !serverDown
     }
-    set _inbuf ""                       
+    set _buffer(in) ""                  
 }
 
@@ -303 +268 @@
 
 #
-# Send --
-#
-#    Send a string to the visualization server.
-#
-itcl::body Rappture::VisViewer::Send { cmdstr { switch "" } } {
-    SendEcho >>line $cmdstr
-    if { $switch != "" } {
-        set code [catch {puts $switch $_sid $cmdstr} err]
+# _SendHelper --
+#
+#       Helper routine called from a file event to send data when the
+#       connection is writable (i.e. not blocked).  Sends data in chunks 
+#       of 8k (or less).  Sets magic variable _done($this) to indicate
+#       that we're either finished (success) or could not send bytes to
+#       the server (failure).
+#
+itcl::body Rappture::VisViewer::_SendHelper {} {
+    set bytesLeft [string length $_buffer(out)]
+    if { $bytesLeft > 0} {
+        # 8095
+        set chunk [string range $_buffer(out) 0 9]
+        # 8096
+        set _buffer(out)  [string range $_buffer(out) 10 end]
+        # -8096
+        incr bytesLeft -10
+        set code [catch {
+            if { $bytesLeft > 0 } {
+                puts -nonewline $_sid $chunk
+            } else {
+                puts $_sid $chunk
+            }           
+        } err]
+        if { $code != 0 } {
+            puts stderr "error sending data to $_sid: $err"
+            Disconnect
+            set _done($this) 0;         # Failure
+        } 
     } else {
-        set code [catch {puts $_sid $cmdstr} err]
-    }
+        set _done($this) 1;             # Success
+    }
+}
+
+#
+# SendBytes --
+#
+#       Send a a string to the visualization server.  
+#
+itcl::body Rappture::VisViewer::SendBytes { bytes } {
+    SendEcho >>line $bytes
+
+    if { ![IsConnected]} {
+        # If we aren't connected, assume it's because the connection to the
+        # visualization server broke. Try to open a connection and trigger a
+        # rebuild.
+        $_dispatcher cancel !serverDown
+        set x [expr {[winfo rootx $itk_component(area)]+10}]
+        set y [expr {[winfo rooty $itk_component(area)]+10}]
+        Rappture::Tooltip::cue @$x,$y "Connecting..."
+        set code [catch { Connect } ok]
+        if { $code == 0 && $ok} {
+            $_dispatcher event -idle !rebuild
+            Rappture::Tooltip::cue hide
+        } 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
+    }
+    set _done($this) 1
+    set _buffer(out) $bytes
+    fileevent $_sid writable [itcl::code $this _SendHelper]
+    tkwait variable ::Rappture::VisViewer::_done($this)
+    fileevent $_sid writable ""
     flush $_sid
-    if { $code != 0 } {
-        puts stderr "error sending data to $_sid: $err"
-        Disconnect
-        return 0
-    }
-    return 1
-}
-
-
-#
-# Receive --
-#
-#    Read some number of bytes from the visualization server.
-#
-itcl::body Rappture::VisViewer::Receive { size } {
+    set _buffer(out) ""
+    return $_done($this)
+}
+
+#
+# ReceiveBytes --
+#
+#    Read some number of bytes from the visualization server. 
+#
+itcl::body Rappture::VisViewer::ReceiveBytes { size } {
     if { [eof $_sid] } {
         error "unexpected eof on socket"
@@ -338 +351 @@
 }
 
-#
-# Flush --
-#
-#    Flushes the socket.
-#
-itcl::body Rappture::VisViewer::Flush {} {
-    if { [IsConnected] } {
-        flush $_sid
-    }
-}
-
-# 
-# _ReceiveCmd --
-#
-#     Invoked automatically whenever a command is received from the
-#     rendering server.  Reads the incoming command and executes it in
-#     a safe interpreter to handle the action.
-# 
-itcl::body Rappture::VisViewer::_ReceiveCmd {} {
+# 
+# _ReceiveHelper --
+#
+#       Helper routine called from a file event when the connection is 
+#       readable (i.e. a command response has been sent by the rendering 
+#       server.  Reads the incoming command and executes it in a safe 
+#       interpreter to handle the action.
+#
+#       Note: This routine currently only handles command responses from
+#             the visualization server.  It doesn't handle non-blocking
+#             reads from the visualization server.
+#
+#           nv>image -bytes 100000              yes
+#           ...following 100000 bytes...        no              
+# 
+itcl::body Rappture::VisViewer::_ReceiveHelper {} {
     if { [IsConnected] } {
         if { [eof $_sid] } {
             error "_receive: unexpected eof on socket"
         }
-        if {[gets $_sid line] < 0} {
+        if { [gets $_sid line] < 0 } {
             Disconnect
         } elseif {[string equal [string range $line 0 2] "nv>"]} {
             ReceiveEcho <<line $line
-            append _inbuf [string range $line 3 end]
-            if {[info complete $_inbuf]} {
-                set request $_inbuf
-                set _inbuf ""
+            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
             }
@@ -381 +392 @@
 
 #
+# Flush --
+#
+#    Flushes the socket.
+#
+itcl::body Rappture::VisViewer::Flush {} {
+    if { [IsConnected] } {
+        flush $_sid
+    }
+}
+
+
+#
 # Color2RGB --
 #
@@ -407 +430 @@
     return [list $xangle $yangle $zangle]
 }
+
+
+#
+# SendEcho --
+#
+#     Used internally to echo sent data to clients interested in this widget.
+#     If the -sendcommand option is set, then it is invoked in the global scope
+#     with the <channel> and <data> values as arguments.  Otherwise, this does
+#     nothing.
+#
+itcl::body Rappture::VisViewer::SendEcho {channel {data ""}} {
+    #puts stderr ">>line $data"
+    if {[string length $itk_option(-sendcommand)] > 0} {
+        uplevel #0 $itk_option(-sendcommand) [list $channel $data]
+    }
+}
+
+# 
+# ReceiveEcho --
+#
+#     Echoes received data tzo clients interested in this widget.  If the
+#     -receivecommand option is set, then it is # invoked in the global
+#     scope with the <channel> and <data> values # as arguments.  Otherwise,
+#     this does nothing.
+#
+itcl::body Rappture::VisViewer::ReceiveEcho {channel {data ""}} {
+    #puts stderr "<<line $data"
+    if {[string length $itk_option(-receivecommand)] > 0} {
+        uplevel #0 $itk_option(-receivecommand) [list $channel $data]
+    }
+}