Changeset 2144

Timestamp:

Mar 23, 2011, 6:43:21 PM (14 years ago)

Author:

gah

Message:

vtk-contour-viewer additions: still experimental

Location:

trunk/gui

Files:

• apps/launcher.tcl (modified) (1 diff)
• apps/vtkcontour-test (modified) (1 diff)
• scripts/field.tcl (modified) (1 diff)
• scripts/field2dresult.tcl (modified) (1 diff)
• scripts/filexfer.tcl (modified) (1 diff)
• scripts/resultviewer.tcl (modified) (1 diff)
• scripts/sequenceresult.tcl (modified) (1 diff)
• scripts/unirect2d.tcl (modified) (1 diff)
• scripts/vtkcontourviewer.tcl (modified) (46 diffs)

trunk/gui/apps/launcher.tcl

@@ -91 +91 @@
 # Note: We're sourcing the driver file "main.tcl" rather than exec-ing
 #       wish because we want to see stderr and stdout messages when they
-#       written, rather than when the program completes.  It also eliminates
-#       one process waiting for the other to complete. If "exec" is needed, 
-#       then the following could be replaced with blt::bgexec.  It doesn't
-#       try to redirect stderr into a file.
+#       are written, rather than when the program completes.  It also 
+#       eliminates one process waiting for the other to complete. If 
+#       "exec" is needed, then the following could be replaced with 
+#       blt::bgexec.  It doesn't try to redirect stderr into a file.
 set argv $alist
 package require Tk

trunk/gui/apps/vtkcontour-test

@@ -352 +352 @@
 set f [.main pane 0]
 VtkContourViewer_init_resources
-#set servers [Rappture::VtkContourViewer::GetServerList "vtkvis"]
-Rappture::VtkContourViewer $f.viewer "localhost:2010"
+set servers [Rappture::VtkContourViewer::GetServerList "vtkvis"]
+Rappture::VtkContourViewer $f.viewer $servers
 pack $f.viewer -expand yes -fill both
 set widgets(vtkcontourviewer) $f.viewer

trunk/gui/scripts/field.tcl

@@ -490 +490 @@
         updir   updir
         camera  camera.position
+        type    about.type
     } {
         set str [$_field get $path]

trunk/gui/scripts/field2dresult.tcl

@@ -56 +56 @@
     }
     array set flags $args
-    set servers [Rappture::VisViewer::GetServerList "nanovis"]
+    set servers ""
+    switch -- $flags(-mode) {
+        "auto" - "heightmap" - "flowvis" {
+            set servers [Rappture::VisViewer::GetServerList "nanovis"]
+        }
+        "vtkcontour" {
+            set servers [Rappture::VisViewer::GetServerList "vtkvis"]
+        }
+        default {
+            puts stderr "unknown render mode \"$flags(-mode)\""
+        }
+    }           
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {

trunk/gui/scripts/filexfer.tcl

@@ -343 +343 @@
         foreach prog {
               clientaction
+              /usr/lib/hubzero/clientaction
               /apps/bin/clientaction
               /apps/xvnc/bin/clientaction

trunk/gui/scripts/resultviewer.tcl

@@ -264 +264 @@
                     if {![info exists _mode2widget($mode)]} {
                         if { [$dataobj isunirect2d] } {
-                            set resultMode "vtkcontour" 
+                            if { [$dataobj hints type] == "contour" } {
+                                set resultMode "vtkcontour" 
+                            } else {
+                                set resultMode "heightmap"
+                            }
                         } else {
                             set resultMode "vtk"

trunk/gui/scripts/sequenceresult.tcl

@@ -467 +467 @@
                     2D {
                         if { [$dataobj isunirect2d] } {
-                            set mode "heightmap"
+                            if { [$dataobj hints type] == "contour" } {
+                                set mode "vtkcontour" 
+                            } else {
+                                set mode "heightmap"
+                            }
                         } else {
                             set mode "vtk"

trunk/gui/scripts/unirect2d.tcl

@@ -79 +79 @@
         ymin    yaxis.min
         ymax    yaxis.max
+        type    about.type
     } {
         set str [$m get $path]

trunk/gui/scripts/vtkcontourviewer.tcl

@@ -1 +1 @@
 
 # ----------------------------------------------------------------------
-#  COMPONENT: vtkcontourviewer - 3D volume rendering
-#
-#  This widget performs volume rendering on 3D scalar/vector datasets.
-#  It connects to the Nanovis server running on a rendering farm,
+#  COMPONENT: vtkcontourviewer - Contour plot viewer
+#
+#  It connects to the Vtk server running on a rendering farm,
 #  transmits data, and displays the results.
 # ======================================================================
@@ -75 +74 @@
     protected method ReceiveDataset { args }
     protected method ReceiveImage { args }
+    protected method DrawLegend {}
     protected method ReceiveLegend { colormap size }
     protected method Rotate {option x y}
@@ -80 +80 @@
     protected method Zoom {option}
 
+    private method AdjustSelectionRectangle { x y }
+    private method BeginSelectionRectangle { x y }
+    private method EndSelectionRectangle { x y }
+    private method KillSelectionRectangle {}
+    private method MarchingAnts {}
+
     # The following methods are only used by this class.
     private method BuildCameraTab {}
     private method BuildViewTab {}
-    private method BuildColormap { colormap }
+    private method BuildColormap { colormap dataobj comp }
     private method EventuallyResize { w h } 
     private method EventuallyResizeLegend { } 
-    private method SetColormap { dataobj comp }
+    private method SetStyles { dataobj comp }
     private method PanCamera {}
-    private method volume { tag name }
     private method ConvertToVtkData { dataobj comp } 
+    private method GetImage { args } 
+    private method GetVtkData { args } 
+    private method BuildDownloadPopup { widget command } 
 
     private variable _outbuf       ;# buffer for outgoing commands
@@ -100 +108 @@
     private variable _colormaps    ;# contains all the colormaps
                                    ;# in the server.
-    private variable _datasets2style    ;# maps dataobj-component to transfunc
+    private variable _dataset2style    ;# maps dataobj-component to transfunc
     private variable _style2datasets   ;# maps tf back to list of 
                                     # dataobj-components using the tf.
@@ -111 +119 @@
     # defined but not loaded.  If 1 the transfer function has been named
     # and loaded.
-    private variable _activeColormaps
-    private variable _first ""     ;# This is the topmost volume.
+    private variable _first ""     ;# This is the topmost dataset.
     private variable _buffering 0
 
@@ -123 +130 @@
     private variable _resizePending 0
     private variable _resizeLegendPending 0
+    private variable _outline
 }
 
@@ -154 +162 @@
     $_parser alias legend [itcl::code $this ReceiveLegend]
     $_parser alias dataset [itcl::code $this ReceiveDataset]
+
+    array set _outline {
+        id -1
+        afterId -1
+        x1 -1
+        y1 -1
+        x2 -1
+        y2 -1
+    }
 
     # Initialize the view to some default parameters.
@@ -163 +180 @@
         pan-x           0
         pan-y           0
+        zoom-x          1.0
+        zoom-y          1.0
     }
     set _limits(vmin) 0.0
@@ -174 +193 @@
         $this-theta             $_view(theta)
         $this-opacity           1
-        $this-edges             1
         $this-axes              1
         $this-legend            1
         $this-colormap          1
-        $this-wireframe         1
-        $this-polydata          1
+        $this-edges             0
         $this-isolines          1
         $this-zoom              $_view(zoom)
@@ -185 +202 @@
 
     itk_component add view {
-        label $itk_component(plotarea).vol -image $_image(plot) \
+        canvas $itk_component(plotarea).view \
             -highlightthickness 0 -borderwidth 0
     } {
@@ -191 +208 @@
         ignore -highlightthickness -borderwidth  -background
     }
+
+    set c $itk_component(view)
+    bind $c <Configure> [itcl::code $this EventuallyResize %w %h]
+    bind $c <4> [itcl::code $this Zoom in 0.25]
+    bind $c <5> [itcl::code $this Zoom out 0.25]
+    bind $c <KeyPress-Left>  [list %W xview scroll 10 units]
+    bind $c <KeyPress-Right> [list %W xview scroll -10 units]
+    bind $c <KeyPress-Up>    [list %W yview scroll 10 units]
+    bind $c <KeyPress-Down>  [list %W yview scroll -10 units]
+    bind $c <Enter> "focus %W"
+
+    bind $c <ButtonPress-1> [itcl::code $this BeginSelectionRectangle %x %y]
+    bind $c <B1-Motion> [itcl::code $this AdjustSelectionRectangle %x %y]
+    bind $c <ButtonRelease-1> [itcl::code $this EndSelectionRectangle %x %y]
+    # Fix the scrollregion in case we go off screen
+    $c configure -scrollregion [$c bbox all]
+
+    set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
+    set _map(cwidth) -1 
+    set _map(cheight) -1 
+    set _map(zoom) 1.0
+    set _map(original) ""
 
     set f [$itk_component(main) component controls]
@@ -229 +268 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    itk_component add volume {
-        Rappture::PushButton $f.volume \
-            -onimage [Rappture::icon volume-on] \
-            -offimage [Rappture::icon volume-off] \
-            -command [itcl::code $this FixSettings volume] \
-            -variable [itcl::scope _settings($this-volume)]
-    }
-    $itk_component(volume) select
-    Rappture::Tooltip::for $itk_component(volume) \
-        "Toggle the volume cloud on/off"
-    pack $itk_component(volume) -padx 2 -pady 2
-
     BuildViewTab
     BuildCameraTab
@@ -248 +275 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -height 50 -highlightthickness 0
+        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
     } {
         usual
@@ -265 +292 @@
         0,0 $itk_component(view) -fill both -reqwidth $w \
         1,0 $itk_component(legend) -fill x 
-    blt::table configure $itk_component(plotarea) r1 -resize none
-
-    # Bindings for rotation via mouse
-    bind $itk_component(view) <ButtonPress-1> \
-        [itcl::code $this Rotate click %x %y]
-    bind $itk_component(view) <B1-Motion> \
-        [itcl::code $this Rotate drag %x %y]
-    bind $itk_component(view) <ButtonRelease-1> \
-        [itcl::code $this Rotate release %x %y]
+    blt::table $itk_component(plotarea) \
+        0,0 $itk_component(view) -fill both -reqwidth $w \
+        0,1 $itk_component(legend) -fill y 
+    blt::table configure $itk_component(plotarea) c1 -resize none
+
+    if 0 {
     bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
-
+    }
     # Bindings for panning via mouse
     bind $itk_component(view) <ButtonPress-2> \
@@ -339 +363 @@
 }
 
+itcl::body Rappture::VtkContourViewer::DoResize {} {
+    if { $_width < 2 } {
+        set _width 500
+    }
+    if { $_height < 2 } {
+        set _height 500
+    }
+    SendCmd "screen size $_width $_height"
+    SendCmd "camera reset all"
+    if { $_settings($this-legend) } {
+        EventuallyResizeLegend
+    }
+    set _resizePending 0
+}
+
+itcl::body Rappture::VtkContourViewer::EventuallyResize { w h } {
+    set _width $w
+    set _height $h
+    if { !$_resizePending } {
+        $_dispatcher event -after 100 !resize
+        set _resizePending 1
+    }
+}
+
+itcl::body Rappture::VtkContourViewer::EventuallyResizeLegend {} {
+    if { !$_resizeLegendPending } {
+        $_dispatcher event -after 100 !legend
+        set _resizeLegendPending 1
+    }
+}
+
 # ----------------------------------------------------------------------
 # USAGE: add <dataobj> ?<settings>?
@@ -355 +410 @@
         -description ""
         -param ""
+        -type ""
     }
     foreach {opt val} $settings {
@@ -448 +504 @@
             array unset _limits $dataobj*
             array unset _obj2ovride $dataobj-*
-            array unset _dataset2style $dataobj-*
             set changed 1
         }
@@ -514 +569 @@
         }
         controls {
-            # no controls for this download yet
-            return ""
+            set popup .vtkcontourviewerdownload
+            if { ![winfo exists .vtkcontourviewerdownload] } {
+                set inner [BuildDownloadPopup $popup [lindex $args 0]]
+            } else {
+                set inner [$popup component inner]
+            }
+            set _downloadPopup(image_controls) $inner.image_frame
+            set num [llength [get]]
+            set num [expr {($num == 1) ? "1 result" : "$num results"}]
+            set word [Rappture::filexfer::label downloadWord]
+            $inner.summary configure -text "$word $num in the following format:"
+            update idletasks            ;# Fix initial sizes
+            return $popup
         }
         now {
-            # Get the image data (as base64) and decode it back to binary.
-            # This is better than writing to temporary files.  When we switch
-            # to the BLT picture image it won't be necessary to decode the
-            # image data.
-            if { [image width $_image(plot)] > 0 && 
-                 [image height $_image(plot)] > 0 } {
-                set bytes [$_image(plot) data -format "jpeg -quality 100"]
-                set bytes [Rappture::encoding::decode -as b64 $bytes]
-                return [list .jpg $bytes]
+            set popup .vtkcontourviewerdownload
+            if {[winfo exists .vtkcontourviewerdownload]} {
+                $popup deactivate
+            }
+            switch -- $_downloadPopup(format) {
+                "image" {
+                    return [$this GetImage [lindex $args 0]]
+                }
+                "vtk" {
+                    return [$this GetVtkData [lindex $args 0]]
+                }
             }
             return ""
@@ -630 +698 @@
     ReceiveEcho <<line "<read $info(-bytes) bytes"
     if { $info(-type) == "image" } {
-        ReceiveEcho "for [image width $_image(plot)]x[image height $_image(plot)] image>"        
         $_image(plot) configure -data $bytes
+        #puts stderr "received image [image width $_image(plot)]x[image height $_image(plot)] image>"        
     } elseif { $info(type) == "print" } {
         set tag $this-print-$info(-token)
@@ -638 +706 @@
 }
 
-#
-# ReceiveLegend --
-#
-itcl::body Rappture::VtkContourViewer::ReceiveLegend { colormap nBytes } {
-    if { ![isconnected] } {
-        return
-    }
-    set bytes [ReceiveBytes $nBytes]
-    $_image(legend) configure -data $bytes
-    ReceiveEcho <<line "<read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-
+# ----------------------------------------------------------------------
+# USAGE: FixLegend
+#
+# Used internally to update the legend area whenever it changes size
+# or when the field changes.  Asks the server to send a new legend
+# for the current field.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkContourViewer::FixLegend {} {
+    puts stderr "FixLegend _first=$_first"
+    set _resizeLegendPending 0
+    set lineht [font metrics $itk_option(-font) -linespace]
+    set c $itk_component(legend)
+    set w [expr {[winfo height $itk_component(view)]-20}]
+    set h 45
+    puts stderr "in fixlegend w=$w h=$h"
+    if {$w > 0 && $h > 0 && $_first != "" } {
+        set tag [lindex [CurrentDatasets] 0]
+        puts stderr "tag=$tag [info exists _dataset2style($tag)]"
+        if { [info exists _dataset2style($tag)] } {
+            SendCmd "legend $_dataset2style($tag) {} $w $h"
+        }
+    } else {
+        #$itk_component(legend) delete all
+    }
+}
+
+#
+# DrawLegend --
+#
+#       Draws the legend in it's own canvas which resides to the right
+#       of the contour plot area.
+#
+itcl::body Rappture::VtkContourViewer::DrawLegend {} {
     set c $itk_component(legend)
     set w [winfo width $c]
     set h [winfo height $c]
-    set lx 10
-    set ly [expr {$h - 1}]
-    if {"" == [$c find withtag transfunc]} {
-        $c create image 10 10 -anchor nw \
-            -image $_image(legend) -tags transfunc
-        $c create text $lx $ly -anchor sw \
-            -fill $itk_option(-plotforeground) -tags "limits vmin"
-        $c create text [expr {$w-$lx}] $ly -anchor se \
-            -fill $itk_option(-plotforeground) -tags "limits vmax"
-        $c lower transfunc
-    }
-
-    set limits(min) 0 
-    set limits(max) 1.0 
-    $c itemconfigure vmin -text [format %.2g $limits(min)]
-    $c coords vmin $lx $ly
-
-    $c itemconfigure vmax -text [format %.2g $limits(max)]
-    $c coords vmax [expr {$w-$lx}] $ly
+    puts stderr "DrawLegend w=$w h=$h"
+    set lineht [font metrics $itk_option(-font) -linespace]
+    
+    if { $_settings($this-legend) } {
+        if { [$c find withtag "legend"] == "" } {
+            $c create image [expr {$w-2}] [expr {$lineht+2}] -anchor ne \
+                -image $_image(legend) -tags "transfunc legend"
+            $c create text [expr {$w-2}] 2 -anchor ne \
+                -fill $itk_option(-plotforeground) -tags "vmax legend" \
+                -font "Arial 6"
+            $c create text [expr {$w-2}] [expr {$h-2}] -anchor se \
+                -fill $itk_option(-plotforeground) -tags "vmin legend" \
+                -font "Arial 6"
+        }
+        # Reset the item coordinates according the current size of the plot.
+        $c coords transfunc [expr {$w-2}] [expr {$lineht+2}]
+        if { $_limits(vmin) != "" } {
+            $c itemconfigure vmin -text [format %g $_limits(vmin)]
+        }
+        if { $_limits(vmax) != "" } {
+            $c itemconfigure vmax -text [format %g $_limits(vmax)]
+        }
+        $c coords vmin [expr {$w-2}] [expr {$h-2}]
+        $c coords vmax [expr {$w-2}] 2
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: ReceiveLegend <tf> <vmin> <vmax> <size>
+#
+# 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::VtkContourViewer::ReceiveLegend { colormap size} {
+    puts stderr "ReceiveLegend colormap=$colormap size=$size"
+    if { [IsConnected] } {
+        set bytes [ReceiveBytes $size]
+        if { ![info exists _image(legend)] } {
+            set _image(legend) [image create photo]
+        }
+        puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
+        set src [image create photo -data $bytes]
+        blt::winop image rotate $src $_image(legend) 90
+        set dst $_image(legend)
+        DrawLegend
+    }
 }
 
@@ -719 +837 @@
     EventuallyResize $w $h
     
+    set _limits(vmin) ""
+    set _limits(vmax) ""
     foreach dataobj [get] {
         foreach comp [$dataobj components] {
@@ -728 +848 @@
                 append _outbuf $bytes
                 append _outbuf "pseudocolor add $tag\n"
-                append _outbuf "contour2d add numcontours 10 $tag\n"
-                append _outbuf "polydata add $tag\n"
-                #SetColormap $dataobj $comp
+                append _outbuf "pseudocolor colormap default $tag\n"
+                SetStyles $dataobj $comp
                 set _datasets($tag) 1
-            }
+                foreach {min max} [$dataobj limits z] break
+                if { ($_limits(vmin) == "") || ($min < $_limits(vmin)) } {
+                    set _limits(vmin) $min
+                }
+                if { ($_limits(vmax) == "") || ($max < $_limits(vmax)) } {
+                    set _limits(vmax) $max
+                }
+            }
         }
     }
@@ -747 +873 @@
 
     set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
-    SendCmd "camera rotate $xyz"
+    #SendCmd "camera rotate $xyz"
     PanCamera
+    SendCmd "camera mode image"
     SendCmd "camera zoom $_view(zoom)"
-    FixSettings edges
     FixSettings opacity
     FixSettings isolines
-    FixSettings polydata
     FixSettings colormap
     FixSettings axes
-    FixSettings wireframe
+    FixSettings edges
 
     # Nothing to send -- activate the proper ivol
@@ -770 +895 @@
         foreach tag [array names _datasets $_first-*]  {
             SendCmd "dataset visible 1 $tag"
-        }
-    }
-    # If the first volume already exists on the server, then make sure we
+            SendCmd "pseudocolor opacity 1.0 $tag"
+        }
+    }
+
+    FixLegend 
+
+    # If the first dataset already exists on the server, then make sure we
     # display the proper transfer function in the legend.
     set comp [lindex [$_first components] 0]
@@ -834 +963 @@
                 pan-x   0
                 pan-y   0
+                zoom-x  1.0
+                zoom-y  1.0
             }
             if { $_first != "" } {
@@ -842 +973 @@
             }
             set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
-            SendCmd "camera rotate $xyz"
+            #SendCmd "camera rotate $xyz"
             PanCamera
             set _settings($this-theta) $_view(theta)
@@ -850 +981 @@
             set _settings($this-pan-y) $_view(pan-y)
             set _settings($this-zoom)  $_view(zoom)
-            SendCmd "camera reset"
+            SendCmd "camera reset all"
         }
     }
@@ -860 +991 @@
     set x $_view(pan-x)
     set y $_view(pan-y)
-    SendCmd "camera pan $x $y"
+    #SendCmd "camera pan $x $y"
 }
 
@@ -929 +1060 @@
                 set _settings($this-phi)   $_view(phi)
                 set _settings($this-psi)   $_view(psi)
-                SendCmd "camera rotate $xyz"
+                #SendCmd "camera rotate $xyz"
                 set _click(x) $x
                 set _click(y) $y
@@ -958 +1089 @@
     set h [winfo height $itk_component(view)]
     if { $option == "set" } {
-        set x [expr $x / double($w)]
-        set y [expr $y / double($h)]
+        set x [expr (($w - $x) / double($w))]
+        set y [expr (($h - $y) / double($h))]
         set _view(pan-x) [expr $_view(pan-x) + $x]
         set _view(pan-y) [expr $_view(pan-y) + $y]
@@ -1002 +1133 @@
                 set sval [expr { 0.01 * double($val) }]
                 foreach dataset [CurrentDatasets] {
-                    SendCmd "dataset opacity $sval $dataset"
+                    SendCmd "pseudocolor opacity $sval $dataset"
                 }
             }
@@ -1014 +1145 @@
             }
         }
-        "wireframe" {
-            if {[isconnected]} {
-                set bool $_settings($this-wireframe)
-                foreach dataset [CurrentDatasets] {
-                    SendCmd "polydata wireframe $bool $dataset"
-                }
-            }
-        }
         "edges" {
             if {[isconnected]} {
                 set bool $_settings($this-edges)
                 foreach dataset [CurrentDatasets] {
-                    SendCmd "polydata edges $bool $dataset"
+                    SendCmd "pseudocolor edges $bool $dataset"
                 }
             }
@@ -1032 +1155 @@
         "colormap" {
             if {[isconnected]} {
-                set bool $_settings($this-polydata)
+                set bool $_settings($this-colormap)
+                if { $bool } {
+                    set linecolor "0.0 0.0 0.0"
+                    set opacity 0.0
+                } else {
+                    set linecolor "1.0 1.0 1.0"
+                    set opacity 1.0
+                }
                 foreach dataset [CurrentDatasets] {
                     SendCmd "pseudocolor visible $bool $dataset"
+                    SendCmd "contour2d linecolor $linecolor $dataset"
+                    SendCmd "pseudocolor linecolor $linecolor $dataset"
                 }
             }
@@ -1045 +1177 @@
         }
         "legend" {
-        }
-        "polydata" {
-            if {[isconnected]} {
-                set bool $_settings($this-polydata)
-                foreach dataset [CurrentDatasets] {
-                    SendCmd "polydata visible $bool $dataset"
-                }
+            if { $_settings($this-legend) } {
+                blt::table $itk_component(plotarea) \
+                    0,0 $itk_component(view) -fill both \
+                    0,1 $itk_component(legend) -fill y 
+                blt::table configure $itk_component(plotarea) c1 -resize none
+            } else {
+                blt::table forget $itk_component(legend)
             }
         }
@@ -1060 +1192 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: FixLegend
-#
-# Used internally to update the legend area whenever it changes size
-# or when the field changes.  Asks the server to send a new legend
-# for the current field.
-# ----------------------------------------------------------------------
-itcl::body Rappture::VtkContourViewer::FixLegend {} {
-    set _resizeLegendPending 0
-    set lineht [font metrics $itk_option(-font) -linespace]
-    set w [expr {$_width-20}]
-    set h [expr {[winfo height $itk_component(legend)]-20-$lineht}]
-    if {$w > 0 && $h > 0 && [array names _activeColormaps] > 0 && 
-        $_first != "" } {
-        set tag [lindex [CurrentDatasets] 0]
-        if { [info exists _dataset2style($tag)] } {
-            SendCmd "legend $_dataset2style($tag) $w $h"
-        }
-    } else {
-        #$itk_component(legend) delete all
-    }
-}
-
-#
-# SetColormap --
-#
-itcl::body Rappture::VtkContourViewer::SetColormap { dataobj comp } {
+
+#
+# SetStyles --
+#
+itcl::body Rappture::VtkContourViewer::SetStyles { dataobj comp } {
     array set style {
         -color rainbow
@@ -1095 +1205 @@
     array set style [lindex [$dataobj components -style $comp] 0]
     set colormap "$style(-color):$style(-levels):$style(-opacity)"
-    if { ![info exists _colormaps($colormap)] } {
+    if { [info exists _colormaps($colormap)] } {
+        puts stderr "Colormap $colormap already built"
+    }
+    if { ![info exists _dataset2style($tag)] } {
         set _dataset2style($tag) $colormap
         lappend _style2datasets($colormap) $tag
-        BuildColormap $colormap
+    }
+    if { ![info exists _colormaps($colormap)] } {
+        # Build the pseudo colormap if it doesn't exist.
+        BuildColormap $colormap $dataobj $comp
         set _colormaps($colormap) 1
     }
+    SendCmd "contour2d add numcontours $style(-levels) $tag\n"
     SendCmd "pseudocolor colormap $colormap $tag"
     return $colormap
@@ -1108 +1225 @@
 # BuildColormap --
 #
-#   Computes and sends the transfer function to the render server.  It's
-#   assumed that the volume data limits are known and that the global
-#   transfer-functions slider values have be setup.  Both parts are
-#   needed to compute the relative value (location) of the marker, and
-#   the alpha map of the transfer function.
-#
-itcl::body Rappture::VtkContourViewer::BuildColormap { colormap } {
+itcl::body Rappture::VtkContourViewer::BuildColormap { colormap dataobj comp } {
+    puts stderr "BuildColormap $colormap"
     array set style {
         -color rainbow
@@ -1120 +1232 @@
         -opacity 1.0
     }
-    foreach {dataobj comp} [split $_style2datasets($colormap) -] break
     array set style [lindex [$dataobj components -style $comp] 0]
 
@@ -1127 +1238 @@
     }
     set clist [split $style(-color) :]
-    set cmap "0.0 [Color2RGB white] "
+    set cmap {}
     for {set i 0} {$i < [llength $clist]} {incr i} {
-        set x [expr {double($i+1)/([llength $clist]+1)}]
+        set x [expr {double($i)/([llength $clist]-1)}]
         set color [lindex $clist $i]
         append cmap "$x [Color2RGB $color] "
     }
-    append cmap "1.0 [Color2RGB $color]"
-
+    if { [llength $cmap] == 0 } {
+        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
+    }
     set tag $this-$colormap
     if { ![info exists _settings($tag-opacity)] } {
@@ -1141 +1253 @@
     set max $_settings($tag-opacity)
 
-    set wmap ""
+    set wmap "0.0 1.0 1.0 1.0"
     SendCmd "colormap add $colormap { $cmap } { $wmap }"
 }
@@ -1225 +1337 @@
         -font "Arial 9"
 
-    checkbutton $inner.edges \
-        -text "Outline" \
-        -variable [itcl::scope _settings($this-edges)] \
-        -command [itcl::code $this FixSettings edges] \
-        -font "Arial 9"
-
     checkbutton $inner.legend \
         -text "Legend" \
@@ -1237 +1343 @@
         -font "Arial 9"
 
-    checkbutton $inner.polydata \
-        -text "Polydata" \
-        -variable [itcl::scope _settings($this-polydata)] \
-        -command [itcl::code $this FixSettings polydata] \
-        -font "Arial 9"
-
-    checkbutton $inner.wireframe \
-        -text "Wireframe" \
-        -variable [itcl::scope _settings($this-wireframe)] \
-        -command [itcl::code $this FixSettings wireframe] \
+    checkbutton $inner.edges \
+        -text "Edges" \
+        -variable [itcl::scope _settings($this-edges)] \
+        -command [itcl::code $this FixSettings edges] \
         -font "Arial 9"
 
@@ -1259 +1359 @@
         0,0 $inner.axes -columnspan 4 -anchor w -pady 2 \
         1,0 $inner.colormap -columnspan 4 -anchor w -pady 2 \
-        2,0 $inner.edges -columnspan 4 -anchor w -pady 2 \
         3,0 $inner.isolines -columnspan 4 -anchor w -pady 2 \
         4,0 $inner.legend  -columnspan 4 -anchor w \
-        5,0 $inner.polydata -columnspan 4 -anchor w -pady 2 \
-        6,0 $inner.wireframe -columnspan 4 -anchor w -pady 2 \
+        6,0 $inner.edges -columnspan 4 -anchor w -pady 2 \
         7,0 $inner.clear -anchor e -pady 2 \
         7,1 $inner.opacity -columnspan 2 -pady 2 -fill x\
@@ -1298 +1396 @@
 
 
-itcl::body Rappture::VtkContourViewer::DoResize {} {
-    if { $_width < 2 } {
-        set _width 500
-    }
-    if { $_height < 2 } {
-        set _height 500
-    }
-    #SendCmd "screen size $_width $_height"
-    set _resizePending 0
-}
-
-itcl::body Rappture::VtkContourViewer::EventuallyResize { w h } {
-    set _width $w
-    set _height $h
-    if { !$_resizePending } {
-        $_dispatcher event -idle !resize
-        set _resizePending 1
-    }
-}
-
-itcl::body Rappture::VtkContourViewer::EventuallyResizeLegend {} {
-    if { !$_resizeLegendPending } {
-        $_dispatcher event -idle !legend
-        set _resizeLegendPending 1
-    }
-}
-
 #
 #  camera -- 
@@ -1349 +1420 @@
                     set _view($who) $_settings($this-$who)
                     set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
-                    SendCmd "camera rotate $xyz"
+                    #SendCmd "camera rotate $xyz"
                 }
                 "zoom" {
                     set _view($who) $_settings($this-$who)
-                    SendCmd "camera zoom $_view(zoom)"
+                    #SendCmd "camera zoom $_view(zoom)"
                 }
             }
         }
     }
-}
-
-itcl::body Rappture::VtkContourViewer::volume { tag name } {
-    set bool $_settings($this-dataset-$name)
-    SendCmd "dataset visible $bool $tag"
 }
 
@@ -1382 +1448 @@
     return $out
 }
+
+#
+# MarchingAnts --
+#
+#       Called from "after" timer events.  This routine is changes
+#       the dash offset of the selection outline rectangle to simulate
+#       marching ants.
+#
+itcl::body Rappture::VtkContourViewer::MarchingAnts {} {
+    set c $itk_component(view) 
+    if { [winfo exists $c] && ![winfo viewable $c] } { 
+        KillSelectionRectangle
+        return
+    }
+    $c itemconfigure $_outline(id) -dashoffset $_outline(offset)
+    incr _outline(offset) 
+    set _outline(afterId) [after 100 [itcl::code $this MarchingAnts]]
+}
+
+#
+# BeginSelectionRectangle --
+#
+#       Called from ButtonPress-1 events.  This routine creates the
+#       the selection outline rectangle.  It also clears the selection 
+#       in the sensor tree.
+#
+itcl::body Rappture::VtkContourViewer::BeginSelectionRectangle { x y } {
+    set c $itk_component(view)
+    set x [$c canvasx $x]
+    set y [$c canvasy $y]
+    if { $_outline(id) >= 0 } {
+        after cancel $_outline(afterId)
+        set _outline(afterId) -1
+        $c delete $_outline(id)
+        set _outline(id) -1
+    }
+    set _outline(offset) 0
+    set _outline(x1) $x
+    set _outline(y1) $y
+    set _outline(id) \
+        [$c create line $x $y $x $y -dash "4 4" -width 2 -fill black]
+    MarchingAnts 
+}
+
+#
+# AdjustSelectionRectangle --
+#
+#       Called from B1-Motion events.  This routine redraws the selection
+#       outline rectangle and redraws the sensors using the "selected"
+#       icon.
+#
+itcl::body Rappture::VtkContourViewer::AdjustSelectionRectangle { x y } {
+    set c $itk_component(view)
+    set x [$c canvasx $x]
+    set y [$c canvasy $y]
+    $c coords $_outline(id) $_outline(x1) $_outline(y1) $_outline(x1) $y \
+        $x $y $x $_outline(y1) $_outline(x1) $_outline(y1)
+    set _outline(x2) $x
+    set _outline(y2) $y
+}
+
+#
+# KillSelectionRectangle --
+#
+#       Removes the outline rectangle and adjusts the sensor icon
+#       according to the sensor's selected/deselected status.
+#
+itcl::body Rappture::VtkContourViewer::KillSelectionRectangle { } {
+    after cancel $_outline(afterId)
+    set _outline(afterId) -1
+    set c $itk_component(view) 
+    $c delete $_outline(id)
+    set _outline(id) -1
+}
+
+#
+# EndSelectionRectangle --
+#
+#       Called from the ButtonRelease event to finish the outline of the
+#       selection rectangle.  If the outline is too small (less than 10
+#       pixels in length or width) the outline is removed and the selection
+#       is ignored.  Otherwise a popup menu is automatically generated and
+#       displayed.
+#
+itcl::body Rappture::VtkContourViewer::EndSelectionRectangle { x y } {
+    set c $itk_component(view)
+    AdjustSelectionRectangle $x $y
+    set cx [$c canvasx $x]
+    set cy [$c canvasy $y]
+    set cw [winfo width $c]
+    set ch [winfo height $c]
+    if { abs($_outline(x1) - $cx) < 10 && abs($_outline(y1) - $cy) < 10 }  {
+        KillSelectionRectangle
+    } else {
+        set w [expr $_outline(x2) - $_outline(x1)]
+        set h [expr $_outline(y2) - $_outline(y1)]
+        # Convert the zoom 
+        set _view(zoom-x) [expr $cw / $w * $_view(zoom-x)]
+        set _view(zoom-y) [expr $ch / $h * $_view(zoom-y)]
+        set w [expr $w * $_view(zoom-x)]
+        set h [expr $h * $_view(zoom-y)]
+        SendCmd "camera ortho $_outline(x1) $_outline(y1) $w $h"
+        KillSelectionRectangle
+    }
+}
+
+itcl::body Rappture::VtkContourViewer::GetVtkData { args } {
+    set bytes ""
+    foreach dataobj [get] {
+        foreach comp [$dataobj components] {
+            set tag $dataobj-$comp
+            set contents [ConvertToVtkData $dataobj $comp]
+            append bytes "$contents\n\n"
+        }
+    }
+    return [list .txt $bytes]
+}
+
+itcl::body Rappture::VtkContourViewer::GetImage { args } {
+    if { [image width $_image(download)] > 0 && 
+         [image height $_image(download)] > 0 } {
+        set bytes [$_image(download) data -format "jpeg -quality 100"]
+        set bytes [Rappture::encoding::decode -as b64 $bytes]
+        return [list .jpg $bytes]
+    }
+    return ""
+}
+
+itcl::body Rappture::VtkContourViewer::BuildDownloadPopup { popup command } {
+    Rappture::Balloon $popup \
+        -title "[Rappture::filexfer::label downloadWord] as..."
+    set inner [$popup component inner]
+    label $inner.summary -text "" -anchor w 
+    radiobutton $inner.vtk_button -text "VTK data file" \
+        -variable [itcl::scope _downloadPopup(format)] \
+        -font "Helvetica 9 " \
+        -value vtk  
+    Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
+    radiobutton $inner.image_button -text "Image File" \
+        -variable [itcl::scope _downloadPopup(format)] \
+        -value image 
+    Rappture::Tooltip::for $inner.image_button \
+        "Save as digital image."
+
+    button $inner.ok -text "Save" \
+        -highlightthickness 0 -pady 2 -padx 3 \
+        -command $command \
+        -compound left \
+        -image [Rappture::icon download]
+
+    button $inner.cancel -text "Cancel" \
+        -highlightthickness 0 -pady 2 -padx 3 \
+        -command [list $popup deactivate] \
+        -compound left \
+        -image [Rappture::icon cancel]
+
+    blt::table $inner \
+        0,0 $inner.summary -cspan 2  \
+        1,0 $inner.vtk_button -anchor w -cspan 2 -padx { 4 0 } \
+        2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
+        4,1 $inner.cancel -width .9i -fill y \
+        4,0 $inner.ok -padx 2 -width .9i -fill y 
+    blt::table configure $inner r3 -height 4
+    blt::table configure $inner r4 -pady 4
+    raise $inner.image_button
+    $inner.vtk_button invoke
+    return $inner
+}
+