Changeset 4798

Timestamp:

Nov 26, 2014, 7:28:23 PM (10 years ago)

Author:

gah

Message:

sync with former 1.3 branch

Location:

branches/uq

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (2 diffs)
• gui/configure (modified) (8 diffs)
• gui/configure.in (modified) (1 diff)
• gui/scripts/mapviewer.tcl (modified) (2 diffs)
• gui/scripts/mesh.tcl (modified) (13 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (14 diffs)
• gui/scripts/vtkglyphviewer.tcl (modified) (5 diffs)
• gui/scripts/vtkheightmapviewer.tcl (modified) (4 diffs)
• gui/scripts/vtkimageviewer.tcl (modified) (4 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (13 diffs)
• gui/scripts/vtkmeshviewer.tcl (modified) (17 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (2 diffs)
• gui/scripts/vtksurfaceviewer.tcl (modified) (7 diffs)
• gui/scripts/vtkviewer.tcl (modified) (3 diffs)
• gui/src/RpPdbToVtk.c (modified) (2 diffs)
• lang/tcl/pkgIndex.tcl.in (modified) (1 diff)
• src/core/RpEncode.cc (modified) (1 diff)

branches/uq/configure

@@ -672 +672 @@
 OCTAVE_VERSION_MAJOR
 OCTAVE_VERSION
-SVN_URL
 SVN_VERSION
 MKOCTFILE3
@@ -7298 +7297 @@
 
 SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
-SVN_URL=`svn info $srcdir | sed -ne 's/^URL: //p'`
 
 make_command=""
@@ -10137 +10135 @@
 
 MAKE=${make_command}
-
 
 

branches/uq/configure.in

@@ -108 +108 @@
 
 SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
-SVN_URL=`svn info $srcdir | sed -ne 's/^URL: //p'`
 
 make_command=""
@@ -402 +401 @@
 AC_SUBST(MKOCTFILE3)
 AC_SUBST(SVN_VERSION)
-AC_SUBST(SVN_URL)
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_VERSION_MAJOR)

branches/uq/gui/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for RapptureGUI 1.3.
+# Generated by GNU Autoconf 2.69 for RapptureGUI 1.4.
 #
 # Report bugs to <rappture@nanohub.org>.
@@ -580 +580 @@
 PACKAGE_NAME='RapptureGUI'
 PACKAGE_TARNAME='rappturegui'
-PACKAGE_VERSION='1.3'
-PACKAGE_STRING='RapptureGUI 1.3'
+PACKAGE_VERSION='1.4'
+PACKAGE_STRING='RapptureGUI 1.4'
 PACKAGE_BUGREPORT='rappture@nanohub.org'
 PACKAGE_URL=''
@@ -1223 +1223 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RapptureGUI 1.3 to adapt to many kinds of systems.
+\`configure' configures RapptureGUI 1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1289 +1289 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RapptureGUI 1.3:";;
+     short | recursive ) echo "Configuration of RapptureGUI 1.4:";;
    esac
   cat <<\_ACEOF
@@ -1380 +1380 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-RapptureGUI configure 1.3
+RapptureGUI configure 1.4
 generated by GNU Autoconf 2.69
 
@@ -1435 +1435 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RapptureGUI $as_me 1.3, which was
+It was created by RapptureGUI $as_me 1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3685 +3685 @@
 # values after options handling.
 ac_log="
-This file was extended by RapptureGUI $as_me 1.3, which was
+This file was extended by RapptureGUI $as_me 1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3738 +3738 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-RapptureGUI config.status 1.3
+RapptureGUI config.status 1.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

branches/uq/gui/configure.in

@@ -1 +1 @@
 
-AC_INIT([RapptureGUI],[1.3],[rappture@nanohub.org])
+AC_INIT([RapptureGUI],[1.4],[rappture@nanohub.org])
 AC_CONFIG_AUX_DIR(cf)
 #------------------------------------------------------------------------

branches/uq/gui/scripts/mapviewer.tcl

@@ -60 +60 @@
     public method get {args}
     public method isconnected {}
+    public method limits { colormap }
     public method parameters {title args} { 
         # do nothing 
@@ -1388 +1389 @@
         #SendCmd "color background $r $g $b"
     }
+}
+
+itcl::body Rappture::MapViewer::limits { dataobj } {
+    error "no limits"
 }
 

branches/uq/gui/scripts/mesh.tcl

@@ -33 +33 @@
                                         # xmin, xmax, ymin, ymax, ...
     private variable _numPoints 0   ;   # # of points in mesh
-    private variable _numCells 0   ;    # # of cells in mesh
+    private variable _numCells 0;       # # of cells in mesh
     private variable _vtkdata "";       # Mesh in vtk file format.
     private variable _isValid 0;        # Indicates if the mesh is valid.
@@ -76 +76 @@
     
     private method ReadNodesElements {path}
+    private method GetCellCount { xNum yNum zNum } 
     private method GetDimension { path } 
     private method GetDouble { path } 
@@ -499 +500 @@
 }
 
+itcl::body Rappture::Mesh::GetCellCount { xNum yNum zNum } {
+    set numCells 1
+    if { $xNum > 0 } {
+        set numCells [expr $numCells * $xNum]
+    }
+    if { $yNum > 0 } {
+        set numCells [expr $numCells * $yNum]
+    }
+    if { $zNum > 0 } {
+        set numCells [expr $numCells * $zNum]
+    }
+    return $numCells
+}
+
 itcl::body Rappture::Mesh::ReadGrid { path } {
     set _type "grid"
@@ -519 +534 @@
             set ${axis}Num $num
             if {$min > $max} {
-                puts stderr "ERROR: grid $axis axis minimum larger than maximum"
+                puts stderr "ERROR: grid $axis min can't be greater than max"
                 return 0
             }
@@ -561 +576 @@
             set _dim 3
             set _numPoints [expr $xNum * $yNum * $zNum]
-            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
-            if { ($_numPoints*3) != $numCoords } {
+            set _numCells [GetCellCount $xNum $yNum $zNum]
+            if { ($_numPoints * 3) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": invalid grid: \# of points does not match dimensions <xdim> * <ydim> * <zdim>"
                 return 0
@@ -584 +599 @@
             set _dim 2
             set _numPoints [expr $xNum * $yNum]
-            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
-            if { ($_numPoints*2) != $numCoords } {
+            set _numCells [GetCellCount $xNum $yNum 0]
+            if { ($_numPoints * 2) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": \# of points does not match dimensions <xdim> * <ydim>"
                 return 0
@@ -609 +624 @@
             set _dim 1
             set _numPoints $xNum
-            set _numCells [expr $xNum - 1]
+            set _numCells [GetCellCount $xNum 0 0]
             if { $_numPoints != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": \# of points does not match <xdim>"
@@ -634 +649 @@
         # This results in a STRUCTURED_POINTS
         if { $_dim == 1 } {
-            if {$xNum == 1} {
-                set xSpace 0
-            } else {
-                set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
+            set xSpacing 0
+            if { $xNum > 1 } {
+                set xSpacing [expr ($xMax - $xMin) / double($xNum - 1)]
             }
             set _numPoints $xNum
-            set _numCells [expr $xNum - 1]
+            set _numCells [GetCellCount $xNum 0 0]
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum 1 1\n"
             append out "ORIGIN $xMin 0 0\n"
-            append out "SPACING $xSpace 0 0\n"
+            append out "SPACING $xSpacing 0 0\n"
             set _vtkdata $out
             set _limits(x) [list $xMin $xMax]
@@ -650 +664 @@
             set _limits(z) [list 0 0]
         } elseif { $_dim == 2 } {
-            if {$xNum == 1} {
-                set xSpace 0
-            } else {
-                set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
-            }
-            if {$yNum == 1} {
-                set ySpace 0
-            } else {
-                set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
+            set xSpacing 0 
+            set ySpacing 0
+            if { $xNum > 1 } {
+                set xSpacing [expr ($xMax - $xMin) / double($xNum - 1)]
+            }
+            if { $yNum > 1 } {
+                set ySpacing [expr ($yMax - $yMin) / double($yNum - 1)]
             }
             set _numPoints [expr $xNum * $yNum]
-            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
+            set _numCells [GetCellCount $xNum $yNum 0]
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum $yNum 1\n"
             append out "ORIGIN $xMin $yMin 0\n"
-            append out "SPACING $xSpace $ySpace 0\n"
+            append out "SPACING $xSpacing $ySpacing 0\n"
             set _vtkdata $out
             foreach axis {x y} {
@@ -672 +684 @@
             set _limits(z) [list 0 0]
         } elseif { $_dim == 3 } {
-            if {$xNum == 1} {
-                set xSpace 0
-            } else {
-                set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
-            }
-            if {$yNum == 1} {
-                set ySpace 0
-            } else {
-                set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
-            }
-            if {$zNum == 1} {
-                set zSpace 0
-            } else {
-                set zSpace [expr ($zMax - $zMin) / double($zNum - 1)]
+            set xSpacing 0
+            set ySpacing 0
+            set zSpacing 0
+            if {$xNum > 1} {
+                set xSpacing [expr ($xMax - $xMin) / double($xNum - 1)]
+            }
+            if {$yNum > 1} {
+                set ySpacing [expr ($yMax - $yMin) / double($yNum - 1)]
+            }
+            if {$zNum > 1} {
+                set zSpacing [expr ($zMax - $zMin) / double($zNum - 1)]
             }
             set _numPoints [expr $xNum * $yNum * $zNum]
-            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
+            set _numCells [GetCellCount $xNum $yNum $zNum]
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum $yNum $zNum\n"
             append out "ORIGIN $xMin $yMin $zMin\n"
-            append out "SPACING $xSpace $ySpace $zSpace\n"
+            append out "SPACING $xSpacing $ySpacing $zSpacing\n"
             set _vtkdata $out
             foreach axis {x y z} {
@@ -741 +750 @@
     if { $_dim == 3 } {
         set _numPoints [expr $xNum * $yNum * $zNum]
-        set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
+        set _numCells [GetCellCount $xNum $yNum $zNum]
         append out "DATASET RECTILINEAR_GRID\n"
         append out "DIMENSIONS $xNum $yNum $zNum\n"
@@ -761 +770 @@
     } elseif { $_dim == 2 } {
         set _numPoints [expr $xNum * $yNum]
-        set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
+        set _numCells [GetCellCount $xNum $yNum 0]
         append out "DATASET RECTILINEAR_GRID\n"
         append out "DIMENSIONS $xNum $yNum 1\n"
@@ -781 +790 @@
     } elseif { $_dim == 1 } {
         set _numPoints $xNum
-        set _numCells [expr $xNum - 1]
+        set _numCells [GetCellCount $xNum 0 0]
         append out "DATASET RECTILINEAR_GRID\n"
         append out "DIMENSIONS $xNum 1 1\n"

branches/uq/gui/scripts/nanovisviewer.tcl

@@ -150 +150 @@
     private variable _transferFunctionEditors
     private variable _settings
+    private variable _alphamap
     private variable _widget
 
@@ -1317 +1318 @@
             set _settings($what) [expr $_widget($what) * 0.01]
             set _settings($_current${what}) $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading opacity $_settings($what) $tag"
-            }
+        
+            foreach {cmap wmap} $_cname2transferFunction($_current) break
+            set wmap [ComputeAlphamap $_current]
+            set _cname2transferFunction($_current) [list $cmap $wmap]
+            SendCmd [list transfunc define $_current $cmap $wmap]
         }
         "-volumevisible" {
@@ -1686 +1689 @@
     $inner configure -borderwidth 4
 
+    set font [option get $itk_component(hull) font Font]
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
 
+    checkbutton $inner.vol -text "Show volume" -font $fg \
+        -variable [itcl::scope _settings(-volumevisible)] \
+        -command [itcl::code $this AdjustSetting -volumevisible]
     label $inner.shading -text "Shading:" -font $fg
 
@@ -1694 +1701 @@
         -variable [itcl::scope _settings(-light2side)] \
         -command [itcl::code $this AdjustSetting -light2side]
-
-    checkbutton $inner.visibility -text "Visible" -font $fg \
-        -variable [itcl::scope _settings(-volumevisible)] \
-        -command [itcl::code $this AdjustSetting -volumevisible]
 
     label $inner.dim -text "Glow" -font $fg
@@ -1723 +1726 @@
 
     # Colormap 
-    label $inner.colormap_l -text "Colormap" -font $fg
+    label $inner.colormap_l -text "Colormap" -font "Arial 9" 
     itk_component add colormap {
         Rappture::Combobox $inner.colormap -width 10 -editable no
@@ -1735 +1738 @@
 
     # Component
-    label $inner.volcomponents_l -text "Component" -font $fg
+    label $inner.volcomponents_l -text "Component" -font $font
     itk_component add volcomponents {
         Rappture::Combobox $inner.volcomponents -editable no
@@ -1747 +1750 @@
         1,0 $inner.shading -cspan 4 -anchor w -pady {10 2} \
         2,0 $inner.light2side -cspan 4 -anchor w -pady 2 \
-        3,0 $inner.visibility -cspan 4 -anchor w -pady 2 \
-        4,0 $inner.dim -anchor e -pady 2 \
-        4,1 $inner.light -cspan 2 -pady 2 -fill x \
-        4,3 $inner.bright -anchor w -pady 2 \
-        5,0 $inner.fog -anchor e -pady 2 \
-        5,1 $inner.transp -cspan 2 -pady 2 -fill x \
-        5,3 $inner.plastic -anchor w -pady 2 \
-        6,0 $inner.thin -anchor e -pady 2 \
-        6,1 $inner.thickness -cspan 2 -pady 2 -fill x\
-        6,3 $inner.thick -anchor w -pady 2
+        3,0 $inner.dim -anchor e -pady 2 \
+        3,1 $inner.light -cspan 2 -pady 2 -fill x \
+        3,3 $inner.bright -anchor w -pady 2 \
+        4,0 $inner.fog -anchor e -pady 2 \
+        4,1 $inner.transp -cspan 2 -pady 2 -fill x \
+        4,3 $inner.plastic -anchor w -pady 2 \
+        5,0 $inner.thin -anchor e -pady 2 \
+        5,1 $inner.thickness -cspan 2 -pady 2 -fill x\
+        5,3 $inner.thick -anchor w -pady 2
 
     blt::table configure $inner c0 c1 c3 r* -resize none
-    blt::table configure $inner r7 -resize expand
+    blt::table configure $inner r6 -resize expand
 }
 
@@ -1773 +1775 @@
         -command [itcl::code $this AdjustSetting -cutplanesvisible] \
         -font "Arial 9"
-
+    
     # X-value slicer...
     itk_component add xCutButton {
@@ -1858 +1860 @@
 
     blt::table $inner \
-        0,1 $inner.visible              -anchor w -pady 2 -cspan 4 \
-        1,1 $itk_component(xCutScale) \
-        1,2 $itk_component(yCutScale) \
-        1,3 $itk_component(zCutScale) \
-        2,1 $itk_component(xCutButton) \
-        2,2 $itk_component(yCutButton) \
-        2,3 $itk_component(zCutButton)
-
-    blt::table configure $inner r0 r1 r2 c* -resize none
-    blt::table configure $inner r3 c4 -resize expand
+        1,1 $itk_component(xCutButton) \
+        1,2 $itk_component(yCutButton) \
+        1,3 $itk_component(zCutButton) \
+        0,1 $itk_component(xCutScale) \
+        0,2 $itk_component(yCutScale) \
+        0,3 $itk_component(zCutScale) 
+
+    blt::table configure $inner r0 r1 c* -resize none
+    blt::table configure $inner r2 c4 -resize expand
     blt::table configure $inner c0 -width 2
     blt::table configure $inner c1 c2 c3 -padx 2
@@ -2180 +2181 @@
 # GetDatasetsWithComponents --
 #
-#    Returns a list of all the datasets (known by the combination of their
-#    data object and component name) that match the given component name.
-#    For example, this is used where we want to change the settings of
-#    volumes that have the current component.
+#     Returns a list of all the datasets (known by the combination of their
+#     data object and component name) that match the given component name.
+#     For example, this is used where we want to change the settings of
+#     volumes that have the current component.
 #
 itcl::body Rappture::NanovisViewer::GetDatasetsWithComponent { cname } { 
@@ -2202 +2203 @@
 # HideAllMarkers --
 #
-#    Hide all the markers in all the transfer functions.  Can't simply
-#    delete and recreate markers from the <style> since the user may have
-#    created, deleted, or moved markers.
+#   Hide all the markers in all the transfer functions.  Can't simply
+#   delete and recreate markers from the <style> since the user may have
+#   create, deleted, or moved markers.
 #
 itcl::body Rappture::NanovisViewer::HideAllMarkers {} { 
@@ -2248 +2249 @@
     set isovalues [$_transferFunctionEditors($cname) values]
 
-    # Transfer function should be normalized with [0,1] range
-    # The volume shading opacity setting is used to scale opacity
-    # in the volume shader. 
-    set max 1.0
+    # Currently using volume shading opacity to scale opacity in
+    # the volume shader. 
+    set max $_settings($cname-volumeopacity)
 
     # Use the component-wise thickness setting from the slider
@@ -2300 +2300 @@
     return $wmap
 }
+
 
 itcl::body Rappture::NanovisViewer::NameToAlphamap { name } {
@@ -2471 +2472 @@
 itcl::body Rappture::NanovisViewer::SetObjectStyle { dataobj cname } {
     array set styles {
-        -opacity  0.5
+        -opacity  0.6
     }
     array set styles [lindex [$dataobj components -style $cname] 0]
     set _settings($cname-volumeopacity) $styles(-opacity)
-    set tag $dataobj-$cname
-    SendCmd "volume shading opacity $_settings($cname-volumeopacity) $tag"
     NameTransferFunction $dataobj $cname
 }

branches/uq/gui/scripts/vtkglyphviewer.tcl

@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
+    public method limits { colormap }
     public method parameters {title args} { 
         # do nothing 
@@ -143 +144 @@
     private variable _legendPending 0
     private variable _field      ""
-    private variable _colorMode "vmag"; #  Mode of colormap (vmag or scalar)
+    private variable _colorMode "vmag"; #  Mode of colormap (vmag or scalar)
     private variable _fieldNames {} 
     private variable _fields 
@@ -955 +956 @@
         InitSettings -xgrid -ygrid -zgrid -axismode \
             -axesvisible -axislabels -axisminorticks
-        #SendCmd "axis lformat all %g"
+        foreach axis { x y z } {
+            SendCmd "axis lformat $axis %g"
+        }
         StopBufferingCommands
         SendCmd "imgflush"
@@ -1456 +1459 @@
                 return
             }
-            #if { ![info exists _limits($_curFldName)] } {
-            #    SendCmd "dataset maprange all"
-            #} else {
-            #    SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
-            #}
-            #SendCmd "cutplane colormode $_colorMode $_curFldName"
             SendCmd "glyphs colormode $_colorMode $_curFldName"
             DrawLegend
@@ -1545 +1542 @@
         #SendCmd "cutplane color $rgb"
     }
+}
+
+itcl::body Rappture::VtkGlyphViewer::limits { dataobj } {
+    foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
+    foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
+    foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
+    foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
+    return [array get limits]
 }
 

branches/uq/gui/scripts/vtkheightmapviewer.tcl

@@ -58 +58 @@
     public method get {args}
     public method isconnected {}
+    public method limits3 { dataobj }
     public method parameters {title args} { 
         # do nothing 
@@ -1047 +1048 @@
     if { $_reset } {
         SendCmd "axis tickpos outside"
-        #SendCmd "axis lformat all %g"
+        foreach axis { x y z } {
+            SendCmd "axis lformat $axis %g"
+        }
         
         foreach axis { x y z } {
@@ -1099 +1102 @@
             -numisolines
         if { [array size _fields] < 2 } {
-            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
+            catch {
+                blt::table forget $itk_component(field) $itk_component(field_l)
+            }
         }
         RequestLegend
@@ -1834 +1839 @@
         }
     }
+}
+
+itcl::body Rappture::VtkHeightmapViewer::limits3 { dataobj } {
+    lappend limits x [$dataobj limits x]
+    lappend limits y [$dataobj limits y] 
+    if { [catch { $dataobj limits $_curFldName } vlim] != 0 } {
+        set vlim [$dataobj limits v] 
+    }
+    lappend limits v $vlim
+    return $limits
 }
 

branches/uq/gui/scripts/vtkimageviewer.tcl

@@ -58 +58 @@
     public method get {args}
     public method isconnected {}
+    public method limits3 { dataobj }
     public method parameters {title args} { 
         # do nothing 
@@ -925 +926 @@
         InitSettings view3D background
 
+        # Let's see how this goes.  I think it's preferable to overloading the
+        # axis title with the exponent.
+        SendCmd "axis exp 0 0 0 1"
+
         SendCmd "axis lrot z 90"
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
@@ -1056 +1061 @@
             axisVisible axisLabels field view3D
         if { [array size _fields] < 2 } {
-            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
+            catch {
+                blt::table forget $itk_component(field) $itk_component(field_l)
+            }
         }
         RequestLegend
@@ -1627 +1634 @@
         }
     }
+}
+
+itcl::body Rappture::VtkImageViewer::limits3 { dataobj } {
+    lappend limits x [$dataobj limits x]
+    lappend limits y [$dataobj limits y] 
+    if { [catch { $dataobj limits $_curFldName } vlim] != 0 } {
+        set vlim [$dataobj limits v] 
+    }
+    lappend limits v $vlim
+    return $limits
 }
 

branches/uq/gui/scripts/vtkisosurfaceviewer.tcl

@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
+    public method limits { colormap }
     public method parameters {title args} { 
         # do nothing 
@@ -102 +103 @@
     private method Rotate {option x y}
     private method SetCurrentColormap { color }
-    private method SetCurrentFieldName { dataobj }
     private method SetLegendTip { x y }
-    private method SetObjectStyle { dataobj comp }
+    private method SetObjectStyle { dataobj comp } 
+    private method SetCurrentFieldName { dataobj } 
     private method SetOrientation { side }
-    private method Slice {option args}
+    private method Slice {option args} 
     private method Zoom {option}
     private method ViewToQuaternion {} { 
@@ -239 +240 @@
     array set _settings {
         -axesvisible                    1
-        -axislabels                     1
-        -axisminorticks                 1
+        -axislabelsvisible              1
         -axismode                       "static"
         -background                     black
@@ -994 +994 @@
         set _first ""
         InitSettings -xgrid -ygrid -zgrid -axismode \
-            -axesvisible -axislabels -axisminorticks -ortho
-        #SendCmd "axis lformat all %g"
+            -axesvisible -axislabelsvisible -ortho
+        SendCmd "axis lformat all %g"
+        # Too many major ticks, so turn off minor ticks
+        SendCmd "axis minticks all 0"
         StopBufferingCommands
         SendCmd "imgflush"
@@ -1068 +1070 @@
         }
         if { [array size _fields] < 2 } {
-            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
+            catch {
+                blt::table forget $itk_component(field) $itk_component(field_l)
+            }
         }
         set _reset 0
@@ -1319 +1323 @@
             SendCmd "axis visible all $bool"
         }
-        "-axislabels" {
+        "-axislabelsvisible" {
             set bool $_settings($what)
             SendCmd "axis labels all $bool"
-        }
-        "-axisminorticks" {
-            set bool $_settings($what)
-            SendCmd "axis minticks all $bool"
         }
         "-axismode" {
@@ -1598 +1598 @@
 }
 
+itcl::body Rappture::VtkIsosurfaceViewer::limits { dataobj } {
+    foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
+    foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
+    foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
+    foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
+    return [array get limits]
+}
+
 itcl::body Rappture::VtkIsosurfaceViewer::BuildIsosurfaceTab {} {
 
@@ -1683 +1691 @@
         -showvalue off \
         -command [itcl::code $this AdjustSetting -isosurfaceopacity]
-    $inner.opacity set [expr $_settings(-isosurfaceopacity) * 100.0]
+    set _widget(-isosurfaceopacity) \
+        [expr $_settings(-isosurfaceopacity) * 100.0]
 
     itk_component add field_l {
@@ -1749 +1758 @@
 
     checkbutton $inner.visible \
-        -text "Axes" \
+        -text "Show Axes" \
         -variable [itcl::scope _settings(-axesvisible)] \
         -command [itcl::code $this AdjustSetting -axesvisible] \
@@ -1755 +1764 @@
 
     checkbutton $inner.labels \
-        -text "Axis Labels" \
-        -variable [itcl::scope _settings(-axislabels)] \
-        -command [itcl::code $this AdjustSetting -axislabels] \
+        -text "Show Axis Labels" \
+        -variable [itcl::scope _settings(-axislabelsvisible)] \
+        -command [itcl::code $this AdjustSetting -axislabelsvisible] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
-    checkbutton $inner.xgrid \
-        -text "X" \
+
+    checkbutton $inner.gridx \
+        -text "Show X Grid" \
         -variable [itcl::scope _settings(-xgrid)] \
         -command [itcl::code $this AdjustSetting -xgrid] \
         -font "Arial 9"
-    checkbutton $inner.ygrid \
-        -text "Y" \
+    checkbutton $inner.gridy \
+        -text "Show Y Grid" \
         -variable [itcl::scope _settings(-ygrid)] \
         -command [itcl::code $this AdjustSetting -ygrid] \
         -font "Arial 9"
-    checkbutton $inner.zgrid \
-        -text "Z" \
+    checkbutton $inner.gridz \
+        -text "Show Z Grid" \
         -variable [itcl::scope _settings(-zgrid)] \
         -command [itcl::code $this AdjustSetting -zgrid] \
-        -font "Arial 9"
-    checkbutton $inner.minorticks \
-        -text "Minor Ticks" \
-        -variable [itcl::scope _settings(-axisminorticks)] \
-        -command [itcl::code $this AdjustSetting -axisminorticks] \
         -font "Arial 9"
 
@@ -1795 +1799 @@
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 4 \
-        1,0 $inner.labels  -anchor w -cspan 4 \
-        2,0 $inner.minorticks  -anchor w -cspan 4 \
-        4,0 $inner.grid_l  -anchor w \
-        4,1 $inner.xgrid   -anchor w \
-        4,2 $inner.ygrid   -anchor w \
-        4,3 $inner.zgrid   -anchor w \
-        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
-        5,1 $inner.mode    -fill x   -cspan 3
+        0,0 $inner.visible -anchor w -cspan 2 \
+        1,0 $inner.labels  -anchor w -cspan 2 \
+        2,0 $inner.gridx   -anchor w -cspan 2 \
+        3,0 $inner.gridy   -anchor w -cspan 2 \
+        4,0 $inner.gridz   -anchor w -cspan 2 \
+        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
+        6,0 $inner.mode    -fill x   -cspan 2 
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c6 -resize expand
-    blt::table configure $inner r3 -height 0.125i
+    blt::table configure $inner r7 c1 -resize expand
 }
 
@@ -1905 +1906 @@
         -showvalue off \
         -command [itcl::code $this AdjustSetting -cutplaneopacity]
-    $inner.opacity set [expr $_settings(-cutplaneopacity) * 100.0]
+    set _widget(-cutplaneopacity) [expr $_settings(-cutplaneopacity) * 100.0]
 
     # X-value slicer...
@@ -2575 +2576 @@
     }
     if { $_contourList(numLevels) < 1 } {
-        # There are tools that set 0 levels to get cutplanes only
-        #puts stderr "numLevels < 1"
         return ""
     }

branches/uq/gui/scripts/vtkmeshviewer.tcl

@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
-    public method limits { dataobj }
+    public method limits { colormap }
     public method parameters {title args} { 
         # do nothing 
@@ -81 +81 @@
     private method BuildAxisTab {}
     private method BuildCameraTab {}
+    private method BuildCutawayTab {}
     private method BuildDownloadPopup { widget command } 
     private method BuildPolydataTab {}
@@ -93 +94 @@
     private method SetOrientation { side }
     private method SetPolydataOpacity {}
+    private method Slice {option args} 
 
     private variable _arcball ""
@@ -100 +102 @@
     private variable _datasets;         # contains all the dataobj-component 
                                         # datasets in the server
+    private variable _colormaps;        # contains all the colormaps
+                                        # in the server.
     private variable _dataset2style;    # maps dataobj-component to transfunc
     private variable _style2datasets;   # maps tf back to list of 
@@ -183 +187 @@
         -axesvisible            1
         -axislabels             1
-        -axisminorticks         1
         -outline                0
         -polydataedges          0
@@ -190 +193 @@
         -polydatavisible        1
         -polydatawireframe      0
+        -xcutaway               0
+        -xdirection             -1
         -xgrid                  0
+        -xposition              0
+        -ycutaway               0
+        -ydirection             -1
         -ygrid                  0
+        -yposition              0
+        -zcutaway               0
+        -zdirection             -1
         -zgrid                  0
+        -zposition              0
     }
     array set _widget {
@@ -273 +285 @@
     BuildPolydataTab
     BuildAxisTab
+    #BuildCutawayTab
     BuildCameraTab
 
@@ -710 +723 @@
 
     # disconnected -- no more data sitting on server
-    array unset _datasets
-    array unset _data
+    array unset _datasets 
+    array unset _data 
+    array unset _colormaps 
     global readyForNextFrame
     set readyForNextFrame 1
@@ -821 +835 @@
         $_arcball resize $w $h
         DoResize
-        InitSettings -xgrid -ygrid -zgrid -axismode \
-            -axesvisible -axislabels -axisminorticks
+        InitSettings -xgrid -ygrid -zgrid -axismode -axesvisible -axislabels
         StopBufferingCommands
         SendCmd "imgflush"
@@ -890 +903 @@
             -polydatavisible -polydatawireframe
  
-        #SendCmd "axis lformat all %g"
+        SendCmd "axis lformat all %g"
+        # Too many major ticks, so turn off minor ticks
+        SendCmd "axis minticks all 0"
 
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
@@ -1201 +1216 @@
             set mode [$itk_component(axismode) translate $mode]
             SendCmd "axis flymode $mode"
+        }
+        "-xcutaway" - "-ycutaway" - "-zcutaway" {
+            set axis [string range $what 1 1]
+            set bool $_settings($what)
+            if { $bool } {
+                set pos [expr $_settings(-${axis}position) * 0.01]
+                set dir $_settings(-${axis}direction)
+                $itk_component(${axis}CutScale) configure -state normal \
+                    -troughcolor white
+                SendCmd "renderer clipplane $axis $pos $dir"
+            } else {
+                $itk_component(${axis}CutScale) configure -state disabled \
+                    -troughcolor grey82
+                SendCmd "renderer clipplane $axis 1 -1"
+            }
+        }
+        "-xposition" - "-yposition" - "-zposition" {
+            set axis [string range $what 1 1]
+            set pos [expr $_settings($what) * 0.01]
+            SendCmd "renderer clipplane ${axis} $pos -1"
+        }
+        "-xdirection" - "-ydirection" - "-zdirection" {
+            set axis [string range $what 1 1]
+            puts stderr "direction not implemented"
         }
         default {
@@ -1352 +1391 @@
     set inner [$itk_component(main) insert end \
         -title "Axis Settings" \
-        -icon [Rappture::icon axis2]]
+        -icon [Rappture::icon axis1]]
     $inner configure -borderwidth 4
 
     checkbutton $inner.visible \
-        -text "Axes" \
+        -text "Show Axes" \
         -variable [itcl::scope _settings(-axesvisible)] \
         -command [itcl::code $this AdjustSetting -axesvisible] \
@@ -1362 +1401 @@
 
     checkbutton $inner.labels \
-        -text "Axis Labels" \
+        -text "Show Axis Labels" \
         -variable [itcl::scope _settings(-axislabels)] \
         -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
-    checkbutton $inner.xgrid \
-        -text "X" \
+
+    checkbutton $inner.gridx \
+        -text "Show X Grid" \
         -variable [itcl::scope _settings(-xgrid)] \
         -command [itcl::code $this AdjustSetting -xgrid] \
         -font "Arial 9"
-    checkbutton $inner.ygrid \
-        -text "Y" \
+    checkbutton $inner.gridy \
+        -text "Show Y Grid" \
         -variable [itcl::scope _settings(-ygrid)] \
         -command [itcl::code $this AdjustSetting -ygrid] \
         -font "Arial 9"
-    checkbutton $inner.zgrid \
-        -text "Z" \
+    checkbutton $inner.gridz \
+        -text "Show Z Grid" \
         -variable [itcl::scope _settings(-zgrid)] \
         -command [itcl::code $this AdjustSetting -zgrid] \
-        -font "Arial 9"
-    checkbutton $inner.minorticks \
-        -text "Minor Ticks" \
-        -variable [itcl::scope _settings(-axisminorticks)] \
-        -command [itcl::code $this AdjustSetting -axisminorticks] \
         -font "Arial 9"
 
@@ -1402 +1436 @@
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 4 \
-        1,0 $inner.labels  -anchor w -cspan 4 \
-        2,0 $inner.minorticks  -anchor w -cspan 4 \
-        4,0 $inner.grid_l  -anchor w \
-        4,1 $inner.xgrid   -anchor w \
-        4,2 $inner.ygrid   -anchor w \
-        4,3 $inner.zgrid   -anchor w \
-        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
-        5,1 $inner.mode    -fill x   -cspan 3
+        0,0 $inner.visible -anchor w -cspan 2 \
+        1,0 $inner.labels  -anchor w -cspan 2 \
+        2,0 $inner.gridx   -anchor w -cspan 2 \
+        3,0 $inner.gridy   -anchor w -cspan 2 \
+        4,0 $inner.gridz   -anchor w -cspan 2 \
+        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
+        6,0 $inner.mode    -fill x   -cspan 2 
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c6 -resize expand
-    blt::table configure $inner r3 -height 0.125i
+    blt::table configure $inner r7 c1 -resize expand
 }
 
@@ -1463 +1494 @@
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner r$row -resize expand
+}
+
+itcl::body Rappture::VtkMeshViewer::BuildCutawayTab {} {
+
+    set fg [option get $itk_component(hull) font Font]
+    
+    set inner [$itk_component(main) insert end \
+        -title "Cutaway Along Axis" \
+        -icon [Rappture::icon cutbutton]] 
+
+    $inner configure -borderwidth 4
+
+    # X-value slicer...
+    itk_component add xCutButton {
+        Rappture::PushButton $inner.xbutton \
+            -onimage [Rappture::icon x-cutplane] \
+            -offimage [Rappture::icon x-cutplane] \
+            -command [itcl::code $this AdjustSetting -xcutaway] \
+            -variable [itcl::scope _settings(-xcutaway)]
+    }
+    Rappture::Tooltip::for $itk_component(xCutButton) \
+        "Toggle the X-axis cutaway on/off"
+
+    itk_component add xCutScale {
+        ::scale $inner.xval -from 100 -to 0 \
+            -width 10 -orient vertical -showvalue yes \
+            -borderwidth 1 -highlightthickness 0 \
+            -command [itcl::code $this Slice move x] \
+            -variable [itcl::scope _settings(-xposition)]
+    } {
+        usual
+        ignore -borderwidth -highlightthickness
+    }
+    # Set the default cutaway value before disabling the scale.
+    $itk_component(xCutScale) set 100
+    $itk_component(xCutScale) configure -state disabled
+    Rappture::Tooltip::for $itk_component(xCutScale) \
+        "@[itcl::code $this Slice tooltip x]"
+
+    itk_component add xDirButton {
+        Rappture::PushButton $inner.xdir \
+            -onimage [Rappture::icon arrow-down] \
+            -onvalue -1 \
+            -offimage [Rappture::icon arrow-up] \
+            -offvalue 1 \
+            -command [itcl::code $this AdjustSetting -xdirection] \
+            -variable [itcl::scope _settings(-xdirection)]
+    }
+    set _settings(-xdirection) -1 
+    Rappture::Tooltip::for $itk_component(xDirButton) \
+        "Toggle the direction of the X-axis cutaway"
+
+    # Y-value slicer...
+    itk_component add yCutButton {
+        Rappture::PushButton $inner.ybutton \
+            -onimage [Rappture::icon y-cutplane] \
+            -offimage [Rappture::icon y-cutplane] \
+            -command [itcl::code $this AdjustSetting -ycutaway] \
+            -variable [itcl::scope _settings(-ycutaway)]
+    }
+    Rappture::Tooltip::for $itk_component(yCutButton) \
+        "Toggle the Y-axis cutaway on/off"
+
+    itk_component add yCutScale {
+        ::scale $inner.yval -from 100 -to 0 \
+            -width 10 -orient vertical -showvalue yes \
+            -borderwidth 1 -highlightthickness 0 \
+            -command [itcl::code $this Slice move y] \
+            -variable [itcl::scope _settings(-yposition)]
+    } {
+        usual
+        ignore -borderwidth -highlightthickness
+    }
+    Rappture::Tooltip::for $itk_component(yCutScale) \
+        "@[itcl::code $this Slice tooltip y]"
+    # Set the default cutaway value before disabling the scale.
+    $itk_component(yCutScale) set 100
+    $itk_component(yCutScale) configure -state disabled
+
+    itk_component add yDirButton {
+        Rappture::PushButton $inner.ydir \
+            -onimage [Rappture::icon arrow-down] \
+            -onvalue -1 \
+            -offimage [Rappture::icon arrow-up] \
+            -offvalue 1 \
+            -command [itcl::code $this AdjustSetting -ydirection] \
+            -variable [itcl::scope _settings(-ydirection)]
+    }
+    Rappture::Tooltip::for $itk_component(yDirButton) \
+        "Toggle the direction of the Y-axis cutaway"
+    set _settings(-ydirection) -1 
+
+    # Z-value slicer...
+    itk_component add zCutButton {
+        Rappture::PushButton $inner.zbutton \
+            -onimage [Rappture::icon z-cutplane] \
+            -offimage [Rappture::icon z-cutplane] \
+            -command [itcl::code $this AdjustSetting -zcutaway] \
+            -variable [itcl::scope _settings(-zcutaway)]
+    }
+    Rappture::Tooltip::for $itk_component(zCutButton) \
+        "Toggle the Z-axis cutaway on/off"
+
+    itk_component add zCutScale {
+        ::scale $inner.zval -from 100 -to 0 \
+            -width 10 -orient vertical -showvalue yes \
+            -borderwidth 1 -highlightthickness 0 \
+            -command [itcl::code $this Slice move z] \
+            -variable [itcl::scope _settings(-zposition)]
+    } {
+        usual
+        ignore -borderwidth -highlightthickness
+    }
+    $itk_component(zCutScale) set 100
+    $itk_component(zCutScale) configure -state disabled
+    Rappture::Tooltip::for $itk_component(zCutScale) \
+        "@[itcl::code $this Slice tooltip z]"
+
+    itk_component add zDirButton {
+        Rappture::PushButton $inner.zdir \
+            -onimage [Rappture::icon arrow-down] \
+            -onvalue -1 \
+            -offimage [Rappture::icon arrow-up] \
+            -offvalue 1 \
+            -command [itcl::code $this AdjustSetting -zdirection] \
+            -variable [itcl::scope _settings(-zdirection)]
+    }
+    set _settings(-zdirection) -1 
+    Rappture::Tooltip::for $itk_component(zDirButton) \
+        "Toggle the direction of the Z-axis cutaway"
+
+    blt::table $inner \
+        0,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
+        1,0 $itk_component(xCutScale)   -fill y \
+        0,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
+        1,1 $itk_component(yCutScale)   -fill y \
+        0,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
+        1,2 $itk_component(zCutScale)   -fill y \
+
+    blt::table configure $inner r* c* -resize none
+    blt::table configure $inner r1 c3 -resize expand
 }
 
@@ -1625 +1797 @@
 }
 
+# ----------------------------------------------------------------------
+# USAGE: Slice move x|y|z <newval>
+#
+# Called automatically when the user drags the slider to move the
+# cut plane that slices 3D data.  Gets the current value from the
+# slider and moves the cut plane to the appropriate point in the
+# data set.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkMeshViewer::Slice {option args} {
+    switch -- $option {
+        "move" {
+            set axis [lindex $args 0]
+            set newval [lindex $args 1]
+            if {[llength $args] != 2} {
+                error "wrong # args: should be \"Slice move x|y|z newval\""
+            }
+            set newpos [expr {0.01*$newval}]
+            SendCmd "renderer clipplane $axis $newpos -1"
+        }
+        "tooltip" {
+            set axis [lindex $args 0]
+            set val [$itk_component(${axis}CutScale) get]
+            return "Move the [string toupper $axis] cut plane.\nCurrently:  $axis = $val%"
+        }
+        default {
+            error "bad option \"$option\": should be axis, move, or tooltip"
+        }
+    }
+}
+
 itcl::body Rappture::VtkMeshViewer::SetOrientation { side } { 
     array set positions {
@@ -1645 +1847 @@
     set _view(zoom) 1.0
 }
+

branches/uq/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1783 +1783 @@
 
     checkbutton $inner.visible \
-        -text "Axes" \
+        -text "Show Axes" \
         -variable [itcl::scope _settings(axesVisible)] \
         -command [itcl::code $this AdjustSetting axesVisible] \
@@ -1789 +1789 @@
 
     checkbutton $inner.labels \
-        -text "Axis Labels" \
+        -text "Show Axis Labels" \
         -variable [itcl::scope _settings(axisLabelsVisible)] \
         -command [itcl::code $this AdjustSetting axisLabelsVisible] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+
     checkbutton $inner.xgrid \
-        -text "X" \
+        -text "Show X Grid" \
         -variable [itcl::scope _settings(axisXGrid)] \
         -command [itcl::code $this AdjustSetting axisXGrid] \
         -font "Arial 9"
     checkbutton $inner.ygrid \
-        -text "Y" \
+        -text "Show Y Grid" \
         -variable [itcl::scope _settings(axisYGrid)] \
         -command [itcl::code $this AdjustSetting axisYGrid] \
         -font "Arial 9"
     checkbutton $inner.zgrid \
-        -text "Z" \
+        -text "Show Z Grid" \
         -variable [itcl::scope _settings(axisZGrid)] \
         -command [itcl::code $this AdjustSetting axisZGrid] \

branches/uq/gui/scripts/vtksurfaceviewer.tcl

@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
+    public method limits { colormap }
     public method parameters {title args} { 
         # do nothing 
@@ -201 +202 @@
 
     array set _settings {
-        -axesvisible                1
-        -axislabels                 1
-        -axisminorticks             1
-        -background                 black
-        -colormap                   BCGYR
-        -colormapvisible            1
-        -field                      "Default"
-        -isolinecolor               white
-        -isolinesvisible            0
-        -legendvisible              1
-        -numcontours                10
-        -surfaceedges               0
-        -surfacelighting            1
-        -surfaceopacity             100
-        -outline                    0
-        -surfacevisible             1
-        -surfacewireframe           0
-        -xgrid                      0
-        -ygrid                      0
-        -zgrid                      0
+        -axesvisible                    1
+        -axislabelsvisible              1
+        -background                     black
+        -colormap                       BCGYR
+        -colormapvisible                1
+        -field                          "Default"
+        -isolinecolor                   white
+        -isolinesvisible                0
+        -legendvisible                  1
+        -numcontours                    10
+        -surfaceedges                   0
+        -surfacelighting                1
+        -surfaceopacity                 100
+        -outline                        0
+        -surfacevisible                 1
+        -surfacewireframe               0
+        -xaxisgrid                      0
+        -yaxisgrid                      0
+        -zaxisgrid                      0
     }
     array set _changed {
@@ -909 +909 @@
         set _first ""
         InitSettings -xaxisgrid -yaxisgrid -zaxisgrid -axismode \
-            -axesvisible -axislabels -axisminorticks
-        #SendCmd "axis lformat all %g"
+            -axesvisible -axislabelsvisible 
+        foreach axis { x y z } {
+            SendCmd "axis lformat $axis %g"
+        }
         StopBufferingCommands
         SendCmd "imgflush"
@@ -1501 +1503 @@
 }
 
+itcl::body Rappture::VtkSurfaceViewer::limits { dataobj } {
+    foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
+    foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
+    foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
+    foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
+    return [array get limits]
+}
+
 itcl::body Rappture::VtkSurfaceViewer::BuildSurfaceTab {} {
 
@@ -1665 +1675 @@
 
     checkbutton $inner.visible \
-        -text "Axes" \
+        -text "Show Axes" \
         -variable [itcl::scope _settings(-axesvisible)] \
         -command [itcl::code $this AdjustSetting -axesvisible] \
@@ -1671 +1681 @@
 
     checkbutton $inner.labels \
-        -text "Axis Labels" \
-        -variable [itcl::scope _settings(-axislabels)] \
-        -command [itcl::code $this AdjustSetting -axislabels] \
+        -text "Show Axis Labels" \
+        -variable [itcl::scope _settings(-axislabelsvisible)] \
+        -command [itcl::code $this AdjustSetting -axislabelsvisible] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
-    checkbutton $inner.xgrid \
-        -text "X" \
+
+    checkbutton $inner.gridx \
+        -text "Show X Grid" \
         -variable [itcl::scope _settings(-xaxisgrid)] \
         -command [itcl::code $this AdjustSetting -xaxisgrid] \
         -font "Arial 9"
-    checkbutton $inner.ygrid \
-        -text "Y" \
+    checkbutton $inner.gridy \
+        -text "Show Y Grid" \
         -variable [itcl::scope _settings(-yaxisgrid)] \
         -command [itcl::code $this AdjustSetting -yaxisgrid] \
         -font "Arial 9"
-    checkbutton $inner.zgrid \
-        -text "Z" \
+    checkbutton $inner.gridz \
+        -text "Show Z Grid" \
         -variable [itcl::scope _settings(-zaxisgrid)] \
         -command [itcl::code $this AdjustSetting -zaxisgrid] \
-        -font "Arial 9"
-    checkbutton $inner.minorticks \
-        -text "Minor Ticks" \
-        -variable [itcl::scope _settings(-axisminorticks)] \
-        -command [itcl::code $this AdjustSetting -axisminorticks] \
         -font "Arial 9"
 
@@ -1711 +1716 @@
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 4 \
-        1,0 $inner.labels  -anchor w -cspan 4 \
-        2,0 $inner.minorticks  -anchor w -cspan 4 \
-        4,0 $inner.grid_l  -anchor w \
-        4,1 $inner.xgrid   -anchor w \
-        4,2 $inner.ygrid   -anchor w \
-        4,3 $inner.zgrid   -anchor w \
-        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
-        5,1 $inner.mode    -fill x   -cspan 3
+        0,0 $inner.visible -anchor w -cspan 2 \
+        1,0 $inner.labels  -anchor w -cspan 2 \
+        2,0 $inner.gridx   -anchor w -cspan 2 \
+        3,0 $inner.gridy   -anchor w -cspan 2 \
+        4,0 $inner.gridz   -anchor w -cspan 2 \
+        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
+        6,0 $inner.mode    -fill x   -cspan 2 
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c6 -resize expand
-    blt::table configure $inner r3 -height 0.125i
-}
+    blt::table configure $inner r7 c1 -resize expand
+}
+
 
 itcl::body Rappture::VtkSurfaceViewer::BuildCameraTab {} {

branches/uq/gui/scripts/vtkviewer.tcl

@@ -1667 +1667 @@
                 set type [$dataobj type $comp]
                 if { $type == "molecule" } {
-                    StartBufferingCommands
-                    SendCmd [subst {molecule rscale $_settings(molecule-rscale) $dataset}]
-                    SendCmd [subst {molecule ascale $_settings(molecule-atomscale) $dataset}]
-                    SendCmd [subst {molecule bscale $_settings(molecule-bondscale) $dataset}]
-                    SendCmd [subst {molecule bstyle $_settings(molecule-bondstyle) $dataset}]
-                    SendCmd [subst {molecule atoms $_settings(molecule-atoms-visible) $dataset}]
-                    SendCmd [subst {molecule bonds $_settings(molecule-bonds-visible) $dataset}]
-                    StopBufferingCommands
+                    SendCmd [subst {molecule rscale $_settings(molecule-rscale) $dataset
+molecule ascale $_settings(molecule-atomscale) $dataset
+molecule bscale $_settings(molecule-bondscale) $dataset
+molecule bstyle $_settings(molecule-bondstyle) $dataset
+molecule atoms $_settings(molecule-atoms-visible) $dataset
+molecule bonds $_settings(molecule-bonds-visible) $dataset}]
                 }
             }
@@ -2137 +2135 @@
 
     checkbutton $inner.visible \
-        -text "Axes" \
+        -text "Show Axes" \
         -variable [itcl::scope _axis(visible)] \
         -command [itcl::code $this AdjustSetting axis-visible] \
@@ -2143 +2141 @@
 
     checkbutton $inner.labels \
-        -text "Axis Labels" \
+        -text "Show Axis Labels" \
         -variable [itcl::scope _axis(labels)] \
         -command [itcl::code $this AdjustSetting axis-labels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
-    checkbutton $inner.xgrid \
-        -text "X" \
+
+    checkbutton $inner.gridx \
+        -text "Show X Grid" \
         -variable [itcl::scope _axis(xgrid)] \
         -command [itcl::code $this AdjustSetting axis-xgrid] \
         -font "Arial 9"
-    checkbutton $inner.ygrid \
-        -text "Y" \
+    checkbutton $inner.gridy \
+        -text "Show Y Grid" \
         -variable [itcl::scope _axis(ygrid)] \
         -command [itcl::code $this AdjustSetting axis-ygrid] \
         -font "Arial 9"
-    checkbutton $inner.zgrid \
-        -text "Z" \
+    checkbutton $inner.gridz \
+        -text "Show Z Grid" \
         -variable [itcl::scope _axis(zgrid)] \
         -command [itcl::code $this AdjustSetting axis-zgrid] \

branches/uq/gui/src/RpPdbToVtk.c

@@ -191 +191 @@
     for (i = 0, hPtr = Tcl_FirstHashEntry(atomTablePtr, &iter); hPtr != NULL;
          hPtr = Tcl_NextHashEntry(&iter), i++) {
-        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
+        PdbAtom *atomPtr;
+
+        atomPtr = Tcl_GetHashValue(hPtr);
         array[i] = atomPtr;
     }
@@ -689 +691 @@
         Tcl_AppendToObj(objPtr, mesg, -1);
     }
-#if 0
-    for (hPtr = Tcl_FirstHashEntry(&atomTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
-        fprintf(stderr, "%d %s %d connections\n", atomPtr->ordinal,
-                elements[atomPtr->number].symbol, atomPtr->numConnections);
-    }
-#endif
     sprintf(mesg, "POINT_DATA %d\n", atomTable.numEntries);
     Tcl_AppendToObj(objPtr, mesg, -1);

branches/uq/lang/tcl/pkgIndex.tcl.in

@@ -6 +6 @@
         variable version $version
         variable build "@SVN_VERSION@"
-        variable svnurl "@SVN_URL@"
         variable installdir [file normalize $dir]
     }

branches/uq/src/core/RpEncode.cc

@@ -212 +212 @@
     for (p = (unsigned const char *)buf, pend = p + size; p < pend; p++) {
         if (!_base64chars[*p]) {
-            fprintf(stderr, "%c %u is not base64\n", *p, *p);
+            fprintf(stderr, "\"%c\" (0x%x) is not base64\n", *p, *p);
             return false;
         }