Changeset 1373

Timestamp:

Apr 1, 2009, 4:55:25 PM (16 years ago)

Author:

gah

Message:

First pass at changes to visualization widgets.

nanovisview.tcl use png icons.
visviewer.tcl change to sidebar layout
molvisviewer.tcl use png icons, fixed for sidebar layout.
heightmapviewer.tcl use png icons, fixed for sidebar layout.
flowvisviewer.tcl use png icons, fixed for sidebar layout.

resultviewer.tcl recognize flow data
field.tcl recognize unirect3d mesh.
field3dresult.tcl load FlowvisViewer? component description.
panes.tcl added horizontal panes. Need cursor fix. Must specify

correct cursor from options.

unirect2d.tcl added "axisorder" tag to specify order of field data.

Changed name to Unirect2d from UniRect2d.

unirect3d.tcl added "axisorder" tag to specify order of field data.

Right now, this is a test platform for me for flow
visualizations.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (10 diffs)
• field3dresult.tcl (modified) (1 diff)
• flowvisviewer.tcl (modified) (30 diffs)
• heightmapviewer.tcl (modified) (17 diffs)
• molvisviewer.tcl (modified) (10 diffs)
• nanovisviewer.tcl (modified) (6 diffs)
• page.tcl (modified) (1 diff)
• panes.tcl (modified) (5 diffs)
• resultviewer.tcl (modified) (1 diff)
• unirect2d.tcl (modified) (12 diffs)
• unirect3d.tcl (added)
• visviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/field.tcl

@@ -29 +29 @@
     public method hints {{key ""}}
     public method isunirect2d {}
+    public method isunirect3d {}
+    public method extents {{what -overall}}
 
     protected method _build {}
@@ -47 +49 @@
     private variable _comp2style ;# maps component name => style settings
     private variable _comp2cntls ;# maps component name => x,y control points
-
+    private variable _comp2extents 
     private common _counter 0    ;# counter for unique vector names
 }
@@ -114 +116 @@
         itcl::delete object $_comp2unirect2d($name)
     }
+    foreach name [array names _comp2unirect3d] {
+        itcl::delete object $_comp2unirect3d($name)
+    }
 }
 
@@ -178 +183 @@
     }
     if {[info exists _comp2unirect2d($what)]} {
-        return ""  ;# no mesh -- it's embedded in the value data
+        return [$mobj mesh]
+    }
+    if {[info exists _comp2unirect3d($what)]} {
+        return [$mobj mesh]
     }
     error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"
@@ -204 +212 @@
     }
     if {[info exists _comp2unirect2d($what)]} {
-        set mobj $_comp2unirect2d($what)
-        return [$mobj values]
+        return [$_comp2unirect2d($what) values]
+    }
+    if {[info exists _comp2unirect3d($what)]} {
+        return [$_comp2unirect3d($what) values]
     }
     error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"
@@ -518 +528 @@
     catch {unset _comp2style}
     array unset _comp2unirect2d
-
+    array unset _comp2unirect3d
+    array unset _comp2extents
     #
     # Scan through the components of the field and create
@@ -540 +551 @@
         }
         set _comp2style($cname) ""
+        
+        # Save the extents of the component
+        set extents [$_field element $cname.extents]
+        if { $extents == "" } {
+            set extents 1 
+        }
+        set _comp2extents($cname) $extents
 
         if {$type == "1D"} {
@@ -602 +620 @@
                     set _comp2dims($cname) "2D"
                     set _comp2unirect2d($cname) \
-                        [Rappture::UniRect2d \#auto $_xmlobj $_field $cname]
+                        [Rappture::Unirect2d \#auto $_xmlobj $_field $cname]
+                    set _comp2style($cname) [$_field get $cname.style]
+                    incr _counter
+                } elseif { $element == "unirect3d" } {
+                    set _comp2dims($cname) "3D"
+                    set _comp2unirect3d($cname) \
+                        [Rappture::Unirect3d \#auto $_xmlobj $_field $cname]
                     set _comp2style($cname) [$_field get $cname.style]
                     incr _counter
@@ -694 +718 @@
             set _comp2style($cname) [$_field get $cname.style]
             incr _counter
-
         } elseif {$type == "opendx"} {
             #
@@ -757 +780 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: mesh ?<name>?
-#
-# Returns a list {xvec yvec} for the specified field component <name>.
-# If the name is not specified, then it returns the vectors for the
-# overall field (sum of all components).
-# ----------------------------------------------------------------------
+#
+# isunirect2d  --
+#
+# Returns if the field is a unirect2d object.  
+#
 itcl::body Rappture::Field::isunirect2d { } {
     return [expr [array size _comp2unirect2d] > 0]
 }
+
+#
+# isunirect3d  --
+#
+# Returns if the field is a unirect3d object.  
+#
+itcl::body Rappture::Field::isunirect3d { } {
+    return [expr [array size _comp2unirect3d] > 0]
+}
+
+#
+# extents --
+#
+# Returns if the field is a unirect2d object.  
+#
+itcl::body Rappture::Field::extents {{what -overall}} {
+    if {$what == "-overall" } {
+        set max 0
+        foreach cname [$_field children -type component] {
+            set extents [info exists _comp2extents($cname)]
+            if { $max < $extents } {
+                set max $extents
+            }
+        }
+        return $max
+    } 
+    if { $what == "component0"} {
+        set what [lindex [components -name] 0]
+        return $_comp2extents($what)
+    }
+    return $_comp2extents($what)
+}

trunk/gui/scripts/field3dresult.tcl

@@ -57 +57 @@
     set servers [Rappture::VisViewer::GetServerList "nanovis"]
     if {"" != $servers && $flags(-mode) != "vtk"} {
-        itk_component add renderer {
-            Rappture::NanovisViewer $itk_interior.ren $servers
-        }
+        switch -- $flags(-mode) {
+            "nanovis" {
+                itk_component add renderer {
+                    Rappture::NanovisViewer $itk_interior.ren $servers
+                }
+            }
+            "flowvis" {
+                itk_component add renderer {
+                    Rappture::FlowvisViewer $itk_interior.ren $servers
+                }
+            }
+        }               
         pack $itk_component(renderer) -expand yes -fill both
 

trunk/gui/scripts/flowvisviewer.tcl

@@ -72 +72 @@
     public method OverIsoMarker { m x }
 
-    public method drawer {what who}
     public method camera {option args}
+    public method tab {what who}
 
     protected method Connect {}
@@ -110 +110 @@
     private method ParseMarkersOption { tf ivol markers }
     private method ParseLevelsOption { tf ivol levels }
-    private method BuildCutplanesDrawer {}
-    private method BuildSettingsDrawer {}
-    private method BuildCameraDrawer {}
+    private method BuildCutplanesTab {}
+    private method BuildViewTab {}
+    private method BuildVolumeTab {}
+    private method BuildCameraTab {}
     private method PanCamera {}
     private method GetMovie { widget width height }
@@ -143 +144 @@
     common downloadPopup_          ;# download options from popup
 
-    private variable drawer_
     private common hardcopy_
+    private variable headings_
 }
 
@@ -220 +221 @@
         rename -highlightbackground -controlbackground controlBackground Background
     }
-    pack $itk_component(reset) -side top -padx 2 -pady 1
+    pack $itk_component(reset) -side top -padx 2 -pady 2
     Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
 
@@ -233 +234 @@
         rename -highlightbackground -controlbackground controlBackground Background
     }
-    pack $itk_component(zoomin) -side top -padx 1 -pady 1
+    pack $itk_component(zoomin) -side top -padx 2 -pady 2
     Rappture::Tooltip::for $itk_component(zoomin) "Zoom in"
 
@@ -246 +247 @@
         rename -highlightbackground -controlbackground controlBackground Background
     }
-    pack $itk_component(zoomout) -side top -padx 2 -pady 1
+    pack $itk_component(zoomout) -side top -padx 2 -pady 2
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    itk_component add settingsButton {
-        label $itk_component(controls).settingsbutton \
+    itk_component add configure_button {
+        label $itk_component(controls).configbutton \
             -borderwidth 1 -padx 1 -pady 1 \
             -relief "raised" -image [Rappture::icon wrench]
@@ -259 +260 @@
             Background
     }
-    pack $itk_component(settingsButton) -padx 2 -pady 1 \
-        -ipadx 1 -ipady 1
-    Rappture::Tooltip::for $itk_component(settingsButton) \
-        "Configure settings"
-    bind $itk_component(settingsButton) <ButtonPress> \
-        [itcl::code $this drawer toggle settings]
-    pack $itk_component(settingsButton) -side bottom \
-        -padx 2 -pady 2 -anchor e
-
-    BuildSettingsDrawer
-
-    itk_component add cutplanesButton {
-        label $itk_component(controls).cutplanesbutton \
-            -borderwidth 1 -padx 1 -pady 1 \
-            -relief "raised" -image [Rappture::icon cutbutton]
-    } {
-        usual
-        ignore -borderwidth
-        rename -highlightbackground -controlbackground controlBackground \
-            Background
-    }
-    Rappture::Tooltip::for $itk_component(cutplanesButton) \
-        "Set cutplanes"
-    bind $itk_component(cutplanesButton) <ButtonPress> \
-        [itcl::code $this drawer toggle cutplanes]
-    pack $itk_component(cutplanesButton) -side bottom \
-        -padx 2 -pady { 0 2 } -ipadx 1 -ipady 1
-
-    BuildCutplanesDrawer
-
-    itk_component add cameraButton {
-        label $itk_component(controls).camerabutton \
-            -borderwidth 1 -padx 1 -pady 1 \
-            -relief "raised" -image [Rappture::icon camera]
-    } {
-        usual
-        ignore -borderwidth
-        rename -highlightbackground -controlbackground controlBackground \
-            Background
-    }
-    Rappture::Tooltip::for $itk_component(cameraButton) \
-        "Camera settings"
-    bind $itk_component(cameraButton) <ButtonPress> \
-        [itcl::code $this drawer toggle camera]
-    pack $itk_component(cameraButton) -side bottom \
-        -padx 2 -pady 1 -ipadx 1 -ipady 1
-
-    BuildCameraDrawer
 
     #
@@ -325 +278 @@
     Rappture::Tooltip::for $itk_component(volume) \
         "Toggle the volume cloud on/off"
-    pack $itk_component(volume) -padx 1 -pady 1
+    pack $itk_component(volume) -padx 2 -pady 2
+
+    BuildViewTab
+    BuildVolumeTab
+    BuildCutplanesTab
+    BuildCameraTab
 
     # Legend
@@ -331 +289 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(area).legend -height 50 -highlightthickness 0
+        canvas $itk_component(plotarea).legend -height 50 -highlightthickness 0
     } {
         usual
@@ -337 +295 @@
         rename -background -plotbackground plotBackground Background
     }
-    pack $itk_component(legend) -side bottom -fill x
     bind $itk_component(legend) <Configure> \
         [list $_dispatcher event -idle !legend]
 
-    
+    # Hack around the Tk panewindow.  The problem is that the requested 
+    # size of the 3d view isn't set until an image is retrieved from
+    # the server.  So the panewindow uses the tiny size.
+    set w [expr [winfo reqwidth $itk_component(hull)] - 80]
+    blt::table $itk_component(plotarea) \
+        0,0 $itk_component(3dview) -fill both -reqwidth $w \
+        1,0 $itk_component(legend) -fill both
+        
     # Create flow controls...
 
@@ -475 +439 @@
     set _image(download) [image create photo]
 
+    $itk_component(scroller) contents $itk_component(view_canvas)
+    $itk_component(title) configure -text "$headings_(view)"
+
     eval itk_initialize $args
 
@@ -662 +629 @@
     switch $option {
         coming {
-            if {[catch {blt::winop snap $itk_component(area) $_image(download)}]} {
+            if {[catch {blt::winop snap $itk_component(plotarea) \
+                            $_image(download)}]} {
                 $_image(download) configure -width 1 -height 1
                 $_image(download) put #000000
@@ -791 +759 @@
 #       sent later.
 #
-itcl::body Rappture::FlowvisViewer::SendCmd {string} {
+itcl::body Rappture::FlowvisViewer::SendCmd { string } {
     if {[llength $sendobjs_] > 0} {
         append outbuf_ $string "\n"
@@ -816 +784 @@
             set data [$dataobj values $comp]
             set nbytes [string length $data]
-            if { ![SendBytes "flow data follows $nbytes"] } {
-                return
-            }
+            set extents [$dataobj extents $comp]
+
+            # I have a field. Is a vector field or a volume field?
+            if { $extents == 1 } {
+                set cmd "volume data follows $nbytes"
+            } else {
+                set cmd "flow data follows $nbytes $extents"
+            }
+            if { ![SendBytes $cmd] } {
+                return
+            }
             if { ![SendBytes $data] } {
                 return
@@ -1370 +1346 @@
             if {$op} {
                 $itk_component(${axis}CutButton) configure \
-                    -image [Rappture::icon ${axis}-cutplane-on] \
                     -relief sunken
                 SendCmd "cutplane state 1 $axis [CurrentVolumeIds -cutplanes]"
@@ -1376 +1351 @@
             } else {
                 $itk_component(${axis}CutButton) configure \
-                    -image [Rappture::icon ${axis}-cutplane-off] \
                     -relief raised
                 SendCmd "cutplane state 0 $axis [CurrentVolumeIds -cutplanes]"
@@ -1626 +1600 @@
         "legend" {
             if { $settings_($this-legend) } {
-                pack $itk_component(legend) -side bottom -fill x
+                blt::table $itk_component(plotarea) \
+                    1,0 $itk_component(legend) -fill x
             } else {
-                pack forget $itk_component(legend) 
+                blt::table forget $itk_component(legend)
             }
             FixLegend
@@ -2059 +2034 @@
 }
 
-itcl::body Rappture::FlowvisViewer::drawer { what who } {
-    if { [info exists drawer_(current)] && $who != $drawer_(current) } {
-        drawer deactivate $drawer_(current)
-    }
-    switch -- ${what} {
-        "activate" {
-            $itk_component(drawer) add $itk_component($who) -sticky nsew
-            after idle [list focus $itk_component($who)]
-            if { ![info exists drawer_($who)] } {
-                set rw [winfo reqwidth $itk_component($who)]
-                set w [winfo width $itk_component(drawer)]
-                set x [expr $w - $rw]
-                $itk_component(drawer) sash place 0 $x 0
-                set drawer_($who) 1
-            } else {
-                set w [winfo width $itk_component(drawer)]
-                puts stderr "w of drawer is $w"
-                puts stderr "w of last($who) is $drawer_($who-lastx)"
-                set x [expr $w - $drawer_($who-lastx) - 10]
-                puts stderr "setting sash to $x for $who"
-                $itk_component(drawer) sash place 0 $x 0
-                $itk_component(drawer) paneconfigure $itk_component($who) \
-                    -width $drawer_($who-lastx)
-                $itk_component(3dview) configure -width $x
-            }
-            set drawer_(current) $who
-            $itk_component(${who}Button) configure -relief sunken -bd 1
-        }
-        "deactivate" {
-            # Save the current width of the drawer.
-            puts stderr "component=$who"
-            set width [winfo width $itk_component($who)]
-            set reqwidth [winfo reqwidth $itk_component($who)]
-            if { $reqwidth < $width } {
-                set width $reqwidth
-            }
-            set x [lindex [$itk_component(drawer) sash coord 0] 0]
-            puts stderr "sashx=$x"
-            set drawer_($who-lastx) $width
-            $itk_component(drawer) forget $itk_component($who)
-            $itk_component(${who}Button) configure -relief raised -bd 1
-            unset drawer_(current) 
-        }
-        "toggle" {
-            set slaves [$itk_component(drawer) panes]
-            if { [lsearch $slaves $itk_component($who)] >= 0 } {
-                drawer deactivate $who
-            } else {
-                drawer activate $who
-            }
-        }
-        "resize" {
-            set bbox [$itk_component(${who}Canvas) bbox all]
-            set wid [winfo width $itk_component(${who}Frame)]
-            $itk_component(${who}Canvas) configure -width $wid \
-                -scrollregion $bbox -yscrollincrement 0.1i
-        }
-    }
-}
-
-itcl::body Rappture::FlowvisViewer::BuildSettingsDrawer {} {
+
+itcl::body Rappture::FlowvisViewer::BuildViewTab {} {
     foreach { key value } {
         grid            0
@@ -2128 +2044 @@
         particles       1
         lic             1
+    } {
+        set settings_($this-$key) $value
+    }
+    itk_component add view_canvas {
+        canvas $itk_component(scroller).viewcanvas -highlightthickness 0
+    } {
+        ignore -highlightthickness
+    }
+    $itk_component(sidebar) insert end "view" \
+        -image [Rappture::icon wrench] -text ""  -padx 0 -pady 0 \
+        -command [itcl::code $this tab select "view"]
+    set headings_(view) "View Settings"
+
+    itk_component add view_frame {
+        frame $itk_component(view_canvas).frame \
+            -highlightthickness 0 
+    } {
+        ignore -highlightthickness
+    }
+    $itk_component(view_canvas) create window 0 0 \
+        -anchor nw -window $itk_component(view_frame)
+    bind $itk_component(view_frame) <Configure> \
+        [itcl::code $this tab resize "view"]
+
+    set inner $itk_component(view_frame)
+
+    set fg [option get $itk_component(hull) font Font]
+    #set bfg [option get $itk_component(hull) boldFont Font]
+
+    set ::Rappture::FlowvisViewer::settings_($this-isosurface) 0
+    checkbutton $inner.isosurface \
+        -text "Isosurface shading" \
+        -variable [itcl::scope settings_($this-isosurface)] \
+        -command [itcl::code $this FixSettings isosurface] \
+        -font "Arial 9"
+
+    checkbutton $inner.axes \
+        -text "Axes" \
+        -variable [itcl::scope settings_($this-axes)] \
+        -command [itcl::code $this FixSettings axes] \
+        -font "Arial 9"
+
+    checkbutton $inner.grid \
+        -text "Grid" \
+        -variable [itcl::scope settings_($this-grid)] \
+        -command [itcl::code $this FixSettings grid] \
+        -font "Arial 9"
+
+    checkbutton $inner.outline \
+        -text "Outline" \
+        -variable [itcl::scope settings_($this-outline)] \
+        -command [itcl::code $this FixSettings outline] \
+        -font "Arial 9"
+
+    checkbutton $inner.legend \
+        -text "Legend" \
+        -variable [itcl::scope settings_($this-legend)] \
+        -command [itcl::code $this FixSettings legend] \
+        -font "Arial 9"
+
+    checkbutton $inner.volume \
+        -text "Volume" \
+        -variable [itcl::scope settings_($this-volume)] \
+        -command [itcl::code $this FixSettings volume] \
+        -font "Arial 9"
+
+    checkbutton $inner.particles \
+        -text "Particles" \
+        -variable [itcl::scope settings_($this-particles)] \
+        -command [itcl::code $this FixSettings particles] \
+        -font "Arial 9"
+
+    checkbutton $inner.lic \
+        -text "Lic" \
+        -variable [itcl::scope settings_($this-lic)] \
+        -command [itcl::code $this FixSettings lic] \
+        -font "Arial 9"
+
+    blt::table $inner \
+        0,0 $inner.axes  -columnspan 2 -anchor w \
+        1,0 $inner.grid  -columnspan 2 -anchor w \
+        2,0 $inner.outline  -columnspan 2 -anchor w \
+        3,0 $inner.volume  -columnspan 2 -anchor w \
+        4,0 $inner.legend  -columnspan 2 -anchor w \
+        5,0 $inner.particles  -columnspan 2 -anchor w \
+        6,0 $inner.lic  -columnspan 1 -anchor w \
+
+}
+
+itcl::body Rappture::FlowvisViewer::BuildVolumeTab {} {
+    foreach { key value } {
         light           40
         transp          50
@@ -2135 +2142 @@
         set settings_($this-$key) $value
     }
-    itk_component add settings {
-        Rappture::Scroller $itk_component(drawer).settings \
-            -xscrollmode auto -yscrollmode auto \
-            -highlightthickness 0
-    }
-
-    itk_component add settingsCanvas {
-        canvas $itk_component(settings).canvas -highlightthickness 0
+    itk_component add volume_canvas {
+        canvas $itk_component(scroller).volumecanvas -highlightthickness 0
     } {
         ignore -highlightthickness
     }
-    $itk_component(settings) contents $itk_component(settingsCanvas)
-
-    itk_component add settingsFrame {
-        frame $itk_component(settingsCanvas).frame \
+    $itk_component(sidebar) insert end "volume" \
+        -image [Rappture::icon playback-record] -text ""  -padx 0 -pady 0 \
+        -command [itcl::code $this tab select "volume"]
+    set headings_(volume) "Volume Settings"
+
+    itk_component add volume_frame {
+        frame $itk_component(volume_canvas).frame \
             -highlightthickness 0 
     } {
         ignore -highlightthickness
     }
-    $itk_component(settingsCanvas) create window 0 0 \
-        -anchor nw -window $itk_component(settingsFrame)
-    bind $itk_component(settingsFrame) <Configure> \
-        [itcl::code $this drawer resize settings]
-
-    set inner $itk_component(settingsFrame)
-
-    label $inner.title -text "View Settings" -font "Arial 10 bold"
-    label $inner.volset -text "Volume Settings" -font "Arial 10 bold"
+    $itk_component(volume_canvas) create window 0 0 \
+        -anchor nw -window $itk_component(volume_frame)
+    bind $itk_component(volume_frame) <Configure> \
+        [itcl::code $this tab resize "volume"]
+
+    set inner $itk_component(volume_frame)
 
     set fg [option get $itk_component(hull) font Font]
@@ -2195 +2196 @@
     label $inner.thick -text "Thick" -font $fg
 
-    set ::Rappture::FlowvisViewer::settings_($this-isosurface) 0
-    checkbutton $inner.isosurface \
-        -text "Isosurface shading" \
-        -variable [itcl::scope settings_($this-isosurface)] \
-        -command [itcl::code $this FixSettings isosurface] \
-        -font "Arial 9"
-
-    checkbutton $inner.axes \
-        -text "Axes" \
-        -variable [itcl::scope settings_($this-axes)] \
-        -command [itcl::code $this FixSettings axes] \
-        -font "Arial 9"
-
-    checkbutton $inner.grid \
-        -text "Grid" \
-        -variable [itcl::scope settings_($this-grid)] \
-        -command [itcl::code $this FixSettings grid] \
-        -font "Arial 9"
-
-    checkbutton $inner.outline \
-        -text "Outline" \
-        -variable [itcl::scope settings_($this-outline)] \
-        -command [itcl::code $this FixSettings outline] \
-        -font "Arial 9"
-
-    checkbutton $inner.legend \
-        -text "Legend" \
-        -variable [itcl::scope settings_($this-legend)] \
-        -command [itcl::code $this FixSettings legend] \
-        -font "Arial 9"
-
-    checkbutton $inner.volume \
-        -text "Volume" \
-        -variable [itcl::scope settings_($this-volume)] \
-        -command [itcl::code $this FixSettings volume] \
-        -font "Arial 9"
-
-    checkbutton $inner.particles \
-        -text "Particles" \
-        -variable [itcl::scope settings_($this-particles)] \
-        -command [itcl::code $this FixSettings particles] \
-        -font "Arial 9"
-
-    checkbutton $inner.lic \
-        -text "Lic" \
-        -variable [itcl::scope settings_($this-lic)] \
-        -command [itcl::code $this FixSettings lic] \
-        -font "Arial 9"
-
     blt::table $inner \
-        0,0 $inner.title -anchor w  -columnspan 4 \
-        1,1 $inner.axes  -columnspan 2 -anchor w \
-        2,1 $inner.grid  -columnspan 2 -anchor w \
-        3,1 $inner.outline  -columnspan 2 -anchor w \
-        4,1 $inner.volume  -columnspan 2 -anchor w \
-        1,3 $inner.legend  -columnspan 2 -anchor w \
-        2,3 $inner.particles  -columnspan 2 -anchor w \
-        3,3 $inner.lic  -columnspan 1 -anchor w \
-        9,0 $inner.volset -anchor w  -columnspan 4 \
-        11,1 $inner.dim  -anchor e \
-        11,2 $inner.light -columnspan 2 \
-        11,4 $inner.bright -anchor w \
-        12,1 $inner.fog -anchor e \
-        12,2 $inner.transp -columnspan 2 \
-        12,4 $inner.plastic -anchor w \
-        13,1 $inner.clear -anchor e \
-        13,2 $inner.opacity -columnspan 2 \
-        13,4 $inner.opaque -anchor w \
-        14,1 $inner.thin -anchor e \
-        14,2 $inner.thickness -columnspan 2 \
-        14,4 $inner.thick -anchor w \
-
-    blt::table configure $inner c0 -resize expand -width 4
-}
-
-itcl::body Rappture::FlowvisViewer::BuildCutplanesDrawer {} {
-    itk_component add cutplanes {
-        Rappture::Scroller $itk_component(drawer).cutplanes \
-            -xscrollmode auto -yscrollmode auto \
-            -highlightthickness 0
-    }
-
-    #
-    # Create slicer controls...
-    #
-    itk_component add cutplanesCanvas {
-        canvas $itk_component(cutplanes).canvas -highlightthickness 0
+        0,0 $inner.dim  -anchor e \
+        0,1 $inner.light -columnspan 2 \
+        0,3 $inner.bright -anchor w \
+        1,0 $inner.fog -anchor e \
+        1,1 $inner.transp -columnspan 2 \
+        1,3 $inner.plastic -anchor w \
+        2,0 $inner.clear -anchor e \
+        2,1 $inner.opacity -columnspan 2 \
+        2,3 $inner.opaque -anchor w \
+        3,0 $inner.thin -anchor e \
+        3,1 $inner.thickness -columnspan 2 \
+        3,3 $inner.thick -anchor w \
+}
+
+itcl::body Rappture::FlowvisViewer::BuildCutplanesTab {} {
+
+    itk_component add cutplanes_canvas {
+        canvas $itk_component(scroller).cutplanescanvas -highlightthickness 0
     } {
         ignore -highlightthickness
     }
-    $itk_component(cutplanes) contents $itk_component(cutplanesCanvas)
-
-    itk_component add cutplanesFrame {
-        frame $itk_component(cutplanesCanvas).frame \
+    $itk_component(sidebar) insert end "cutplanes" \
+        -image [Rappture::icon cutbutton] -text ""  -padx 0 -pady 0 \
+        -command [itcl::code $this tab select "cutplanes"]
+    set headings_(cutplanes) "Cutplane Settings"
+
+    itk_component add cutplanes_frame {
+        frame $itk_component(cutplanes_canvas).frame \
             -highlightthickness 0 
     }  {
         ignore -highlightthickness
     }
-    $itk_component(cutplanesCanvas) create window 0 0 \
-        -anchor nw -window $itk_component(cutplanesFrame)
-    bind $itk_component(cutplanesFrame) <Configure> \
-        [itcl::code $this drawer resize cutplanes]
-
-    set inner $itk_component(cutplanesFrame)
-
-    label $inner.title -text "Cutplanes" -font "Arial 10 bold"
+    $itk_component(cutplanes_canvas) create window 0 0 \
+        -anchor nw -window $itk_component(cutplanes_frame)
+    bind $itk_component(cutplanes_frame) <Configure> \
+        [itcl::code $this tab resize cutplanes]
+
+    set inner $itk_component(cutplanes_frame)
 
     # X-value slicer...
     itk_component add xCutButton {
-        label $itk_component(cutplanes).xbutton \
+        label $itk_component(cutplanes_frame).xbutton \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -image [Rappture::icon x-cutplane-off] \
+            -image [Rappture::icon x-cutplane] \
             -highlightthickness 0 
     } {
@@ -2320 +2254 @@
 
     itk_component add xCutScale {
-        ::scale $itk_component(cutplanes).xval -from 100 -to 0 \
+        ::scale $itk_component(cutplanes_frame).xval -from 100 -to 0 \
             -width 10 -orient vertical -showvalue off \
-            -borderwidth 1 -highlightthickness 0 \
+            -borderwidth 1 -highlightthickness 0 -state disabled \
             -command [itcl::code $this Slice move x]
     } {
@@ -2334 +2268 @@
     }
     $itk_component(xCutScale) set 50
-    #$itk_component(xCutScale) configure -state disabled
     Rappture::Tooltip::for $itk_component(xCutScale) \
         "@[itcl::code $this SlicerTip x]"
@@ -2340 +2273 @@
     # Y-value slicer...
     itk_component add yCutButton {
-        label $itk_component(cutplanes).ybutton \
+        label $itk_component(cutplanes_frame).ybutton \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -image [Rappture::icon y-cutplane-off] \
+            -image [Rappture::icon y-cutplane] \
             -highlightthickness 0 
     } {
@@ -2356 +2289 @@
 
     itk_component add yCutScale {
-        ::scale $itk_component(cutplanes).yval -from 100 -to 0 \
+        ::scale $itk_component(cutplanes_frame).yval -from 100 -to 0 \
             -width 10 -orient vertical -showvalue off \
-            -borderwidth 1 -highlightthickness 0 \
+            -borderwidth 1 -highlightthickness 0 -state disabled \
             -command [itcl::code $this Slice move y]
     } {
@@ -2367 +2300 @@
         rename -troughcolor -controldarkbackground controlDarkBackground Background
     }
-    $itk_component(yCutScale) set 50
-    #$itk_component(yCutScale) configure -state disabled
     Rappture::Tooltip::for $itk_component(yCutScale) \
         "@[itcl::code $this SlicerTip y]"
+    $itk_component(yCutScale) set 50
 
     # Z-value slicer...
     itk_component add zCutButton {
-        label $itk_component(cutplanes).zbutton \
+        label $itk_component(cutplanes_frame).zbutton \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -image [Rappture::icon z-cutplane-off] \
+            -image [Rappture::icon z-cutplane] \
             -highlightthickness 0 
     } {
@@ -2389 +2321 @@
 
     itk_component add zCutScale {
-        ::scale $itk_component(cutplanes).zval -from 100 -to 0 \
+        ::scale $itk_component(cutplanes_frame).zval -from 100 -to 0 \
             -width 10 -orient vertical -showvalue off \
-            -borderwidth 1 -highlightthickness 0 \
+            -borderwidth 1 -highlightthickness 0 -state disabled \
             -command [itcl::code $this Slice move z]
     } {
@@ -2406 +2338 @@
 
     blt::table $inner \
-        0,0 $inner.title -anchor w  -columnspan 4 \
-        3,1 $itk_component(xCutButton) \
-        3,2 $itk_component(yCutButton) \
-        3,3 $itk_component(zCutButton) \
-        2,1 $itk_component(xCutScale) \
-        2,2 $itk_component(yCutScale) \
-        2,3 $itk_component(zCutScale) \
-
-    blt::table configure $inner c0 -resize expand -width 4
-}
-
-itcl::body Rappture::FlowvisViewer::BuildCameraDrawer {} {
-
-    itk_component add camera {
-        Rappture::Scroller $itk_component(drawer).camerascrl \
-            -xscrollmode auto -yscrollmode auto \
-            -highlightthickness 0
-    }
-
-    itk_component add cameraCanvas {
-        canvas $itk_component(camera).canvas -highlightthickness 0
+        1,0 $itk_component(xCutButton) \
+        1,1 $itk_component(yCutButton) \
+        1,2 $itk_component(zCutButton) \
+        0,0 $itk_component(xCutScale) \
+        0,1 $itk_component(yCutScale) \
+        0,2 $itk_component(zCutScale) \
+}
+
+itcl::body Rappture::FlowvisViewer::BuildCameraTab {} {
+
+    itk_component add camera_canvas {
+        canvas $itk_component(scroller).cameracanvas -highlightthickness 0
     } {
         ignore -highlightthickness
     }
-    $itk_component(camera) contents $itk_component(cameraCanvas)
-
-    itk_component add cameraFrame {
-        frame $itk_component(cameraCanvas).frame \
+    $itk_component(sidebar) insert end "camera" \
+        -image [Rappture::icon camera] -text ""  -padx 0 -pady 0 \
+        -command [itcl::code $this tab select "camera"]
+    set headings_(camera) "Camera Settings"
+
+    itk_component add camera_frame {
+        frame $itk_component(camera_canvas).frame \
             -highlightthickness 0 
     } 
-    $itk_component(cameraCanvas) create window 0 0 \
-        -anchor nw -window $itk_component(cameraFrame)
-    bind $itk_component(cameraFrame) <Configure> \
-        [itcl::code $this drawer resize camera]
-
-    set inner $itk_component(cameraFrame)
-
-    label $inner.title -text "Camera Settings" -font "Arial 10 bold"
+    $itk_component(camera_canvas) create window 0 0 \
+        -anchor nw -window $itk_component(camera_frame)
+    bind $itk_component(camera_frame) <Configure> \
+        [itcl::code $this tab resize "camera"]
+
+    set inner $itk_component(camera_frame)
 
     set labels { phi theta psi pan-x pan-y zoom }
-    blt::table $inner \
-        0,0 $inner.title -anchor w  -columnspan 4 
-    set row 1
+    set row 0
     foreach tag $labels {
         label $inner.${tag}label -text $tag -font "Arial 9"
@@ -2456 +2378 @@
             [itcl::code $this camera set ${tag}]
         blt::table $inner \
-            $row,1 $inner.${tag}label -anchor e \
-            $row,2 $inner.${tag} -anchor w 
+            $row,0 $inner.${tag}label -anchor e \
+            $row,1 $inner.${tag} -anchor w 
         incr row
     }
-    bind $inner.title <Shift-ButtonPress> \
-        [itcl::code $this camera show]
-    blt::table configure $inner c0 -resize expand -width 4
-    blt::table configure $inner c1 c2 -resize none
-    blt::table configure $inner c3 -resize expand
+    blt::table configure $inner c0 c1 -resize none
+    blt::table configure $inner c2 -resize expand
 
 }
@@ -2576 +2495 @@
     return ""
 }
+
+itcl::body Rappture::FlowvisViewer::tab { what who } {
+    switch -- ${what} {
+        "select" {
+            $itk_component(scroller) contents $itk_component(${who}_canvas)
+            after idle [list focus $itk_component(${who}_canvas)]
+            $itk_component(title) configure -text "$headings_($who)"
+            drawer open
+        }
+        "deselect" {
+            drawer close 
+        }
+        "resize" {
+            set bbox [$itk_component(${who}_canvas) bbox all]
+            set wid [winfo width $itk_component(${who}_frame)]
+            $itk_component(${who}_canvas) configure -width $wid \
+                -scrollregion $bbox -yscrollincrement 0.1i
+        }
+    }
+}
+

trunk/gui/scripts/heightmapviewer.tcl

@@ -62 +62 @@
         # do nothing
     }
-    public method drawer {what who}
+    public method tab {what who}
     public method camera {option args}
     protected method Connect {}
@@ -71 +71 @@
     protected method ReceiveImage { args }
     private method _ReceiveLegend {tf vmin vmax size}
-    private method _BuildSettingsDrawer {}
-    private method _BuildCameraDrawer {}
+    private method _BuildViewTab {}
+    private method _BuildCameraTab {}
     private method _PanCamera {}
     protected method _receive_echo {channel {data ""}}
@@ -99 +99 @@
     private variable view_         ;# view params for 3D view
     private common settings_      ;# Array used for checkbuttons and radiobuttons
-    private variable initialized_
     private common hardcopy_
+    private variable headings_
 }
 
@@ -161 +161 @@
         rename -highlightbackground -controlbackground controlBackground Background
     }
-    pack $itk_component(reset) -side top -padx 2 -pady { 2 0 }
+    pack $itk_component(reset) -side top -padx 1 -pady { 4 0 }
     Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
 
@@ -174 +174 @@
         rename -highlightbackground -controlbackground controlBackground Background
     }
-    pack $itk_component(zoomin) -side top -padx 2 -pady { 2 0 }
+    pack $itk_component(zoomin) -side top -padx 1 -pady { 4 0 }
     Rappture::Tooltip::for $itk_component(zoomin) "Zoom in"
 
@@ -187 +187 @@
         rename -highlightbackground -controlbackground controlBackground Background
     }
-    pack $itk_component(zoomout) -side top -padx 2 -pady { 2 0 }
+    pack $itk_component(zoomout) -side top -padx 1 -pady { 4 }
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    itk_component add settings_button {
-        label $itk_component(controls).settingsbutton \
-            -borderwidth 1 -padx 1 -pady 1 \
-            -relief "raised" -image [Rappture::icon wrench]
-    } {
-        usual
-        ignore -borderwidth
-        rename -highlightbackground -controlbackground controlBackground \
-            Background
-    }
-    pack $itk_component(settings_button) -padx 2 -pady { 0 2 } \
-        -ipadx 1 -ipady 1
-    Rappture::Tooltip::for $itk_component(settings_button) \
-        "Configure settings"
-    bind $itk_component(settings_button) <ButtonPress> \
-        [itcl::code $this drawer toggle settings]
-    pack $itk_component(settings_button) -side bottom \
-        -padx 2 -pady 2 -anchor e
-
-    itk_component add camera_button {
-        label $itk_component(controls).camerabutton \
-            -borderwidth 1 -padx 1 -pady 1 \
-            -relief "raised" -image [Rappture::icon camera]
-    } {
-        usual
-        ignore -borderwidth
-        rename -highlightbackground -controlbackground controlBackground \
-            Background
-    }
-    Rappture::Tooltip::for $itk_component(camera_button) \
-        "Camera settings"
-    bind $itk_component(camera_button) <ButtonPress> \
-        [itcl::code $this drawer toggle camera]
-    pack $itk_component(camera_button) -side bottom \
-        -padx 2 -pady { 0 2 } -ipadx 1 -ipady 1
-
-    _BuildSettingsDrawer
-    _BuildCameraDrawer
+    _BuildViewTab
+    _BuildCameraTab
 
     # Legend
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(area).legend -width 30 -highlightthickness 0
+        canvas $itk_component(plotarea).legend -width 30 -highlightthickness 0
     } {
         usual
@@ -238 +202 @@
         rename -background -plotbackground plotBackground Background
     }
-    pack $itk_component(legend) -side right -fill y
-    pack $itk_component(3dview) -side left -expand yes -fill both
+    set w [expr [winfo reqwidth $itk_component(hull)] - 80]
+    pack forget $itk_component(3dview)
+    pack $itk_component(3dview) -side left -fill both -expand yes
+    pack $itk_component(legend) -side left -fill y
+
     bind $itk_component(legend) <Configure> \
         [list $_dispatcher event -idle !legend]
@@ -293 +260 @@
     }
 
+    $itk_component(scroller) contents $itk_component(view_canvas)
+    $itk_component(title) configure -text "$headings_(view)"
     set _image(download) [image create photo]
-
     eval itk_initialize $args
-
     Connect 
 }
@@ -483 +450 @@
         coming {
             if {[catch {
-                blt::winop snap $itk_component(area) $_image(download)
+                blt::winop snap $itk_component(plotarea) $_image(download)
             }]} {
                 $_image(download) configure -width 1 -height 1
@@ -985 +952 @@
         "legend" {
             if { $settings_($this-legend) } {
-                pack $itk_component(legend) -side right -fill y
+                pack $itk_component(legend) -side left -fill y
             } else {
-                pack forget $itk_component(legend) 
+                pack forget $itk_component(legend)
             }
             set lineht [expr [font metrics $itk_option(-font) -linespace] + 4]
@@ -1161 +1128 @@
 }
 
-itcl::body Rappture::HeightmapViewer::_BuildSettingsDrawer {} {
-
-    itk_component add settings {
-        Rappture::Scroller $itk_component(drawer).scrl \
-            -xscrollmode auto -yscrollmode auto \
-            -width 200 -height 100
-    }
-
-    itk_component add settings_canvas {
-        canvas $itk_component(settings).canvas -highlightthickness 0
-    }
-    $itk_component(settings) contents $itk_component(settings_canvas)
-
-    itk_component add settings_frame {
-        frame $itk_component(settings_canvas).frame -bg white \
+itcl::body Rappture::HeightmapViewer::_BuildViewTab {} {
+
+    itk_component add view_canvas {
+        canvas $itk_component(scroller).viewcanvas -highlightthickness 0
+    } {
+        ignore -highlightthickness
+    }
+    $itk_component(sidebar) insert end "view" \
+        -image [Rappture::icon wrench] -text "" -padx 0 -pady 0 \
+        -ipadx 0 -ipady 0 \
+        -command [itcl::code $this tab select "view"]
+
+    set headings_(view) "View Settings"
+
+    itk_component add view_frame {
+        frame $itk_component(view_canvas).frame \
             -highlightthickness 0 
-    } 
-    $itk_component(settings_canvas) create window 0 0 \
-        -anchor nw -window $itk_component(settings_frame)
-    bind $itk_component(settings_frame) <Configure> \
-        [itcl::code $this drawer resize settings]
+    } {
+        ignore -background
+    }
+    $itk_component(view_canvas) create window 0 0 \
+        -anchor nw -window $itk_component(view_frame)
+    bind $itk_component(view_frame) <Configure> \
+        [itcl::code $this tab resize view]
 
     set fg [option get $itk_component(hull) font Font]
 
-    set inner $itk_component(settings_frame)
+    set inner $itk_component(view_frame)
 
     foreach { key value } {
@@ -1196 +1166 @@
         set settings_($this-$key) $value
     }
-    set inner $itk_component(settings_frame)
-    label $inner.title -text "View Settings" -font "Arial 10 bold"
+    set inner $itk_component(view_frame)
     checkbutton $inner.grid \
         -text "grid" \
@@ -1226 +1195 @@
 
     blt::table $inner \
-        0,0 $inner.title -anchor w -columnspan 2 \
         1,1 $inner.grid -anchor w  \
         2,1 $inner.axes -anchor w \
@@ -1233 +1201 @@
         5,1 $inner.legend -anchor w 
 
-    blt::table configure $inner c0 -resize expand -width 2
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner c1 -resize none
@@ -1239 +1206 @@
 }
 
-itcl::body Rappture::HeightmapViewer::_BuildCameraDrawer {} {
-
-    itk_component add camera {
-        Rappture::Scroller $itk_component(drawer).camerascrl \
-            -xscrollmode auto -yscrollmode auto \
-            -highlightthickness 0
-    }
+itcl::body Rappture::HeightmapViewer::_BuildCameraTab {} {
 
     itk_component add camera_canvas {
-        canvas $itk_component(camera).canvas -highlightthickness 0
+        canvas $itk_component(scroller).cameracanvas -highlightthickness 0
     } {
         ignore -highlightthickness
     }
-    $itk_component(camera) contents $itk_component(camera_canvas)
+    $itk_component(sidebar) insert end "camera" \
+        -image [Rappture::icon camera] -text ""  -padx 0 -pady 0 \
+        -ipadx 0 -ipady 0 \
+        -command [itcl::code $this tab select "camera"]
+    set headings_(camera) "Camera Settings"
 
     itk_component add camera_frame {
         frame $itk_component(camera_canvas).frame \
-            -highlightthickness 0 
-    } 
+            -highlightthickness 0
+    } {
+        usual
+        ignore -background
+    }
     $itk_component(camera_canvas) create window 0 0 \
         -anchor nw -window $itk_component(camera_frame)
     bind $itk_component(camera_frame) <Configure> \
-        [itcl::code $this drawer resize camera]
+        [itcl::code $this tab resize camera]
 
     set inner $itk_component(camera_frame)
 
-    label $inner.title -text "Camera Settings" -font "Arial 10 bold"
-
     set labels { phi theta psi pan-x pan-y zoom }
-    blt::table $inner \
-        0,0 $inner.title -anchor w  -columnspan 4 
     set row 1
     foreach tag $labels {
@@ -1282 +1246 @@
         incr row
     }
-    bind $inner.title <Shift-ButtonPress> \
-        [itcl::code $this camera show]
-    blt::table configure $inner c0 -resize expand -width 4
     blt::table configure $inner c1 c2 -resize none
     blt::table configure $inner c3 -resize expand
@@ -1290 +1251 @@
 }
 
-itcl::body Rappture::HeightmapViewer::drawer { what who } {
+itcl::body Rappture::HeightmapViewer::tab { what who } {
     switch -- ${what} {
-        "activate" {
-            $itk_component(drawer) add $itk_component($who) -sticky nsew
-            after idle [list focus $itk_component($who)]
-            if { ![info exists initialized_($who)] } {
-                set w [winfo width $itk_component(drawer)]
-                set x [expr $w - 120]
-                $itk_component(drawer) sash place 0 $x 0
-                set initialized_($who) 1
-            }
-            $itk_component(${who}_button) configure -relief sunken
-        }
-        "deactivate" {
-            $itk_component(drawer) forget $itk_component($who)
-            $itk_component(${who}_button) configure -relief raised
-        }
-        "toggle" {
-            set slaves [$itk_component(drawer) panes]
-            if { [lsearch $slaves $itk_component($who)] >= 0 } {
-                drawer deactivate $who
-            } else {
-                drawer activate $who
-            }
+        "select" {
+            $itk_component(scroller) contents $itk_component(${who}_canvas)
+            after idle [list focus $itk_component(${who}_canvas)]
+            $itk_component(title) configure -text "$headings_($who)"
+            drawer open
+        }
+        "deselect" {
+            drawer close 
         }
         "resize" {

trunk/gui/scripts/molvisviewer.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: molvisviewer - view a molecule in 3D
@@ -70 +71 @@
     public method bondthickness {option {model "all"} }
     public method ResetView {} 
-    public method settings {option args}
+    public method tab {what who}
 
     protected method _send {args}
@@ -84 +85 @@
     protected method _vmouse  {option b m x y}
     private method _ReceiveImage { size cacheid frame rock }
-    private method _BuildSettingsDrawer {}
+    private method _BuildViewTab {}
     private method GetPngImage { widget width height }
     private method WaitIcon { option widget }
@@ -115 +116 @@
 
     private common _settings  ;# array of settings for all known widgets
-    private variable initialized_ "no";
+    private variable initialized_
 
     common _downloadPopup           ;# download options from popup
@@ -121 +122 @@
     private common hardcopy_
     private variable nextToken_ 0
+    private variable headings_
 }
 
@@ -299 +301 @@
     $this projection perspective
 
-    itk_component add settings_button {
-        label $itk_component(controls).settingsbutton \
+    itk_component add configure_button {
+        label $itk_component(controls).configbutton \
             -borderwidth 1 -padx 1 -pady 1 \
             -relief "raised" -image [Rappture::icon wrench]
@@ -309 +311 @@
             Background
     }
-    pack $itk_component(settings_button) -padx 2 -pady { 0 2 } -ipadx 1 -ipady 1
-    Rappture::Tooltip::for $itk_component(settings_button) \
-        "Configure settings"
-    bind $itk_component(settings_button) <ButtonPress> \
-        [itcl::code $this settings toggle]
-    pack $itk_component(settings_button) -side bottom \
-        -padx 2 -pady 2 -anchor e
-
-    _BuildSettingsDrawer
+
+    _BuildViewTab
+
+    # Hack around the Tk panewindow.  The problem is that the requested 
+    # size of the 3d view isn't set until an image is retrieved from
+    # the server.  So the panewindow uses the tiny size.
+    set w [expr [winfo reqwidth $itk_component(hull)] - 80]
+    blt::table $itk_component(plotarea) \
+        0,0 $itk_component(3dview) -fill both -reqwidth $w 
 
     #
@@ -399 +401 @@
         [itcl::code $this _map]
 
+    $itk_component(scroller) contents $itk_component(view_canvas)
+    $itk_component(title) configure -text "$headings_(view)"
+
     eval itk_initialize $args
     Connect
 }
 
-itcl::body Rappture::MolvisViewer::_BuildSettingsDrawer {} {
-
-    itk_component add settings {
-        Rappture::Scroller $itk_component(drawer).scrl \
-            -xscrollmode auto -yscrollmode auto \
-            -width 200 -height 100
-    }
-
-    itk_component add settings_canvas {
-        canvas $itk_component(settings).canvas
-    }
-    $itk_component(settings) contents $itk_component(settings_canvas)
-
-    itk_component add settings_frame {
-        frame $itk_component(settings_canvas).frame -bg white
+itcl::body Rappture::MolvisViewer::_BuildViewTab {} {
+
+    itk_component add view_canvas {
+        canvas $itk_component(scroller).viewcanvas -highlightthickness 0
+    } {
+        ignore -highlightthickness
+    }
+    $itk_component(sidebar) insert end "view" \
+        -image [Rappture::icon wrench] -text ""  -padx 0 -pady 0 \
+        -command [itcl::code $this tab select "view"]
+    set headings_(view) "View Settings"
+
+    itk_component add view_frame {
+        frame $itk_component(view_canvas).frame -bg white
     } 
-    $itk_component(settings_canvas) create window 0 0 \
-        -anchor nw -window $itk_component(settings_frame)
-    bind $itk_component(settings_frame) <Configure> \
-        [itcl::code $this settings resize]
+    $itk_component(view_canvas) create window 0 0 \
+        -anchor nw -window $itk_component(view_frame)
+    bind $itk_component(view_frame) <Configure> \
+        [itcl::code $this tab resize view]
 
     set fg [option get $itk_component(hull) font Font]
 
-    set inner $itk_component(settings_frame)
+    set inner $itk_component(view_frame)
     label $inner.drawinglabel -text "Drawing Method" -font "Arial 9 bold"
 
@@ -1552 +1556 @@
 
 
-itcl::body Rappture::MolvisViewer::settings { what args } {
-    switch -- ${what} {
-        "activate" {
-            $itk_component(drawer) add $itk_component(settings) -sticky nsew
-            after idle [list focus $itk_component(settings)]
-            if { !$initialized_ } {
-                set w [winfo width $itk_component(drawer)]
-                set x [expr $w - 100]
-                $itk_component(drawer) sash place 0 $x 0
-                set initialized_ 1
-            }
-            $itk_component(settings_button) configure -relief sunken
-        }
-        "deactivate" {
-            $itk_component(drawer) forget $itk_component(settings)
-            $itk_component(settings_button) configure -relief raised
-        }
-        "toggle" {
-            set slaves [$itk_component(drawer) panes]
-            if { [lsearch $slaves $itk_component(settings)] >= 0 } {
-                settings deactivate
-            } else {
-                settings activate
-            }
-        }
-        "resize" {
-            set bbox [$itk_component(settings_canvas) bbox all]
-            set wid [winfo width $itk_component(settings_frame)]
-            $itk_component(settings_canvas) configure -width $wid \
-                -scrollregion $bbox -yscrollincrement 0.1i
-        }
-    }
-}
 
 itcl::body Rappture::MolvisViewer::WaitIcon  { option widget } {
@@ -1661 +1632 @@
     return ""
 }
+
+itcl::body Rappture::MolvisViewer::tab { what who } {
+    switch -- ${what} {
+        "select" {
+            $itk_component(scroller) contents $itk_component(${who}_canvas)
+            after idle [list focus $itk_component(${who}_canvas)]
+            $itk_component(title) configure -text "$headings_($who)"
+            drawer open
+        }
+        "deselect" {
+            drawer close 
+        }
+        "resize" {
+            set bbox [$itk_component(${who}_canvas) bbox all]
+            set wid [winfo width $itk_component(${who}_frame)]
+            $itk_component(${who}_canvas) configure -width $wid \
+                -scrollregion $bbox -yscrollincrement 0.1i
+        }
+    }
+}

trunk/gui/scripts/nanovisviewer.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: nanovisviewer - 3D volume rendering
@@ -239 +240 @@
         label $itk_component(slicers).xslice \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -image [Rappture::icon x-cutplane-off]
+            -image [Rappture::icon x-cutplane]
     } {
         usual
@@ -275 +276 @@
         label $itk_component(slicers).yslice \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -image [Rappture::icon y-cutplane-off]
+            -image [Rappture::icon y-cutplane]
     } {
         usual
@@ -311 +312 @@
         label $itk_component(slicers).zslice \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -image [Rappture::icon z-cutplane-off]
+            -image [Rappture::icon z-cutplane]
     } {
         usual
@@ -1320 +1321 @@
             if {$op} {
                 $itk_component(${axis}slice) configure \
-                    -image [Rappture::icon ${axis}-cutplane-on] \
                     -relief sunken
                 $itk_component(${axis}slicer) configure -state normal
@@ -1326 +1326 @@
             } else {
                 $itk_component(${axis}slice) configure \
-                    -image [Rappture::icon ${axis}-cutplane-off] \
                     -relief raised
                 $itk_component(${axis}slicer) configure -state disabled

trunk/gui/scripts/page.tcl

@@ -238 +238 @@
             } else {
                 if {[catch {$frame.cntls insert end $path.$cname} c]} {
-                    error $c "$c\n    (while building control for $path.$cname)"
+                    global errorInfo
+                    error $c "$c\n$errorInfo\n    (while building control for $path.$cname)"
                 }
             }

trunk/gui/scripts/panes.tcl

@@ -49 +49 @@
     private variable _counter 0      ;# counter for auto-generated names
     private variable _frac 0.0       ;# list of fractions
+    public variable orientation "vertical"
 }
 
@@ -118 +119 @@
         ignore -borderwidth
     }
-    pack $itk_component(${sash}ridge) -fill x
-
+    if { $orientation == "vertical" } {
+        pack $itk_component(${sash}ridge) -fill x 
+    } else {
+        pack $itk_component(${sash}ridge) -fill y -side left
+    }
     foreach comp [list $sash ${sash}ridge] {
         bind $itk_component($comp) <ButtonPress-1> \
@@ -265 +269 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Panes::_drag {pname X Y} {
-    set realY [expr {$Y-[winfo rooty $itk_component(hull)]}]
-    set Ymax  [winfo height $itk_component(hull)]
-    set frac [expr double($realY)/$Ymax]
+    if { $orientation == "vertical" } {
+        set realY [expr {$Y-[winfo rooty $itk_component(hull)]}]
+        set Ymax  [winfo height $itk_component(hull)]
+        set frac [expr double($realY)/$Ymax]
+    } else {
+        set realX [expr {$X-[winfo rootx $itk_component(hull)]}]
+        set Xmax  [winfo width $itk_component(hull)]
+        set frac [expr double($realX)/$Xmax]
+    }
     if {$frac < 0.05} {
         set frac 0.05
@@ -303 +313 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Panes::_fixLayout {args} {
-    set h [winfo height $itk_component(hull)]
-
-    set plist ""
-    set flist ""
-    foreach p $_panes f $_frac v $_visibility {
-        set sash ${p}sash
-        if {$v} {
-            # this pane is visible -- make room for it
-            lappend plist $p
-            lappend flist $f
+    if { $orientation == "vertical" } {
+        set h [winfo height $itk_component(hull)]
+
+        set plist ""
+        set flist ""
+        foreach p $_panes f $_frac v $_visibility {
+            set sash ${p}sash
+            if {$v} {
+                # this pane is visible -- make room for it
+                lappend plist $p
+                lappend flist $f
+                if {[info exists itk_component($sash)]} {
+                    set h [expr {$h - [winfo height $itk_component($sash)]}]
+                }
+            } else {
+                # this pane is not visible -- remove sash
+                if {[info exists itk_component($sash)]} {
+                    place forget $itk_component($sash)
+                }
+                place forget $itk_component($p)
+            }
+        }
+        
+        # normalize the fractions so they add up to 1
+        set total 0
+        foreach f $flist { set total [expr {$total+$f}] }
+        set newflist ""
+        foreach f $flist {
+            lappend newflist [expr {double($f)/$total}]
+        }
+        set flist $newflist
+        
+        # lay out the various panes
+        set y 0
+        foreach p $plist f $flist {
+            set sash ${p}sash
             if {[info exists itk_component($sash)]} {
-                set h [expr {$h - [winfo height $itk_component($sash)]}]
-            }
-        } else {
-            # this pane is not visible -- remove sash
+                set sh [winfo reqheight $itk_component($sash)]
+                place $itk_component($sash) -y $y -relx 0.5 -anchor n \
+                    -relwidth 1.0 -height $sh
+                set y [expr {$y + $sh}]
+            }
+            
+            set ph [expr {$h*$f}]
+            place $itk_component($p) -y $y -relx 0.5 -anchor n \
+                -relwidth 1.0 -height $ph
+            set y [expr {$y + $ph}]
+        }
+    } else {
+        set w [winfo width $itk_component(hull)]
+
+        set plist ""
+        set flist ""
+        foreach p $_panes f $_frac v $_visibility {
+            set sash ${p}sash
+            if {$v} {
+                # this pane is visible -- make room for it
+                lappend plist $p
+                lappend flist $f
+                if {[info exists itk_component($sash)]} {
+                    set w [expr {$w - [winfo width $itk_component($sash)]}]
+                }
+            } else {
+                # this pane is not visible -- remove sash
+                if {[info exists itk_component($sash)]} {
+                    place forget $itk_component($sash)
+                }
+                place forget $itk_component($p)
+            }
+        }
+        
+        # normalize the fractions so they add up to 1
+        set total 0
+        foreach f $flist { set total [expr {$total+$f}] }
+        set newflist ""
+        foreach f $flist {
+            lappend newflist [expr {double($f)/$total}]
+        }
+        set flist $newflist
+        
+        # lay out the various panes
+        set x 0
+        foreach p $plist f $flist {
+            set sash ${p}sash
             if {[info exists itk_component($sash)]} {
-                place forget $itk_component($sash)
-            }
-            place forget $itk_component($p)
-        }
-    }
-
-    # normalize the fractions so they add up to 1
-    set total 0
-    foreach f $flist { set total [expr {$total+$f}] }
-    set newflist ""
-    foreach f $flist {
-        lappend newflist [expr {double($f)/$total}]
-    }
-    set flist $newflist
-
-    # lay out the various panes
-    set y 0
-    foreach p $plist f $flist {
-        set sash ${p}sash
-        if {[info exists itk_component($sash)]} {
-            set sh [winfo reqheight $itk_component($sash)]
-            place $itk_component($sash) -y $y -relx 0.5 -anchor n \
-                -relwidth 1.0 -height $sh
-            set y [expr {$y + $sh}]
-        }
-
-        set ph [expr {$h*$f}]
-        place $itk_component($p) -y $y -relx 0.5 -anchor n \
-            -relwidth 1.0 -height $ph
-        set y [expr {$y + $ph}]
-    }
+                set sw [winfo reqwidth $itk_component($sash)]
+                place $itk_component($sash) -x $x -rely 0.5 -anchor w \
+                    -relheight 1.0 -width $sw
+                set x [expr {$x + $sw}]
+            }
+            
+            set pw [expr {$w*$f}]
+            place $itk_component($p) -x $x -rely 0.5 -anchor w \
+                -relheight 1.0 -width $pw
+            set x [expr {$x + $pw}]
+        }
+    }   
 }
 
@@ -359 +419 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Panes::_fixSashes {args} {
-    set ht [winfo pixels $itk_component(hull) $itk_option(-sashwidth)]
-    set bd [expr {$ht/2}]
-    foreach pane $_panes {
-        set sash "${pane}sashridge"
-        if {[info exists itk_component($sash)]} {
-            $itk_component($sash) configure -height $ht -borderwidth $bd
-            if {$itk_option(-sashrelief) == "solid"} {
-                $itk_component($sash) configure -background black
-            } else {
-                $itk_component($sash) configure \
-                    -background $itk_option(-background)
-            }
-            pack $itk_component($sash) -pady $itk_option(-sashpadding)
+    if { $orientation == "vertical" } {
+        set ht [winfo pixels $itk_component(hull) $itk_option(-sashwidth)]
+        set bd [expr {$ht/2}]
+        foreach pane $_panes {
+            set sash "${pane}sashridge"
+            if {[info exists itk_component($sash)]} {
+                $itk_component($sash) configure -height $ht -borderwidth $bd
+                if {$itk_option(-sashrelief) == "solid"} {
+                    $itk_component($sash) configure -background black
+                } else {
+                    $itk_component($sash) configure \
+                        -background $itk_option(-background)
+                }
+                pack $itk_component($sash) -pady $itk_option(-sashpadding)
+            }
+        }
+    } else {
+        set w [winfo pixels $itk_component(hull) $itk_option(-sashwidth)]
+        set bd [expr {$w/2}]
+        foreach pane $_panes {
+            set sash "${pane}sashridge"
+            if {[info exists itk_component($sash)]} {
+                $itk_component($sash) configure -width $w -borderwidth $bd
+                if {$itk_option(-sashrelief) == "solid"} {
+                    $itk_component($sash) configure -background black
+                } else {
+                    $itk_component($sash) configure \
+                        -background $itk_option(-background)
+                }
+                pack $itk_component($sash) -padx $itk_option(-sashpadding) \
+                    -side left
+            }
         }
     }

trunk/gui/scripts/resultviewer.tcl

@@ -254 +254 @@
                         set mesh [$dataobj mesh]
                         set fmt [expr {("" != $mesh) ? "vtk" : "nanovis"}]
+                        set extents [$dataobj extents]
+                        if { $extents == 3 } {
+                            set fmt "flowvis"
+                        }
                         set w $itk_interior.field3D
                         Rappture::Field3DResult $w -mode $fmt

trunk/gui/scripts/unirect2d.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: unirect2d - represents a uniform rectangular 2-D mesh.
@@ -17 +18 @@
 namespace eval Rappture { # forward declaration }
 
-itcl::class Rappture::UniRect2d {
+itcl::class Rappture::Unirect2d {
     constructor {xmlobj field cname} { # defined below }
     destructor { # defined below }
@@ -33 +34 @@
     private variable _ymin 0
     private variable _ynum 0
-    private variable _zv "";            # BLT vector containing the z-values 
+    private variable _values "";        # BLT vector containing the z-values 
     private variable _hints
 }
@@ -40 +41 @@
 # Constructor
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::constructor {xmlobj field cname} {
+itcl::body Rappture::Unirect2d::constructor {xmlobj field cname} {
     if {![Rappture::library isvalid $xmlobj]} {
         error "bad value \"$xmlobj\": should be Rappture::library"
@@ -53 +54 @@
     set _ymax [$mobj get "yaxis.max"]
     set _ynum [$mobj get "yaxis.numpoints"]
+    
+    foreach {key path} {
+        group   about.group
+        label   about.label
+        color   about.color
+        style   about.style
+        type    about.type
+        xlabel  xaxis.label
+        xdesc   xaxis.description
+        xunits  xaxis.units
+        xscale  xaxis.scale
+        xmin    xaxis.min
+        xmax    xaxis.max
+        ylabel  yaxis.label
+        ydesc   yaxis.description
+        yunits  yaxis.units
+        yscale  yaxis.scale
+        ymin    yaxis.min
+        ymax    yaxis.max
+    } {
+        set str [$mobj get $path]
+        if {"" != $str} {
+            set _hints($key) $str
+        }
+    }
+    foreach {key} { extents axisorder } {
+        set str [$field get $cname.$key]
+        if {"" != $str} {
+            set _hints($key) $str
+        }
+    }
     itcl::delete object $mobj
-
-    set _zv [blt::vector create #auto]
-    $_zv set [$field get "$cname.values"]
+    
+    set _values [blt::vector create \#auto]
+    set values [$field get "$cname.values"]
+    if { $values == "" } {
+        set values [$field get "$cname.zvalues"]
+    }
+    $_values set $values
 }
 
@@ -62 +98 @@
 # Destructor
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::destructor {} {
-    if { $_zv != "" } {
-        blt::vector destroy $_zv
+itcl::body Rappture::Unirect2d::destructor {} {
+    if { $_values != "" } {
+        blt::vector destroy $_values
     }
 }
@@ -74 +110 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::blob {} {
+itcl::body Rappture::Unirect2d::blob {} {
     set data "unirect2d"
     lappend data "xmin" $_xmin "xmax" $_xmax "xnum" $_xnum
     lappend data "ymin" $_ymin "ymax" $_ymax "ynum" $_ynum
     lappend data "xmin" $_xmin "ymin" $_ymin "xmax" $_xmax "ymax" $_ymax
-    if { [$_zv length] > 0 } {
-        lappend data "zvalues" [$_zv range 0 end]
+    foreach key { axisorder extents xunits yunits units } {
+        set hint [hints $key]
+        if { $hint != "" } {
+            lappend data $key $hint
+        }
+    }
+    if { [$_values length] > 0 } {
+        lappend data "values" [$_values range 0 end]
     }
     return [Rappture::encoding::encode -as zb64 $data]
@@ -91 +133 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::mesh {} {
+itcl::body Rappture::Unirect2d::mesh {} {
     set dx [expr {($_xmax - $_xmin) / double($_xnum)}]
     set dy [expr {($_ymax - $_ymin) / double($_ynum)}]
@@ -110 +152 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::values {} {
-    if { [$_zv length] > 0 } {
-        return [$_zv range 0 end]
+itcl::body Rappture::Unirect2d::values {} {
+    if { [$_values length] > 0 } {
+        return [$_values range 0 end]
     }
     return ""
@@ -122 +164 @@
 #       specified axis.
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::limits {which} {
+itcl::body Rappture::Unirect2d::limits {which} {
     set min ""
     set max ""
@@ -137 +179 @@
             set axis "yaxis"
         }
-        v - xlin - vlog - z - zlin - zlog {
-            if { [$_zv length] > 0 } {
-               set min [blt::vector expr min($_zv)]
-               set max [blt::vector expr max($_zv)]
+        v - vlin - vlog - z - zlin - zlog {
+            if { [$_values length] > 0 } {
+               set min [blt::vector expr min($_values)]
+               set max [blt::vector expr max($_values)]
             } else {
                 set min 0.0
@@ -177 +219 @@
 # the hint for that <keyword>, if it exists.
 # ----------------------------------------------------------------------
-itcl::body Rappture::UniRect2d::hints {{keyword ""}} {
-    if {![info exists _hints]} {
-        foreach {key path} {
-            group   about.group
-            label   about.label
-            color   about.color
-            style   about.style
-            type    about.type
-            xlabel  xaxis.label
-            xdesc   xaxis.description
-            xunits  xaxis.units
-            xscale  xaxis.scale
-            xmin    xaxis.min
-            xmax    xaxis.max
-            ylabel  yaxis.label
-            ydesc   yaxis.description
-            yunits  yaxis.units
-            yscale  yaxis.scale
-            ymin    yaxis.min
-            ymax    yaxis.max
-        } {
-            set str [$_curve get $path]
-            if {"" != $str} {
-                set _hints($key) $str
-            }
-        }
-
-        if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)
-              && [info exists _hints(xunits)] && "" != $_hints(xunits)} {
-            set _hints(xlabel) "$_hints(xlabel) ($_hints(xunits))"
-        }
-        if {[info exists _hints(ylabel)] && "" != $_hints(ylabel)
-              && [info exists _hints(yunits)] && "" != $_hints(yunits)} {
-            set _hints(ylabel) "$_hints(ylabel) ($_hints(yunits))"
-        }
-
-        if {[info exists _hints(group)] && [info exists _hints(label)]} {
-            # pop-up help for each curve
-            set _hints(tooltip) $_hints(label)
-        }
-    }
-
+itcl::body Rappture::Unirect2d::hints { {keyword ""} } {
+    if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)
+        && [info exists _hints(xunits)] && "" != $_hints(xunits)} {
+        set _hints(xlabel) "$_hints(xlabel) ($_hints(xunits))"
+    }
+    if {[info exists _hints(ylabel)] && "" != $_hints(ylabel)
+        && [info exists _hints(yunits)] && "" != $_hints(yunits)} {
+        set _hints(ylabel) "$_hints(ylabel) ($_hints(yunits))"
+    }
+    
+    if {[info exists _hints(group)] && [info exists _hints(label)]} {
+        # pop-up help for each curve
+        set _hints(tooltip) $_hints(label)
+    }
     if {$keyword != ""} {
         if {[info exists _hints($keyword)]} {

trunk/gui/scripts/visviewer.tcl

@@ -21 +21 @@
 
     private common servers_         ;# array of visualization server lists
-    set servers_(nanovis) ""
-    set servers_(pymol)   ""
+    set servers_(nanovis) "localhost:2000"
+    set servers_(pymol)   "localhost:2020"
 
     private variable sid_ ""        ;# socket connection to server
     private common done_            ;# Used to indicate status of send.
     private variable buffer_        ;# buffer for incoming/outgoing commands
-
+    private variable initialized_
+    private variable isOpen_ 0
     # Number of milliseconds to wait before idle timeout.
     # If greater than 0, automatically disconnect from the visualization
@@ -64 +65 @@
     protected method Color2RGB { color }
     protected method Euler2XYZ { theta phi psi }
+    protected method drawer {what}
 
     private proc _CheckNameList { namelist }  {
@@ -88 +90 @@
 itk::usual Panedwindow {
     keep -background -cursor
+}
+itk::usual Tabset {
+    keep -background
 }
 
@@ -119 +124 @@
     pack propagate $itk_component(hull) no
 
-    itk_component add controls {
-        frame $itk_interior.cntls 
+    itk_component add panes {
+        panedwindow $itk_interior.panes \
+            -orient horizontal -opaqueresize 1 -handlepad 0 \
+            -handlesize 1 -sashwidth 2 
+    }
+    pack $itk_component(panes) -expand yes -fill both
+
+    itk_component add plotarea {
+        frame $itk_component(panes).plotarea -highlightthickness 0 
+    }
+    $itk_component(panes) add $itk_component(plotarea) -sticky nsew 
+    set _image(plot) [image create photo]
+    itk_component add 3dview {
+        label $itk_component(plotarea).vol -image $_image(plot) \
+            -highlightthickness 0 -borderwidth 0 
+    } {
+        usual
+        ignore -highlightthickness -borderwidth 
+    }
+    itk_component add drawer {
+        frame $itk_component(panes).cntls 
     } {
         usual
         rename -background -controlbackground controlBackground Background
     }
-    pack $itk_component(controls) -side right -fill y
-
-    #
-    # RENDERING AREA
-    #
-    itk_component add drawer {
-        panedwindow $itk_interior.drawer \
-            -orient horizontal -opaqueresize 1 -handlepad 0 \
-            -handlesize 1 -sashwidth 2
-    }
-    pack $itk_component(drawer) -expand yes -fill both
-
-    itk_component add area {
-        frame $itk_interior.area -highlightthickness 0 
-    }
-    $itk_component(drawer) add $itk_component(area) -sticky nsew
-
-    set _image(plot) [image create photo]
-    itk_component add 3dview {
-        label $itk_component(area).vol -image $_image(plot) \
-            -highlightthickness 0 -width 1 -height 1 -borderwidth 0
+    itk_component add controls {
+        frame $itk_component(drawer).cntls  
+    } {
+        usual
+        rename -background -controlbackground controlBackground Background
+        ignore -highlightthickness -borderwidth  
+    }
+
+    itk_component add titlebar {
+        frame $itk_component(drawer).titlebar -background \#6666cc
+    } {
+        usual
+        ignore -highlightthickness -borderwidth  -background 
+    }
+
+    itk_component add title {
+        label $itk_component(titlebar).title -text "This is the title bar" \
+            -background \#6666cc -font "Arial 8" -foreground white  
+    } {
+        usual
+        ignore -background -font -foreground
+    }
+    itk_component add flipswitch {
+        button $itk_component(titlebar).flip \
+            -borderwidth 1 -highlightthickness 0 \
+            -relief "flat" -image [Rappture::icon sbar-open] \
+            -command [itcl::code $this drawer toggle] \
+            -background \#6666cc -foreground white -overrelief raised \
+            -activebackground \#6666cc -activeforeground white
+        
+    } {
+        ignore -borderwidth
+        rename -highlightbackground -controlbackground controlBackground \
+            Background
+    }
+    Rappture::Tooltip::for $itk_component(flipswitch) \
+        "Configure settings"
+
+    blt::table $itk_component(titlebar) \
+        0,0 $itk_component(flipswitch) -ipady 2 -ipadx 5 -anchor w \
+        0,1 $itk_component(title) -anchor w
+    blt::table configure $itk_component(titlebar) c0 -width 30
+
+    itk_component add sidebar {
+        blt::tabset $itk_component(drawer).sidebar \
+            -highlightthickness 0 -tearoff 0 -side left \
+            -bd 0 -gap 0 -tabborderwidth 1 \
+            -outerpad 0 
     } {
         usual
         ignore -highlightthickness -borderwidth 
-    }
-    pack $itk_component(3dview) -expand yes -fill both
+        rename -highlightbackground -controlbackground controlBackground \
+            Background
+        rename -background -controlbackground controlBackground \
+            Background
+    }
+    itk_component add scroller {
+        Rappture::Scroller $itk_component(drawer).scroller \
+            -xscrollmode auto -yscrollmode auto \
+            -highlightthickness 0
+    } 
+    blt::table $itk_component(drawer) \
+        0,0 $itk_component(titlebar) -fill x -anchor w -columnspan 2 \
+        1,0 $itk_component(controls) -fill y -anchor n -pady 3 \
+        1,1 $itk_component(scroller) -rowspan 2 -fill both \
+        2,0 $itk_component(sidebar)  -fill y -anchor s 
+
+    $itk_component(panes) add $itk_component(drawer) -sticky nsew 
+    blt::table configure $itk_component(drawer) r0 c1 r1 c0 -resize none 
+    blt::table configure $itk_component(drawer) c2 -resize expand
+    blt::table configure $itk_component(drawer) r2 -resize expand
 
     eval itk_initialize $args
+
+    # Two things wrong with the tk:panedwindow.  
+    # 1. can't disable the sash.  Maybe I can hide it.
+    # 2. can't set/force the width of a pane.
+
+    $itk_component(panes) paneconfigure $itk_component(drawer) \
+        -minsize 30
 }
 
@@ -193 +269 @@
 #
 itcl::body Rappture::VisViewer::_ServerDown {} {
-    if { [info exists itk_component(area)] } {
-        set x [expr {[winfo rootx $itk_component(area)]+10}]
-        set y [expr {[winfo rooty $itk_component(area)]+10}]
+    if { [info exists itk_component(plotarea)] } {
+        set x [expr {[winfo rootx $itk_component(plotarea)]+10}]
+        set y [expr {[winfo rooty $itk_component(plotarea)]+10}]
     } else {
         set x 0; set y 0
@@ -319 +395 @@
     # rebuild.
     $_dispatcher cancel !serverDown
-    set x [expr {[winfo rootx $itk_component(area)]+10}]
-    set y [expr {[winfo rooty $itk_component(area)]+10}]
+    set x [expr {[winfo rootx $itk_component(plotarea)]+10}]
+    set y [expr {[winfo rooty $itk_component(plotarea)]+10}]
     Rappture::Tooltip::cue @$x,$y "Connecting..."
     set code [catch { Connect } ok]
@@ -547 +623 @@
 }
 
+itcl::body Rappture::VisViewer::drawer { what } {
+    switch -- ${what} {
+        "open" {
+            after idle [list focus $itk_component(drawer)]
+            set win [$itk_component(scroller) contents]
+            set w1 [winfo reqwidth $win]
+            set w2 [winfo reqwidth $itk_component(title)]
+            set w [expr max($w1,$w2) + 30]
+            set x [expr [winfo width $itk_component(panes)] - $w]
+            $itk_component(panes) sash place 0 $x 0
+            $itk_component(panes) paneconfigure $itk_component(drawer) \
+                -width $w 
+            #sash place 0 $x 0
+            $itk_component(flipswitch) configure \
+                -image [Rappture::icon sbar-closed] 
+            set isOpen_ 1
+        }
+        "close" {
+            $itk_component(flipswitch) configure \
+                -image [Rappture::icon sbar-open] 
+            set w [winfo width $itk_component(panes)]
+            if { $w <= 1 } {
+                set w [winfo reqwidth $itk_component(panes)]
+            }
+            set x [lindex [$itk_component(panes) sash coord 0] 0]
+            set initialized_(drawer) $x
+            $itk_component(panes) paneconfigure $itk_component(drawer) \
+                -minsize 30 
+            set x [expr $w - 30]
+            $itk_component(panes) sash place 0 $x 0
+            set isOpen_ 0
+        }
+        "toggle" {
+            if { $isOpen_ } {
+                drawer close
+            } else {
+                drawer open
+            }
+        }
+    }
+}