Changeset 5850

Timestamp:

Aug 28, 2015 10:12:22 AM (9 years ago)

Author:

gah

Message:

merge accumulative changes from 1.3 branch into uq branch

Location:

branches/uq

Files:

• . (modified) (1 prop)
• examples/zoo/field/field.py (modified) (1 diff)
• examples/zoo/field/field.tcl (modified) (1 diff)
• examples/zoo/field/tool.xml (modified) (1 diff)
• examples/zoo/mesh/mesh.m (modified) (1 diff)
• examples/zoo/mesh/mesh.py (modified) (1 diff)
• examples/zoo/mesh/mesh.tcl (modified) (1 diff)
• examples/zoo/mesh/tool.xml (modified) (1 diff)
• examples/zoo/mesh/tool_octave.xml (modified) (1 diff, 1 prop)
• gui/apps/execute.tcl (modified) (3 diffs)
• gui/scripts/drawing.tcl (modified) (1 diff)
• gui/scripts/field.tcl (modified) (3 diffs)
• gui/scripts/flowvisviewer.tcl (modified) (34 diffs)
• gui/scripts/molvisviewer.tcl (modified) (28 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (31 diffs)
• gui/scripts/visviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkglyphviewer.tcl (modified) (3 diffs)
• gui/scripts/vtkheightmapviewer.tcl (modified) (6 diffs)
• gui/scripts/vtkimageviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (3 diffs)
• gui/scripts/vtkmeshviewer.tcl (modified) (3 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (27 diffs)
• gui/scripts/vtksurfaceviewer.tcl (modified) (5 diffs)
• gui/scripts/vtkviewer.tcl (modified) (10 diffs)
• gui/scripts/vtkvolumeviewer.tcl (modified) (7 diffs)
• src/core/Makefile.in (modified) (4 diffs)
• src/core/RpBindingsDict.cc (modified) (3 diffs)
• src/core/RpBuffer.cc (modified) (13 diffs)
• src/core/RpBuffer.h (modified) (4 diffs)
• src/core/RpBufferCInterface.cc (modified) (2 diffs)
• src/core/RpBufferCInterface.h (modified) (4 diffs)
• src/core/RpDict.h (modified) (40 diffs)
• src/core/b64/cdecode.h (modified) (1 diff)
• src/core/b64/decode.h (modified) (1 diff)
• src/core/b64/encode.h (modified) (1 diff)
• src/core/rappture_fortran.c (modified) (62 diffs)
• src/core/scew_extras.c (modified) (1 diff)

branches/uq/examples/zoo/field/field.py

@@ -141 +141 @@
     """
 
-if vizmethod == "dx":
-    #
-    # Generate a uniform 3D mesh in OpenDX format...
-    #
-    f3d = rx['output.field(f3d)']
-    f3d['about.label'] = "3D Field"
-    f3d['component.style'] = "-color blue:yellow:red -levels 6"
-
-    dx = """object 1 class gridpositions counts 5 5 2
-        origin 0 0 0
-        delta 1 0 0
-        delta 0 1 0
-        delta 0 0 1
-        object 2 class gridconnections counts 5 5 2
-        object 3 class array type double rank 0 items 50 data follows
-    """
-
-    xx, yy, zz = np.mgrid[xmin:xmax:5j, ymin:ymax:5j, 0:1:2j]
-    pts = formula(xx, yy, zz)
-    # Axis ordering for OpenDX is reversed (z fastest)
-    dx += '\n'.join(map(str, (pts.ravel())))
-
-    dx += """attribute "dep" string "positions"
-    object "regular positions regular connections" class field
-    component "positions" value 1
-    component "connections" value 2
-    component "data" value 3"""
-
-    data = Rappture.encoding.encode(dx, Rappture.RPENC_ZB64)
-    f3d['component.dx'] = data
-
-
 rx.close()

branches/uq/examples/zoo/field/field.tcl

@@ -115 +115 @@
 }
 
-if {$vizmethod == "dx"} {
-    #
-    # Generate a uniform 3D mesh in OpenDX format...
-    #
-    $driver put output.field(f3d).about.label "3D Field"
-    $driver put output.field(f3d).component.style "-color blue:yellow:red -levels 6"
-
-    set dx "object 1 class gridpositions counts 5 5 2
-origin 0 0 0
-delta 1 0 0
-delta 0 1 0
-delta 0 0 1
-object 2 class gridconnections counts 5 5 2
-object 3 class array type double rank 0 items 50 data follows
-"
-    # Axis ordering for OpenDX is reversed (z fastest)
-    for {set x 0} {$x < 5} {incr x} {
-        for {set y 0} {$y < 5} {incr y} {
-            for {set z 0} {$z < 2} {incr z} {
-                set fval [expr $formula]
-                append dx "$fval\n"
-            }
-        }
-    }
-    append dx {attribute "dep" string "positions"
-    object "regular positions regular connections" class field
-    component "positions" value 1
-    component "connections" value 2
-    component "data" value 3}
-
-    set data [Rappture::encoding::encode -as zb64 $dx]
-    $driver put output.field(f3d).component.dx $data
-}
-
 #
 # Save the updated XML describing the run...

branches/uq/examples/zoo/field/tool.xml

@@ -46 +46 @@
       <value>unstructured</value>
     </option>
-    <option>
-      <about>
-        <label>Volume (OpenDX)</label>
-        <description>Renders a 3D volume using the deprecated OpenDX mesh/field format.</description>
-      </about>
-      <value>dx</value>
-    </option>
     <default>grid</default>
   </choice>

branches/uq/examples/zoo/mesh/mesh.m

@@ -93 +93 @@
                  0, 0);
 
-  case 'generic'
-    mesh = 'output.mesh';
-    rpLibPutString(lib, 'output.mesh.about.label', \
-                   'nodes and elements mesh', 0);
-    rpLibPutString(lib, 'output.mesh.dim', '2', 0);
-    rpLibPutString(lib, 'output.mesh.units', 'm', 0);
-    rpLibPutString(lib, 'output.mesh.hide', 'yes', 0);
-
-    f = fopen('triangles.txt');
-    triangles = fscanf(f, '%d');
-    fclose(f);
-
-    % TO BE COMPLETED
-
   case 'unstructured' 
     mesh = 'output.mesh';

branches/uq/examples/zoo/mesh/mesh.py

@@ -84 +84 @@
     mesh.put('unstructured.triangles', 'triangles.txt', type='file')
 
-if meshtype == 'generic':
-    mesh['about.label'] = "nodes and elements mesh"
-    with open('points.txt') as f:
-        data = f.read()
-    for i, line in enumerate(data.split('\n')):
-        if line == '':
-            break
-        x, y = line.split()
-        mesh['node(%s)' % i] = "%s %s" % (x, y)
-    with open('triangles.txt') as f:
-        data = f.read()
-    for i, line in enumerate(data.split('\n')):
-        if line == '':
-            break
-        x, y, z = line.split()
-        mesh['element(%s).nodes' % i] = "%s %s %s" % (x, y, z)
-
 if meshtype == 'unstructured':
     mesh['about.label'] = "Unstructured Grid"

branches/uq/examples/zoo/mesh/mesh.tcl

@@ -117 +117 @@
             triangles.txt
     }
-    "generic" {
-        set mesh output.mesh
-
-        $driver put $mesh.about.label "Mesh"
-        $driver put $mesh.about.description "nodes and elements mesh"
-        $driver put $mesh.dim  2
-        $driver put $mesh.units "m"
-        $driver put $mesh.hide $hide
-
-        set count 0
-        set f [open "points.txt" "r"]
-        set points [read $f]
-        close $f
-        foreach { x y } $points {
-            $driver put $mesh.node($count) "$x $y"
-            incr count
-        }
-        set count 0
-        set f [open "triangles.txt" "r"]
-        set triangles [read $f]
-        close $f
-        foreach { a b c } $triangles {
-            $driver put $mesh.element($count).nodes "$a $b $c"
-            incr count
-        }
-    }
     "unstructured" {
         set mesh output.mesh

branches/uq/examples/zoo/mesh/tool.xml

@@ -65 +65 @@
     <option>
      <about>
-      <label>general nodes and elements description</label>
-      <description>Unstructured 2 dimensional grid of cells using nodes and elements.</description>
-     </about>
-     <value>generic</value>
-    </option>
-    <option>
-     <about>
       <label>VTK mesh</label>
       <description>Partial VTK file representing the mesh.</description>

branches/uq/examples/zoo/mesh/tool_octave.xml

@@ -58 +58 @@
     <option>
      <about>
-      <label>general nodes and elements description</label>
-      <description>Unstructured 2 dimensional grid of cells using nodes and elements.</description>
-     </about>
-     <value>generic</value>
-    </option>
-    <option>
-     <about>
       <label>VTK mesh</label>
       <description>Partial VTK file representing the mesh.</description>

branches/uq/gui/apps/execute.tcl

@@ -32 +32 @@
 Rappture::resources::load
 
+# Parse command line options
+# ----------------------------------------------------------------------
+Rappture::getopts argv params {
+    value -tool ""
+    value -status ""
+    value -output ""
+    value -cleanup no
+}
+
 # load the XML info in the driver file
 if {[catch {Rappture::library $driverxml} result]} {
@@ -41 +50 @@
 
 # If tool.xml is not specified, try to find it the way Rappture would.
+if {$params(-tool) ne ""} {
+    set toolxml $params(-tool)
+}
 if {$toolxml eq ""} {
     if {[file isfile tool.xml]} {
@@ -120 +132 @@
 }
 
-# Parse command line options to see
+# Apply effects of all other command line options
 # ----------------------------------------------------------------------
-Rappture::getopts argv params {
-    value -status ""
-    value -output ""
-    value -cleanup no
-}
-
 if {$params(-status) ne ""} {
     set LogFid [open $params(-status) w]

branches/uq/gui/scripts/drawing.tcl

@@ -93 +93 @@
     }
     foreach {key path} {
+        camera  about.camera
+        color   about.color
         group   about.group
         label   about.label
-        color   about.color
-        camera  about.camera
         type    about.type
+        xdesc   xaxis.description
+        ydesc   yaxis.description
+        zdesc   zaxis.description
         xlabel  xaxis.label
-        xdesc   xaxis.description
+        ylabel  yaxis.label
+        zlabel  zaxis.label
+        xscale  xaxis.scale
+        yscale  yaxis.scale
+        zscale  zaxis.scale
         xunits  xaxis.units
-        xscale  xaxis.scale
+        yunits  yaxis.units
+        zunits  zaxis.units
         xmin    xaxis.min
         xmax    xaxis.max
-        ylabel  yaxis.label
-        ydesc   yaxis.description
-        yunits  yaxis.units
-        yscale  yaxis.scale
         ymin    yaxis.min
         ymax    yaxis.max
-        zlabel  zaxis.label
-        zdesc   zaxis.description
-        zunits  zaxis.units
-        zscale  zaxis.scale
         zmin    zaxis.min
         zmax    zaxis.max

branches/uq/gui/scripts/field.tcl

@@ -651 +651 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::InitHints {} {
+    # Order of duplicate keys matters here: later entries override
+    # earlier ones.  For example: camera.position is deprecated in
+    # favor of about.camera, so about.camera is listed after
+    # camera.position
     foreach {key path} {
         camera          camera.position
+        camera          about.camera
         color           about.color
-        default         about.default
         group           about.group
         label           about.label
@@ -1142 +1146 @@
 }
 
+#
+# FIXME: Allowing a VTK file to be used as a Field <component> means
+# there can be multiple VTK fields with different association, type, and
+# number of components (array elements) within a single Rappture::Field.
+# This breaks the concept of the Field object since the <component>'s
+# <association>, <elemtype> and <elemsize> can't be set to a single
+# value in this case.
+#
+# Rappture needs a Dataset object with a single Mesh and multiple Fields.
+#
 itcl::body Rappture::Field::ReadVtkDataSet { cname contents } {
     package require vtk
@@ -1191 +1205 @@
     lappend limits y [list $ymin $ymax]
     lappend limits z [list $zmin $zmax]
+    set vmin 0
+    set vmax 1
+    set foundDefaultArray 0
     set dataAttrs [$dataset GetPointData]
     if { $dataAttrs == ""} {
-        puts stderr "WARNING: No point data found in \"$_path\""
+        puts stderr "ERROR: Can't get point data attributes in \"$_path\""
         rename $reader ""
         return 0
     }
-    set vmin 0
-    set vmax 1
     set numArrays [$dataAttrs GetNumberOfArrays]
-    if { $numArrays > 0 } {
-        for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} {
-            set array [$dataAttrs GetArray $i]
-            set fname  [$dataAttrs GetArrayName $i]
-            foreach {min max} [$array GetRange -1] break
-            if {$i == 0} {
-                set vmin $min
-                set vmax $max
-            }
+    for {set i 0} {$i < $numArrays} {incr i} {
+        set array [$dataAttrs GetArray $i]
+        set fname [$dataAttrs GetArrayName $i]
+        foreach {min max} [$array GetRange -1] break
+        if {!$foundDefaultArray} {
+            set vmin $min
+            set vmax $max
+            set foundDefaultArray 1
+        }
+        lappend limits $fname [list $min $max]
+        set _fld2Units($fname) ""
+        set _fld2Label($fname) $fname
+        # Let the VTK file override the <elemsize>
+        set _fld2Components($fname) [$array GetNumberOfComponents]
+        lappend _comp2fldName($cname) $fname
+    }
+    # FIXME: Can't properly handle field names that are re-used in point data
+    # cell data and/or field data even though this is permitted in VTK.
+    # For now, we'll use the first field found of point, cell, then field data
+    set dataAttrs [$dataset GetCellData]
+    if { $dataAttrs == ""} {
+        puts stderr "ERROR: Can't get cell data attributes found in \"$_path\""
+        rename $reader ""
+        return 0
+    }
+    set numArrays [$dataAttrs GetNumberOfArrays]
+    for {set i 0} {$i < $numArrays} {incr i} {
+        set array [$dataAttrs GetArray $i]
+        set fname [$dataAttrs GetArrayName $i]
+        foreach {min max} [$array GetRange -1] break
+        if {!$foundDefaultArray} {
+            set vmin $min
+            set vmax $max
+            set foundDefaultArray 1
+        }
+        if {[info exists _fld2Components($fname)]} {
+            puts stderr "WARNING: Re-use of field name within cell data attributes"
+        } else {
             lappend limits $fname [list $min $max]
             set _fld2Units($fname) ""
             set _fld2Label($fname) $fname
-            # Let the VTK file override the <type> designated.
+            # Let the VTK file override the <elemsize>
             set _fld2Components($fname) [$array GetNumberOfComponents]
             lappend _comp2fldName($cname) $fname
         }
     }
-
+    set dataAttrs [$dataset GetFieldData]
+    if { $dataAttrs == ""} {
+        puts stderr "ERROR: Can't get field data attributes found in \"$_path\""
+        rename $reader ""
+        return 0
+    }
+    set numArrays [$dataAttrs GetNumberOfArrays]
+    for {set i 0} {$i < $numArrays} {incr i} {
+        set array [$dataAttrs GetArray $i]
+        set fname [$dataAttrs GetArrayName $i]
+        foreach {min max} [$array GetRange -1] break
+        if {!$foundDefaultArray} {
+            set vmin $min
+            set vmax $max
+            set foundDefaultArray 1
+        }
+        if {[info exists _fld2Components($fname)]} {
+            puts stderr "WARNING: Re-use of field name within field data attributes"
+        } else {
+            lappend limits $fname [list $min $max]
+            set _fld2Units($fname) ""
+            set _fld2Label($fname) $fname
+            # Let the VTK file override the <elemsize>
+            set _fld2Components($fname) [$array GetNumberOfComponents]
+            lappend _comp2fldName($cname) $fname
+        }
+    }
+    # This is set to the range of the first array found
     lappend limits v [list $vmin $vmax]
     set _comp2limits($cname) $limits

branches/uq/gui/scripts/flowvisviewer.tcl

@@ -3 +3 @@
 #  COMPONENT: flowvisviewer - 3D flow rendering
 #
-#  This widget performs volume and flow rendering on 3D scalar/vector datasets.
+#  This widget performs volume and flow rendering on 3D vector datasets.
 #  It connects to the Nanovis server running on a rendering farm,
 #  transmits data, and displays the results.
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -172 +172 @@
     set _serverType "nanovis"
 
-    # Draw legend event
+    #DebugOn
+    EnableWaitDialog 900
+
+    # Rebuild event
+    $_dispatcher register !rebuild
+    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
+
+    # Resize event
+    $_dispatcher register !resize
+    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
+
+    # Legend event
     $_dispatcher register !legend
     $_dispatcher dispatch $this !legend "[itcl::code $this FixLegend]; list"
@@ -180 +191 @@
     $_dispatcher dispatch $this !send_transfunc \
         "[itcl::code $this SendTransferFunctions]; list"
-
-    # Rebuild event
-    $_dispatcher register !rebuild
-    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
-
-    # Resize event
-    $_dispatcher register !resize
-    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
     $_dispatcher register !play
@@ -212 +215 @@
     # Initialize the view to some default parameters.
     array set _view {
-        -qw      0.853553
-        -qx      -0.353553
-        -qy      0.353553
-        -qz      0.146447
-        -xpan    0
-        -ypan    0
-        -zoom    1.0
+        -qw       0.853553
+        -qx       -0.353553
+        -qy       0.353553
+        -qz       0.146447
+        -xpan     0
+        -ypan     0
+        -zoom     1.0
     }
     set _arcball [blt::arcball create 100 100]
@@ -266 +269 @@
     }]
 
-    itk_component add 3dview {
+    itk_component add view {
         label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
@@ -273 +276 @@
         ignore -highlightthickness -borderwidth  -background
     }
-    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
+    bind $itk_component(view) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -317 +320 @@
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -command [itcl::code $this AdjustSetting -volume] \
-            -variable [itcl::scope _settings(-volume)]
+            -variable [itcl::scope _settings(-volume)] \
+            -command [itcl::code $this AdjustSetting -volume]
     }
     $itk_component(volume) select
@@ -362 +365 @@
     # the server.  So the panewindow uses the tiny size.
     set w 10000
-    pack forget $itk_component(3dview)
+    pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(3dview) -fill both -reqwidth $w \
+        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
@@ -511 +514 @@
     blt::table configure $itk_component(flowcontrols) r0 -pady 1
     # Bindings for rotation via mouse
-    bind $itk_component(3dview) <ButtonPress-1> \
+    bind $itk_component(view) <ButtonPress-1> \
         [itcl::code $this Rotate click %x %y]
-    bind $itk_component(3dview) <B1-Motion> \
+    bind $itk_component(view) <B1-Motion> \
         [itcl::code $this Rotate drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-1> \
+    bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
 
-    bind $itk_component(3dview) <Configure> \
+    bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
 
     # Bindings for panning via mouse
-    bind $itk_component(3dview) <ButtonPress-2> \
+    bind $itk_component(view) <ButtonPress-2> \
         [itcl::code $this Pan click %x %y]
-    bind $itk_component(3dview) <B2-Motion> \
+    bind $itk_component(view) <B2-Motion> \
         [itcl::code $this Pan drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-2> \
+    bind $itk_component(view) <ButtonRelease-2> \
         [itcl::code $this Pan release %x %y]
 
     # Bindings for panning via keyboard
-    bind $itk_component(3dview) <KeyPress-Left> \
+    bind $itk_component(view) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
-    bind $itk_component(3dview) <KeyPress-Right> \
+    bind $itk_component(view) <KeyPress-Right> \
         [itcl::code $this Pan set 10 0]
-    bind $itk_component(3dview) <KeyPress-Up> \
+    bind $itk_component(view) <KeyPress-Up> \
         [itcl::code $this Pan set 0 -10]
-    bind $itk_component(3dview) <KeyPress-Down> \
+    bind $itk_component(view) <KeyPress-Down> \
         [itcl::code $this Pan set 0 10]
-    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+    bind $itk_component(view) <Shift-KeyPress-Left> \
         [itcl::code $this Pan set -2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+    bind $itk_component(view) <Shift-KeyPress-Right> \
         [itcl::code $this Pan set 2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+    bind $itk_component(view) <Shift-KeyPress-Up> \
         [itcl::code $this Pan set 0 -2]
-    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+    bind $itk_component(view) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 2]
 
     # Bindings for zoom via keyboard
-    bind $itk_component(3dview) <KeyPress-Prior> \
+    bind $itk_component(view) <KeyPress-Prior> \
         [itcl::code $this Zoom out]
-    bind $itk_component(3dview) <KeyPress-Next> \
+    bind $itk_component(view) <KeyPress-Next> \
         [itcl::code $this Zoom in]
 
-    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+    bind $itk_component(view) <Enter> "focus $itk_component(view)"
 
     if {[string equal "x11" [tk windowingsystem]]} {
         # Bindings for zoom via mouse
-        bind $itk_component(3dview) <4> [itcl::code $this Zoom out]
-        bind $itk_component(3dview) <5> [itcl::code $this Zoom in]
+        bind $itk_component(view) <4> [itcl::code $this Zoom out]
+        bind $itk_component(view) <5> [itcl::code $this Zoom in]
     }
 
@@ -565 +568 @@
     eval itk_initialize $args
 
-    EnableWaitDialog 900
     Connect
 }
@@ -626 +628 @@
 # ----------------------------------------------------------------------
 # USAGE: get ?-objects?
-# USAGE: get ?-image 3dview|legend?
+# USAGE: get ?-image view|legend?
 #
 # Clients use this to query the list of objects being plotted, in
@@ -656 +658 @@
         -image {
             if {[llength $args] != 2} {
-                error "wrong # args: should be \"get -image 3dview|legend\""
+                error "wrong # args: should be \"get -image view|legend\""
             }
             switch -- [lindex $args end] {
-                3dview {
+                view {
                     return $_image(plot)
                 }
@@ -666 +668 @@
                 }
                 default {
-                    error "bad image name \"[lindex $args end]\": should be 3dview or legend"
+                    error "bad image name \"[lindex $args end]\": should be view or legend"
                 }
             }
@@ -679 +681 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::delete {args} {
@@ -881 +882 @@
         }
 
-        set w [winfo width $itk_component(3dview)]
-        set h [winfo height $itk_component(3dview)]
+        set w [winfo width $itk_component(view)]
+        set h [winfo height $itk_component(view)]
         EventuallyResize $w $h
     }
@@ -891 +892 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+# Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::FlowvisViewer::isconnected {} {
@@ -907 +908 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+# Clients use this method to disconnect from the current rendering server.
 #
 itcl::body Rappture::FlowvisViewer::Disconnect {} {
@@ -1033 +1033 @@
 # ReceiveLegend --
 #
-#       The procedure is the response from the render server to each "legend"
-#       command.  The server sends back a "legend" command invoked our
-#       the slave interpreter.  The purpose is to collect data of the image
-#       representing the legend in the canvas.  In addition, the
-#       active transfer function is displayed.
+# The procedure is the response from the render server to each "legend"
+# command.  The server sends back a "legend" command invoked our
+# the slave interpreter.  The purpose is to collect data of the image
+# representing the legend in the canvas.  In addition, the
+# active transfer function is displayed.
 #
 itcl::body Rappture::FlowvisViewer::ReceiveLegend { tag vmin vmax size } {
@@ -1053 +1053 @@
 # ReceiveData --
 #
-#       The procedure is the response from the render server to each "data
-#       follows" command.  The server sends back a "data" command invoked our
-#       the slave interpreter.  The purpose is to collect the min/max of the
-#       volume sent to the render server.  Since the client (flowvisviewer)
-#       doesn't parse 3D data formats, we rely on the server (nanovis) to
-#       tell us what the limits are.  Once we've received the limits to all
-#       the data we've sent (tracked by _recvdDatasets) we can then determine
-#       what the transfer functions are for these volumes.
+# The procedure is the response from the render server to each "data
+# follows" command.  The server sends back a "data" command invoked our
+# the slave interpreter.  The purpose is to collect the min/max of the
+# volume sent to the render server.  Since the client (flowvisviewer)
+# doesn't parse 3D data formats, we rely on the server (nanovis) to
+# tell us what the limits are.  Once we've received the limits to all
+# the data we've sent (tracked by _recvdDatasets) we can then determine
+# what the transfer functions are for these volumes.
 #
 #
@@ -1104 +1104 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::Rebuild {} {
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $w < 2 || $h < 2 } {
         update
@@ -1215 +1215 @@
             NameTransferFunction $dataobj $cname
         }
+        set _reset 0
     }
 
@@ -1246 +1247 @@
     StopBufferingCommands
     blt::busy release $itk_component(hull)
-    set _reset 0
 }
 
@@ -1344 +1344 @@
     switch -- $option {
         click {
-            $itk_component(3dview) configure -cursor fleur
+            $itk_component(view) configure -cursor fleur
             set _click(x) $x
             set _click(y) $y
@@ -1352 +1352 @@
                 Rotate click $x $y
             } else {
-                set w [winfo width $itk_component(3dview)]
-                set h [winfo height $itk_component(3dview)]
+                set w [winfo width $itk_component(view)]
+                set h [winfo height $itk_component(view)]
                 if {$w <= 0 || $h <= 0} {
                     return
@@ -1380 +1380 @@
         release {
             Rotate drag $x $y
-            $itk_component(3dview) configure -cursor ""
+            $itk_component(view) configure -cursor ""
             catch {unset _click}
         }
@@ -1399 +1399 @@
 itcl::body Rappture::FlowvisViewer::Pan {option x y} {
     # Experimental stuff
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $option == "set" } {
         set x [expr $x / double($w)]
@@ -1414 +1414 @@
         set _click(x) $x
         set _click(y) $y
-        $itk_component(3dview) configure -cursor hand1
+        $itk_component(view) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
@@ -1428 +1428 @@
     }
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1501 +1501 @@
             if { $_settings($what) } {
                 blt::table $itk_component(plotarea) \
-                    0,0 $itk_component(3dview) -fill both \
+                    0,0 $itk_component(view) -fill both \
                     1,0 $itk_component(legend) -fill x
                 blt::table configure $itk_component(plotarea) r1 -resize none
@@ -1616 +1616 @@
 # NameTransferFunction --
 #
-#       Creates a transfer function name based on the <style> settings in the
-#       library run.xml file. This placeholder will be used later to create
-#       and send the actual transfer function once the data info has been sent
-#       to us by the render server. [We won't know the volume limits until the
-#       server parses the 3D data and sends back the limits via ReceiveData.]
+# Creates a transfer function name based on the <style> settings in the
+# library run.xml file. This placeholder will be used later to create
+# and send the actual transfer function once the data info has been sent
+# to us by the render server. [We won't know the volume limits until the
+# server parses the 3D data and sends back the limits via ReceiveData.]
 #
 itcl::body Rappture::FlowvisViewer::NameTransferFunction { dataobj cname } {
@@ -1642 +1642 @@
 # ComputeTransferFunction --
 #
-#       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 been set up.  Both parts are
-#       needed to compute the relative value (location) of the marker, and
-#       the alpha map of the transfer function.
+# 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 been set up.  Both parts are
+# needed to compute the relative value (location) of the marker, and
+# the alpha map of the transfer function.
 #
 itcl::body Rappture::FlowvisViewer::ComputeTransferFunction { tf } {
@@ -2634 +2634 @@
         }
         "next" {
-            if { ![winfo viewable $itk_component(3dview)] } {
+            if { ![winfo viewable $itk_component(view)] } {
                 flow stop
                 return
@@ -2949 +2949 @@
 # BuildVolumeComponents --
 #
-#    This is called from the "scale" method which is called when a new
-#    dataset is added or deleted.  It repopulates the dropdown menu of
-#    volume component names.  It sets the current component to the first
-#    component in the list (of components found).  Finally, if there is
-#    only one component, don't display the label or the combobox in the
-#    volume settings tab.
+# This is called from the "scale" method which is called when a new
+# dataset is added or deleted.  It repopulates the dropdown menu of
+# volume component names.  It sets the current component to the first
+# component in the list (of components found).  Finally, if there is
+# only one component, don't display the label or the combobox in the
+# volume settings tab.
 #
 itcl::body Rappture::FlowvisViewer::BuildVolumeComponents {} {
@@ -2968 +2968 @@
 # 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::FlowvisViewer::GetDatasetsWithComponent { cname } {

branches/uq/gui/scripts/molvisviewer.tcl

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -26 +26 @@
     Rappture::resources::register \
         molvis_server Rappture::MolvisViewer::SetServerList
-}
-
-set debug 0
-proc debug { args } {
-    global debug
-    if { $debug } {
-        puts stderr "[info level -1]: $args"
-    }
 }
 
@@ -160 +152 @@
     set _serverType "pymol"
 
+    #DebugOn
+
     # Register events to the dispatcher.  Base class expects !rebuild
     # event to be registered.
@@ -236 +230 @@
     }]
 
-    itk_component add 3dview {
+    itk_component add view {
         label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
@@ -243 +237 @@
         ignore -highlightthickness -borderwidth  -background
     }
-    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
+    bind $itk_component(view) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -318 +312 @@
     BuildSettingsTab
 
-    # HACK ALERT. Initially force a requested width of the 3dview label.
-
-    # It's a chicken-and-the-egg problem.  The size of the 3dview label is set
+    # HACK ALERT. Initially force a requested width of the view label.
+
+    # It's a chicken-and-the-egg problem.  The size of the view label is set
     # from the size of the image retrieved from the server.  But the size of
     # the image is specified by the viewport which is the size of the label.
@@ -330 +324 @@
     # (that's why we're using the blt::table to manage the geometry).  It has
     # to be big, because we don't know how big the user may want to stretch
-    # the window.  This at least forces the sidebarframe to give the 3dview
+    # the window.  This at least forces the sidebarframe to give the view
     # the maximum size available, which is perfect for an initially closed
     # sidebar.
 
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(3dview) -fill both -reqwidth 10000
+        0,0 $itk_component(view) -fill both -reqwidth 10000
     #
     # RENDERING AREA
@@ -344 +338 @@
     if { $_useVmouseEvents } {
         # set up bindings to bridge mouse events to server
-        bind $itk_component(3dview) <ButtonPress> \
+        bind $itk_component(view) <ButtonPress> \
             [itcl::code $this Vmouse click %b %s %x %y]
-        bind $itk_component(3dview) <ButtonRelease> \
+        bind $itk_component(view) <ButtonRelease> \
             [itcl::code $this Vmouse release %b %s %x %y]
-        bind $itk_component(3dview) <B1-Motion> \
+        bind $itk_component(view) <B1-Motion> \
             [itcl::code $this Vmouse drag 1 %s %x %y]
-        bind $itk_component(3dview) <B2-Motion> \
+        bind $itk_component(view) <B2-Motion> \
             [itcl::code $this Vmouse drag 2 %s %x %y]
-        bind $itk_component(3dview) <B3-Motion> \
+        bind $itk_component(view) <B3-Motion> \
             [itcl::code $this Vmouse drag 3 %s %x %y]
-        bind $itk_component(3dview) <Motion> \
+        bind $itk_component(view) <Motion> \
             [itcl::code $this Vmouse move 0 %s %x %y]
     } else {
         # set up bindings for rotation with mouse
-        bind $itk_component(3dview) <ButtonPress-1> \
+        bind $itk_component(view) <ButtonPress-1> \
             [itcl::code $this Rotate click %x %y]
-        bind $itk_component(3dview) <B1-Motion> \
+        bind $itk_component(view) <B1-Motion> \
             [itcl::code $this Rotate drag %x %y]
-        bind $itk_component(3dview) <ButtonRelease-1> \
+        bind $itk_component(view) <ButtonRelease-1> \
             [itcl::code $this Rotate release %x %y]
 
         # set up bindings for panning with mouse
-        bind $itk_component(3dview) <ButtonPress-2> \
+        bind $itk_component(view) <ButtonPress-2> \
             [itcl::code $this Pan click %x %y]
-        bind $itk_component(3dview) <B2-Motion> \
+        bind $itk_component(view) <B2-Motion> \
             [itcl::code $this Pan drag %x %y]
-        bind $itk_component(3dview) <ButtonRelease-2> \
+        bind $itk_component(view) <ButtonRelease-2> \
             [itcl::code $this Pan release %x %y]
 
         # scroll wheel zoom
         if {[string equal "x11" [tk windowingsystem]]} {
-            bind $itk_component(3dview) <4> [itcl::code $this Zoom out 2]
-            bind $itk_component(3dview) <5> [itcl::code $this Zoom in 2]
+            bind $itk_component(view) <4> [itcl::code $this Zoom out 2]
+            bind $itk_component(view) <5> [itcl::code $this Zoom in 2]
         }
     }
 
     # Set up bindings for panning with keyboard
-    bind $itk_component(3dview) <KeyPress-Left> \
+    bind $itk_component(view) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
-    bind $itk_component(3dview) <KeyPress-Right> \
+    bind $itk_component(view) <KeyPress-Right> \
         [itcl::code $this Pan set 10 0]
-    bind $itk_component(3dview) <KeyPress-Up> \
+    bind $itk_component(view) <KeyPress-Up> \
         [itcl::code $this Pan set 0 -10]
-    bind $itk_component(3dview) <KeyPress-Down> \
+    bind $itk_component(view) <KeyPress-Down> \
         [itcl::code $this Pan set 0 10]
-    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+    bind $itk_component(view) <Shift-KeyPress-Left> \
         [itcl::code $this Pan set -50 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+    bind $itk_component(view) <Shift-KeyPress-Right> \
         [itcl::code $this Pan set 50 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+    bind $itk_component(view) <Shift-KeyPress-Up> \
         [itcl::code $this Pan set 0 -50]
-    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+    bind $itk_component(view) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 50]
 
     # Set up bindings for zoom with keyboard
-    bind $itk_component(3dview) <KeyPress-Prior> \
+    bind $itk_component(view) <KeyPress-Prior> \
         [itcl::code $this Zoom out 2]
-    bind $itk_component(3dview) <KeyPress-Next> \
+    bind $itk_component(view) <KeyPress-Next> \
         [itcl::code $this Zoom in 2]
 
-    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
-
-    bind $itk_component(3dview) <Configure> \
+    bind $itk_component(view) <Enter> "focus $itk_component(view)"
+
+    bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
-    bind $itk_component(3dview) <Unmap> \
+    bind $itk_component(view) <Unmap> \
         [itcl::code $this Unmap]
-    bind $itk_component(3dview) <Map> \
+    bind $itk_component(view) <Map> \
         [itcl::code $this Map]
 
@@ -468 +462 @@
         }
         set _dobj2raise($dataobj) $params(-raise)
-        debug "setting parameters for $dataobj"
+        DebugTrace "setting parameters for $dataobj"
 
         if { [isconnected] } {
@@ -726 +720 @@
 
 itcl::body Rappture::MolvisViewer::SendCmd { cmd } {
-    debug "cmd: ($cmd)"
+    DebugTrace "cmd: ($cmd)"
 
     if { $_state(server) != $_state(client) } {
@@ -758 +752 @@
     }
     set data [ReceiveBytes $size]
-    #debug "success: reading $size bytes from proxy"
+    #DebugTrace "success: reading $size bytes from proxy"
     if { [string match "print*" $cacheid] } {
         # $frame is the token that we sent to the proxy.
@@ -765 +759 @@
     } else {
         set _imagecache($tag) $data
-        #debug "CACHED: $tag,$cacheid"
+        #DebugTrace "CACHED: $tag,$cacheid"
         $_image(plot) configure -data $data
         set _image(id) $tag
@@ -872 +866 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::Rebuild {} {
-    debug "Enter"
+    DebugTrace "Enter"
     set changed 0
 
@@ -1112 +1106 @@
         # Set or restore viewing parameters.  We do this for the first
         # model and assume this works for everything else.
-        set w  [winfo width $itk_component(3dview)]
-        set h  [winfo height $itk_component(3dview)]
+        set w  [winfo width $itk_component(view)]
+        set h  [winfo height $itk_component(view)]
         SendCmd "reset"
         SendCmd "screen $w $h"
@@ -1119 +1113 @@
         SendCmd "pan $_view(xpan) $_view(ypan)"
         SendCmd "zoom $_view(zoom)"
-        debug "rotate $_view(mx) $_view(my) $_view(mz)"
+        DebugTrace "rotate $_view(mx) $_view(my) $_view(mz)"
 
         SendCmd "raw -defer {zoom complete=1}"
@@ -1151 +1145 @@
     blt::busy release $itk_component(hull)
 
-    debug "Exit"
+    DebugTrace "Exit"
 }
 
@@ -1246 +1240 @@
     }
     if { $option == "click" } {
-        $itk_component(3dview) configure -cursor hand1
+        $itk_component(view) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
@@ -1259 +1253 @@
     set _mevent(y) $y
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1313 +1307 @@
         unset _rocker(afterid)
     }
-    if { ![winfo viewable $itk_component(3dview)] } {
+    if { ![winfo viewable $itk_component(view)] } {
         return
     }
@@ -1385 +1379 @@
     }
     if { $option == "click" } {
-        $itk_component(3dview) configure -cursor fleur
+        $itk_component(view) configure -cursor fleur
     }
     if { $option == "drag" || $option == "release" } {
@@ -1394 +1388 @@
             return
         }
-        set w [winfo width $itk_component(3dview)]
-        set h [winfo height $itk_component(3dview)]
+        set w [winfo width $itk_component(view)]
+        set h [winfo height $itk_component(view)]
         if {$w <= 0 || $h <= 0} {
             return
@@ -1430 +1424 @@
         #SendCmd "rotate $mx $my $mz"
         EventuallyRotate $mx $my $mz
-        debug "rotate $_view(mx) $_view(my) $_view(mz)"
+        DebugTrace "rotate $_view(mx) $_view(my) $_view(mz)"
     }
     set _mevent(x) $x
@@ -1436 +1430 @@
     set _mevent(time) $now
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1458 +1452 @@
     switch -- $option {
         click {
-            $itk_component(3dview) configure -cursor fleur
+            $itk_component(view) configure -cursor fleur
             set _click(x) $x
             set _click(y) $y
@@ -1468 +1462 @@
                 Rotate.old click $x $y
             } else {
-                set w [winfo width $itk_component(3dview)]
-                set h [winfo height $itk_component(3dview)]
+                set w [winfo width $itk_component(view)]
+                set h [winfo height $itk_component(view)]
                 if {$w <= 0 || $h <= 0} {
                     return
@@ -1527 +1521 @@
                 EventuallyRotate $a $b $c
                 #SendCmd "rotate $a $b $c"
-                debug "x,y: $x $y: rotate $_view(vx) $_view(vy) $_view(vz)"
+                DebugTrace "x,y: $x $y: rotate $_view(vx) $_view(vy) $_view(vz)"
                 set _click(x) $x
                 set _click(y) $y
@@ -1534 +1528 @@
         release {
             Rotate.old drag $x $y
-            $itk_component(3dview) configure -cursor ""
+            $itk_component(view) configure -cursor ""
             catch {unset _click}
         }
@@ -1692 +1686 @@
     DoResize
     SendCmd "rotate $_view(mx) $_view(my) $_view(mz)"
-    debug "rotate $_view(mx) $_view(my) $_view(mz)"
+    DebugTrace "rotate $_view(mx) $_view(my) $_view(mz)"
     SendCmd "pan $_view(xpan) $_view(ypan)"
     SendCmd "zoom $_view(zoom)"

branches/uq/gui/scripts/nanovisviewer.tcl

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -153 +153 @@
     set _serverType "nanovis"
 
-    # Draw legend event
+    #DebugOn
+    EnableWaitDialog 900
+
+    # Rebuild event
+    $_dispatcher register !rebuild
+    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
+
+    # Resize event
+    $_dispatcher register !resize
+    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
+
+    # Legend event
     $_dispatcher register !legend
     $_dispatcher dispatch $this !legend "[itcl::code $this FixLegend]; list"
@@ -161 +172 @@
     $_dispatcher dispatch $this !send_transfunc \
         "[itcl::code $this SendTransferFunctions]; list"
-
-    # Rebuild event
-    $_dispatcher register !rebuild
-    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
-
-    # Resize event
-    $_dispatcher register !resize
-    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
     #
@@ -179 +182 @@
     # Initialize the view to some default parameters.
     array set _view {
-        -qw      0.853553
-        -qx      -0.353553
-        -qy      0.353553
-        -qz      0.146447
-        -xpan    0
-        -ypan    0
-        -zoom    1.0
+        -qw       0.853553
+        -qx       -0.353553
+        -qy       0.353553
+        -qz       0.146447
+        -xpan     0
+        -ypan     0
+        -zoom     1.0
     }
     set _arcball [blt::arcball create 100 100]
@@ -192 +195 @@
     set _limits(vmin) 0.0
     set _limits(vmax) 1.0
-    set _reset 1
 
     array set _settings [subst {
@@ -223 +225 @@
     }]
 
-    itk_component add 3dview {
+    itk_component add view {
         label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
@@ -230 +232 @@
         ignore -highlightthickness -borderwidth  -background
     }
-    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
+    bind $itk_component(view) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -274 +276 @@
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -command [itcl::code $this AdjustSetting -volume] \
-            -variable [itcl::scope _settings(-volume)]
+            -variable [itcl::scope _settings(-volume)] \
+            -command [itcl::code $this AdjustSetting -volume]
     }
     $itk_component(volume) select
@@ -319 +321 @@
     # the server.  So the panewindow uses the tiny size.
     set w 10000
-    pack forget $itk_component(3dview)
+    pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(3dview) -fill both -reqwidth $w \
+        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(3dview) <ButtonPress-1> \
+    bind $itk_component(view) <ButtonPress-1> \
         [itcl::code $this Rotate click %x %y]
-    bind $itk_component(3dview) <B1-Motion> \
+    bind $itk_component(view) <B1-Motion> \
         [itcl::code $this Rotate drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-1> \
+    bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
-    bind $itk_component(3dview) <Configure> \
+    bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
 
     # Bindings for panning via mouse
-    bind $itk_component(3dview) <ButtonPress-2> \
+    bind $itk_component(view) <ButtonPress-2> \
         [itcl::code $this Pan click %x %y]
-    bind $itk_component(3dview) <B2-Motion> \
+    bind $itk_component(view) <B2-Motion> \
         [itcl::code $this Pan drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-2> \
+    bind $itk_component(view) <ButtonRelease-2> \
         [itcl::code $this Pan release %x %y]
 
     # Bindings for panning via keyboard
-    bind $itk_component(3dview) <KeyPress-Left> \
+    bind $itk_component(view) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
-    bind $itk_component(3dview) <KeyPress-Right> \
+    bind $itk_component(view) <KeyPress-Right> \
         [itcl::code $this Pan set 10 0]
-    bind $itk_component(3dview) <KeyPress-Up> \
+    bind $itk_component(view) <KeyPress-Up> \
         [itcl::code $this Pan set 0 -10]
-    bind $itk_component(3dview) <KeyPress-Down> \
+    bind $itk_component(view) <KeyPress-Down> \
         [itcl::code $this Pan set 0 10]
-    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+    bind $itk_component(view) <Shift-KeyPress-Left> \
         [itcl::code $this Pan set -2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+    bind $itk_component(view) <Shift-KeyPress-Right> \
         [itcl::code $this Pan set 2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+    bind $itk_component(view) <Shift-KeyPress-Up> \
         [itcl::code $this Pan set 0 -2]
-    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+    bind $itk_component(view) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 2]
 
     # Bindings for zoom via keyboard
-    bind $itk_component(3dview) <KeyPress-Prior> \
+    bind $itk_component(view) <KeyPress-Prior> \
         [itcl::code $this Zoom out]
-    bind $itk_component(3dview) <KeyPress-Next> \
+    bind $itk_component(view) <KeyPress-Next> \
         [itcl::code $this Zoom in]
 
-    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+    bind $itk_component(view) <Enter> "focus $itk_component(view)"
 
     if {[string equal "x11" [tk windowingsystem]]} {
         # Bindings for zoom via mouse
-        bind $itk_component(3dview) <4> [itcl::code $this Zoom out]
-        bind $itk_component(3dview) <5> [itcl::code $this Zoom in]
+        bind $itk_component(view) <4> [itcl::code $this Zoom out]
+        bind $itk_component(view) <5> [itcl::code $this Zoom in]
     }
 
@@ -378 +380 @@
 
     eval itk_initialize $args
-
-    EnableWaitDialog 900
     Connect
 }
@@ -435 +435 @@
 # ----------------------------------------------------------------------
 # USAGE: get ?-objects?
-# USAGE: get ?-image 3dview|legend?
+# USAGE: get ?-image view|legend?
 #
 # Clients use this to query the list of objects being plotted, in
@@ -465 +465 @@
         -image {
             if {[llength $args] != 2} {
-                error "wrong # args: should be \"get -image 3dview|legend\""
+                error "wrong # args: should be \"get -image view|legend\""
             }
             switch -- [lindex $args end] {
-                3dview {
+                view {
                     return $_image(plot)
                 }
@@ -475 +475 @@
                 }
                 default {
-                    error "bad image name \"[lindex $args end]\": should be 3dview or legend"
+                    error "bad image name \"[lindex $args end]\": should be view or legend"
                 }
             }
@@ -488 +488 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::delete {args} {
@@ -647 +646 @@
         }
 
-        set w [winfo width $itk_component(3dview)]
-        set h [winfo height $itk_component(3dview)]
+        set w [winfo width $itk_component(view)]
+        set h [winfo height $itk_component(view)]
         EventuallyResize $w $h
     }
@@ -657 +656 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+# Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::NanovisViewer::isconnected {} {
@@ -673 +672 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+# Clients use this method to disconnect from the current rendering server.
 #
 itcl::body Rappture::NanovisViewer::Disconnect {} {
@@ -814 +812 @@
 # ReceiveLegend --
 #
-#       The procedure is the response from the render server to each "legend"
-#       command.  The server sends back a "legend" command invoked our
-#       the slave interpreter.  The purpose is to collect data of the image
-#       representing the legend in the canvas.  In addition, the
-#       active transfer function is displayed.
+# The procedure is the response from the render server to each "legend"
+# command.  The server sends back a "legend" command invoked our
+# the slave interpreter.  The purpose is to collect data of the image
+# representing the legend in the canvas.  In addition, the
+# active transfer function is displayed.
 #
 itcl::body Rappture::NanovisViewer::ReceiveLegend { tf vmin vmax size } {
@@ -834 +832 @@
 # ReceiveData --
 #
-#       The procedure is the response from the render server to each "data
-#       follows" command.  The server sends back a "data" command invoked our
-#       the slave interpreter.  The purpose is to collect the min/max of the
-#       volume sent to the render server.  Since the client (nanovisviewer)
-#       doesn't parse 3D data formats, we rely on the server (nanovis) to
-#       tell us what the limits are.  Once we've received the limits to all
-#       the data we've sent (tracked by _recvdDatasets) we can then determine
-#       what the transfer functions are for these volumes.
+# The procedure is the response from the render server to each "data
+# follows" command.  The server sends back a "data" command invoked our
+# the slave interpreter.  The purpose is to collect the min/max of the
+# volume sent to the render server.  Since the client (nanovisviewer)
+# doesn't parse 3D data formats, we rely on the server (nanovis) to
+# tell us what the limits are.  Once we've received the limits to all
+# the data we've sent (tracked by _recvdDatasets) we can then determine
+# what the transfer functions are for these volumes.
 #
 #
@@ -893 +891 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::Rebuild {} {
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $w < 2 || $h < 2 } {
         update
@@ -1004 +1002 @@
             }
         }
+        set _reset 0
     }
 
@@ -1025 +1024 @@
     StopBufferingCommands
     blt::busy release $itk_component(hull)
-    set _reset 0
 }
 
@@ -1123 +1121 @@
     switch -- $option {
         click {
-            $itk_component(3dview) configure -cursor fleur
+            $itk_component(view) configure -cursor fleur
             set _click(x) $x
             set _click(y) $y
@@ -1131 +1129 @@
                 Rotate click $x $y
             } else {
-                set w [winfo width $itk_component(3dview)]
-                set h [winfo height $itk_component(3dview)]
+                set w [winfo width $itk_component(view)]
+                set h [winfo height $itk_component(view)]
                 if {$w <= 0 || $h <= 0} {
                     return
@@ -1159 +1157 @@
         release {
             Rotate drag $x $y
-            $itk_component(3dview) configure -cursor ""
+            $itk_component(view) configure -cursor ""
             catch {unset _click}
         }
@@ -1178 +1176 @@
 itcl::body Rappture::NanovisViewer::Pan {option x y} {
     # Experimental stuff
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $option == "set" } {
         set x [expr $x / double($w)]
@@ -1193 +1191 @@
         set _click(x) $x
         set _click(y) $y
-        $itk_component(3dview) configure -cursor hand1
+        $itk_component(view) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
@@ -1207 +1205 @@
     }
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1273 +1271 @@
             if { $_settings($what) } {
                 blt::table $itk_component(plotarea) \
-                    0,0 $itk_component(3dview) -fill both \
+                    0,0 $itk_component(view) -fill both \
                     1,0 $itk_component(legend) -fill x
                 blt::table configure $itk_component(plotarea) r1 -resize none
@@ -1371 +1369 @@
 # NameTransferFunction --
 #
-#       Creates a transfer function name based on the <style> settings in the
-#       library run.xml file. This placeholder will be used later to create
-#       and send the actual transfer function once the data info has been sent
-#       to us by the render server. [We won't know the volume limits until the
-#       server parses the 3D data and sends back the limits via ReceiveData.]
+# Creates a transfer function name based on the <style> settings in the
+# library run.xml file. This placeholder will be used later to create
+# and send the actual transfer function once the data info has been sent
+# to us by the render server. [We won't know the volume limits until the
+# server parses the 3D data and sends back the limits via ReceiveData.]
 #
 #       FIXME: The current way we generate transfer-function names completely
@@ -1398 +1396 @@
 # ComputeTransferFunction --
 #
-#       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 been set up.  Both parts are
-#       needed to compute the relative value (location) of the marker, and
-#       the alpha map of the transfer function.
+# 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 been set up.  Both parts are
+# needed to compute the relative value (location) of the marker, and
+# the alpha map of the transfer function.
 #
 itcl::body Rappture::NanovisViewer::ComputeTransferFunction { tf } {

branches/uq/gui/scripts/visviewer.tcl

@@ -43 +43 @@
     #private variable _idleTimeout 0;       # No timeout
 
+    protected variable _debug 0
     protected variable _serverType "???";# Type of server.
     protected variable _sid ""      ;   # socket connection to server
@@ -84 +85 @@
     protected method ColorsToColormap { colors }
     protected method Connect { servers }
+    protected method DebugOff {} {
+        set _debug 0
+    }
+    protected method DebugOn {} {
+        set _debug 1
+    }
+    protected method DebugTrace { args } {
+        if { $_debug } {
+            puts stderr "[info level -1]: $args"
+        }
+    }
     protected method DisableWaitDialog {}
     protected method Disconnect {}

branches/uq/gui/scripts/vtkglyphviewer.tcl

@@ -132 +132 @@
     private variable _start 0
     private variable _title ""
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -143 +140 @@
     private variable _field      ""
     private variable _colorMode "vmag"; #  Mode of colormap (vmag or scalar)
-    private variable _fieldNames {}
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -1552 +1551 @@
     }
     # Set the legend on the first heightmap dataset.
-    if { $_currentColormap != ""  } {
+    if { $_currentColormap != "" } {
         set cmap $_currentColormap
         if { ![info exists _colormaps($cmap)] } {

branches/uq/gui/scripts/vtkheightmapviewer.tcl

@@ -143 +143 @@
     private variable _isolines
     private variable _contourList ""
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -153 +150 @@
     private variable _rotatePending 0
     private variable _legendPending 0
-    private variable _fieldNames {}
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
     private variable _colorMode "scalar";#  Mode of colormap (vmag or scalar)
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -942 +941 @@
         # controls on the axis settings tab if necessary.
         # -Leif
-        SendCmd "axis exp 0 0 0 1"
+        #SendCmd "axis exp 0 0 0 1"
 
         SendCmd "axis lrot z 90"
@@ -1042 +1041 @@
     if { $_reset } {
         SendCmd "axis tickpos outside"
-        SendCmd "axis lformat all %g"
+        #SendCmd "axis lformat all %g"
 
         foreach axis { x y z } {
@@ -1490 +1489 @@
             ResetAxes
             SendCmd "dataset scalar $_curFldName"
-            SendCmd "heightmap colormode scalar $_curFldName"
+            SendCmd "heightmap colormode $_colorMode $_curFldName"
+            UpdateContourList
+            SendCmd "heightmap contourlist [list $_contourList]"
             Zoom reset
-            UpdateContourList
             DrawLegend
         }
@@ -1724 +1724 @@
     }
     # Set the legend on the first heightmap dataset.
-    if { $_currentColormap != ""  } {
+    if { $_currentColormap != "" } {
         set cmap $_currentColormap
         if { ![info exists _colormaps($cmap)] } {

branches/uq/gui/scripts/vtkimageviewer.tcl

@@ -138 +138 @@
     private variable _isolines
     private variable _contourList ""
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -148 +145 @@
     private variable _rotatePending 0
     private variable _legendPending 0
-    private variable _fieldNames {}
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
     private variable _colorMode "scalar";#  Mode of colormap (vmag or scalar)
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 

branches/uq/gui/scripts/vtkisosurfaceviewer.tcl

@@ -153 +153 @@
     private variable _currentLimits ""
     private variable _widget
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -164 +161 @@
     private variable _field      ""
     private variable _colorMode "scalar";   #  Mode of colormap (vmag or scalar)
-    private variable _fieldNames {}
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
-
     private variable _mouseOver "";     # what called LegendRangeAction, vmin or vmax
     private variable _customRangeClick 1;   # what called ToggleCustomRange
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -1670 +1668 @@
     }
     # Set the legend on the first isosurface dataset.
-    if { $_currentColormap != ""  } {
+    if { $_currentColormap != "" } {
         set cmap $_currentColormap
         if { ![info exists _colormaps($cmap)] } {

branches/uq/gui/scripts/vtkmeshviewer.tcl

@@ -113 +113 @@
     private variable _start 0
     private variable _title ""
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -123 +120 @@
     private variable _rotateDelay 150
     private variable _opacityDelay 150
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -860 +860 @@
     }
     if {"" != $_first} {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set view $location
-        }
-
         foreach axis { x y z } {
             set label [$_first label ${axis}]

branches/uq/gui/scripts/vtkstreamlinesviewer.tcl

@@ -66 +66 @@
     private method BuildAxisTab {}
     private method BuildCameraTab {}
-    private method BuildColormap { name colors }
+    private method BuildColormap { name }
     private method BuildCutplaneTab {}
     private method BuildDownloadPopup { widget command }
     private method BuildStreamsTab {}
-    private method BuildVolumeTab {}
+    private method BuildSurfaceTab {}
     private method DrawLegend {}
     private method Combo { option }
@@ -102 +102 @@
     private method RequestLegend {}
     private method Rotate {option x y}
-    private method SetColormap { dataobj comp }
-    private method ChangeColormap { dataobj comp color }
+    private method SetCurrentColormap { color }
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp }
@@ -121 +120 @@
     private variable _colormaps    ;    # contains all the colormaps
                                    ;    # in the server.
-    private variable _dataset2style    ;# maps dataobj-component to transfunc
+    private variable _currentColormap ""
 
     private variable _click        ;    # info used for rotate operations
@@ -127 +126 @@
     private variable _view         ;    # view params for 3D view
     private variable _settings
-    private variable _style;            # Array of current component styles.
-    private variable _initialStyle;     # Array of initial component styles.
     private variable _reset 1;          # Connection to server has been reset.
 
@@ -135 +132 @@
     private variable _title ""
     private variable _seeds
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -145 +139 @@
     private variable _cutplanePending 0
     private variable _legendPending 0
-    private variable _vectorFields
-    private variable _scalarFields
     private variable _fields
     private variable _curFldName ""
@@ -153 +145 @@
     private variable _numSeeds 200
     private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -245 +240 @@
         -streamlinesnumseeds        200
         -streamlinesopacity         100
-        -streamlinesscale           1
+        -streamlineslength          70
         -streamlinesseedsvisible    0
         -streamlinesvisible         1
-        -volumeedges                0
-        -volumelighting             1
-        -volumeopacity              40
-        -volumevisible              1
-        -volumewireframe            0
+        -surfaceedges               0
+        -surfacelighting            1
+        -surfaceopacity             40
+        -surfacevisible             1
+        -surfacewireframe           0
         -xgrid                      0
         -ygrid                      0
@@ -330 +325 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    itk_component add volume {
-        Rappture::PushButton $f.volume \
+    itk_component add surface {
+        Rappture::PushButton $f.surface \
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -variable [itcl::scope _settings(-volumevisible)] \
-            -command [itcl::code $this AdjustSetting -volumevisible]
-    }
-    $itk_component(volume) select
-    Rappture::Tooltip::for $itk_component(volume) \
-        "Don't display the volume"
-    pack $itk_component(volume) -padx 2 -pady 2
+            -variable [itcl::scope _settings(-surfacevisible)] \
+            -command [itcl::code $this AdjustSetting -surfacevisible]
+    }
+    $itk_component(surface) select
+    Rappture::Tooltip::for $itk_component(surface) \
+        "Show/Hide the boundary surface"
+    pack $itk_component(surface) -padx 2 -pady 2
 
     itk_component add streamlines {
@@ -351 +346 @@
     $itk_component(streamlines) select
     Rappture::Tooltip::for $itk_component(streamlines) \
-        "Toggle the streamlines on/off"
+        "Show/Hide the streamlines"
     pack $itk_component(streamlines) -padx 2 -pady 2
 
@@ -362 +357 @@
     }
     Rappture::Tooltip::for $itk_component(cutplane) \
-        "Show/Hide cutplanes"
+        "Show/Hide the cutplanes"
     pack $itk_component(cutplane) -padx 2 -pady 2
 
-
     if { [catch {
-        BuildVolumeTab
+        BuildSurfaceTab
         BuildStreamsTab
         BuildCutplaneTab
@@ -852 +846 @@
     array unset _colormaps
     array unset _seeds
-    array unset _dataset2style
 }
 
@@ -1013 +1006 @@
     }
     if {"" != $_first} {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set view $location
-        }
         foreach axis { x y z } {
             set label [$_first hints ${axis}label]
@@ -1031 +1020 @@
         array unset _fields
         set _curFldName ""
+        set _curFldLabel ""
         foreach cname [$_first components] {
             foreach fname [$_first fieldnames $cname] {
@@ -1047 +1037 @@
                     -command [itcl::code $this Combo invoke]
                 set _fields($fname) [list $label $units $components]
-                if { $_curFldName == "" } {
+                if { $_curFldName == "" && $components == 3 } {
                     set _curFldName $fname
                     set _curFldLabel $label
@@ -1061 +1051 @@
             -streamlineslighting \
             -streamlinescolormap -field \
-            -volumevisible -volumeedges -volumelighting -volumeopacity \
-            -volumewireframe \
+            -surfacevisible -surfaceedges -surfacelighting -surfaceopacity \
+            -surfacewireframe \
             -cutplanevisible \
             -cutplanexposition -cutplaneyposition -cutplanezposition \
@@ -1343 +1333 @@
             set bool $_settings($what)
             SendCmd "cutplane visible $bool"
+            if { $bool } {
+                Rappture::Tooltip::for $itk_component(cutplane) \
+                    "Hide the cutplanes"
+            } else {
+                Rappture::Tooltip::for $itk_component(cutplane) \
+                    "Show the cutplanes"
+            }
         }
         "-cutplanewireframe" {
@@ -1439 +1436 @@
             set colormap [$itk_component(colormap) value]
             set _settings($what) $colormap
-            foreach dataset [CurrentDatasets -visible $_first] {
-                foreach {dataobj comp} [split $dataset -] break
-                ChangeColormap $dataobj $comp $colormap
-            }
+            SetCurrentColormap $colormap
             set _legendPending 1
         }
@@ -1450 +1444 @@
             SendCmd "streamlines opacity $sval"
         }
-        "-streamlinesscale" {
+        "-streamlineslength" {
             set val $_settings($what)
-            set sval [expr { 0.01 * double($val) }]
-            SendCmd "streamlines scale $sval $sval $sval"
+            set sval [expr { (0.01 * double($val)) / 0.7 }]
+            foreach axis {x y z} {
+                foreach {min max} $_limits($axis) break
+                set ${axis}len [expr double($max) - double($min)]
+            }
+            set length [expr { $sval * ($xlen + $ylen + $zlen) } ]
+            SendCmd "streamlines length $length"
         }
         "-streamlineslighting" {
@@ -1459 +1458 @@
             SendCmd "streamlines lighting $bool"
         }
-        "-volumeopacity" {
+        "-surfaceopacity" {
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
             SendCmd "polydata opacity $sval"
         }
-        "-volumewireframe" {
+        "-surfacewireframe" {
             set bool $_settings($what)
             SendCmd "polydata wireframe $bool"
         }
-        "-volumevisible" {
+        "-surfacevisible" {
             set bool $_settings($what)
             SendCmd "polydata visible $bool"
             if { $bool } {
-                Rappture::Tooltip::for $itk_component(volume) \
-                    "Hide the volume"
+                Rappture::Tooltip::for $itk_component(surface) \
+                    "Hide the boundary surface"
             } else {
-                Rappture::Tooltip::for $itk_component(volume) \
-                    "Show the volume"
-            }
-        }
-        "-volumelighting" {
+                Rappture::Tooltip::for $itk_component(surface) \
+                    "Show the boundary surface"
+            }
+        }
+        "-surfacelighting" {
             set bool $_settings($what)
             SendCmd "polydata lighting $bool"
         }
-        "-volumeedges" {
+        "-surfaceedges" {
             set bool $_settings($what)
             SendCmd "polydata edges $bool"
@@ -1514 +1513 @@
     }
     # Set the legend on the first streamlines dataset.
-    foreach dataset [CurrentDatasets -visible $_first] {
-        foreach {dataobj comp} [split $dataset -] break
-        if { [info exists _dataset2style($dataset)] } {
-            SendCmd \
-                "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
-            break;
-        }
-    }
-}
-
-#
-# ChangeColormap --
-#
-itcl::body Rappture::VtkStreamlinesViewer::ChangeColormap {dataobj comp color} {
-    set tag $dataobj-$comp
-    if { ![info exist _style($tag)] } {
-        error "no initial colormap"
-    }
-    array set style $_style($tag)
-    set style(-color) $color
-    set _style($tag) [array get style]
-    SetColormap $dataobj $comp
-}
-
-#
-# SetColormap --
-#
-itcl::body Rappture::VtkStreamlinesViewer::SetColormap { dataobj comp } {
-    array set style {
-        -color BCGYR
-        -levels 6
-        -opacity 1.0
-    }
-    set tag $dataobj-$comp
-    if { ![info exists _initialStyle($tag)] } {
-        # Save the initial component style.
-        set _initialStyle($tag) [$dataobj style $comp]
-    }
-
-    # Override defaults with initial style defined in xml.
-    array set style $_initialStyle($tag)
-
-    if { ![info exists _style($tag)] } {
-        set _style($tag) [array get style]
-    }
-    # Override initial style with current style.
-    array set style $_style($tag)
-
-    set name "$style(-color):$style(-levels):$style(-opacity)"
+    if { $_currentColormap != "" } {
+        set cmap $_currentColormap
+        if { ![info exists _colormaps($cmap)] } {
+            BuildColormap $cmap
+            set _colormaps($cmap) 1
+        }
+        #SendCmd "legend $cmap $_colorMode $_curFldName {} $w $h 0"
+        SendCmd "legend2 $cmap $w $h"
+    }
+}
+
+#
+# SetCurrentColormap --
+#
+itcl::body Rappture::VtkStreamlinesViewer::SetCurrentColormap { name } {
+    # Keep track of the colormaps that we build.
     if { ![info exists _colormaps($name)] } {
-        BuildColormap $name [array get style]
+        BuildColormap $name
         set _colormaps($name) 1
     }
-    if { ![info exists _dataset2style($tag)] ||
-         $_dataset2style($tag) != $name } {
-        SendCmd "streamlines colormap $name $tag"
-        SendCmd "cutplane colormap $name $tag"
-        set _dataset2style($tag) $name
-    }
+    set _currentColormap $name
+    SendCmd "streamlines colormap $_currentColormap"
+    SendCmd "cutplane colormap $_currentColormap"
 }
 
@@ -1578 +1541 @@
 # BuildColormap --
 #
-itcl::body Rappture::VtkStreamlinesViewer::BuildColormap { name styles } {
-    array set style $styles
-    set cmap [ColorsToColormap $style(-color)]
+itcl::body Rappture::VtkStreamlinesViewer::BuildColormap { name } {
+    set cmap [ColorsToColormap $name]
     if { [llength $cmap] == 0 } {
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    if { ![info exists _settings(-volumeopacity)] } {
-        set _settings(-volumeopacity) $style(-opacity)
-    }
-    set max $_settings(-volumeopacity)
-
     set amap "0.0 1.0 1.0 1.0"
     SendCmd "colormap add $name { $cmap } { $amap }"
@@ -1615 +1572 @@
 }
 
-itcl::body Rappture::VtkStreamlinesViewer::BuildVolumeTab {} {
+itcl::body Rappture::VtkStreamlinesViewer::BuildSurfaceTab {} {
 
     set fg [option get $itk_component(hull) font Font]
@@ -1621 +1578 @@
 
     set inner [$itk_component(main) insert end \
-        -title "Volume Settings" \
+        -title "Boundary Surface Settings" \
         -icon [Rappture::icon volume-on]]
     $inner configure -borderwidth 4
 
-    checkbutton $inner.volume \
-        -text "Show Volume" \
-        -variable [itcl::scope _settings(-volumevisible)] \
-        -command [itcl::code $this AdjustSetting -volumevisible] \
+    checkbutton $inner.surface \
+        -text "Show Surface" \
+        -variable [itcl::scope _settings(-surfacevisible)] \
+        -command [itcl::code $this AdjustSetting -surfacevisible] \
         -font "Arial 9"
 
     checkbutton $inner.wireframe \
         -text "Show Wireframe" \
-        -variable [itcl::scope _settings(-volumewireframe)] \
-        -command [itcl::code $this AdjustSetting -volumewireframe] \
+        -variable [itcl::scope _settings(-surfacewireframe)] \
+        -command [itcl::code $this AdjustSetting -surfacewireframe] \
         -font "Arial 9"
 
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
-        -variable [itcl::scope _settings(-volumelighting)] \
-        -command [itcl::code $this AdjustSetting -volumelighting] \
+        -variable [itcl::scope _settings(-surfacelighting)] \
+        -command [itcl::code $this AdjustSetting -surfacelighting] \
         -font "Arial 9"
 
     checkbutton $inner.edges \
         -text "Show Edges" \
-        -variable [itcl::scope _settings(-volumeedges)] \
-        -command [itcl::code $this AdjustSetting -volumeedges] \
+        -variable [itcl::scope _settings(-surfaceedges)] \
+        -command [itcl::code $this AdjustSetting -surfaceedges] \
         -font "Arial 9"
 
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-volumeopacity)] \
+        -variable [itcl::scope _settings(-surfaceopacity)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumeopacity]
+        -command [itcl::code $this AdjustSetting -surfaceopacity]
 
     blt::table $inner \
@@ -1720 +1677 @@
         -command [itcl::code $this AdjustSetting -streamlinesnumseeds]
 
-    label $inner.scale_l -text "Scale" -font "Arial 9"
+    label $inner.scale_l -text "Length" -font "Arial 9"
     ::scale $inner.scale -from 1 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-streamlinesscale)] \
+        -variable [itcl::scope _settings(-streamlineslength)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -streamlinesscale]
+        -command [itcl::code $this AdjustSetting -streamlineslength]
 
     label $inner.field_l -text "Color by" -font "Arial 9"
@@ -1753 +1710 @@
         3,0 $inner.opacity_l   -anchor w -pady 2  \
         3,1 $inner.opacity     -fill x -pady 2 \
-        5,0 $inner.lighting    -anchor w -pady 2 -cspan 2 \
-        6,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
-        7,0 $inner.density_l   -anchor w -pady 2  \
-        7,1 $inner.density     -fill x   -pady 2  \
+        4,0 $inner.lighting    -anchor w -pady 2 -cspan 2 \
+        5,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
+        6,0 $inner.density_l   -anchor w -pady 2  \
+        6,1 $inner.density     -fill x   -pady 2  \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r10 c1 c2 -resize expand
+    blt::table configure $inner r7 c1 c2 -resize expand
 }
 
@@ -2135 +2092 @@
     # Parse style string.
     set tag $dataobj-$comp
-    set style [$dataobj style $comp]
-    array set settings {
-        -color \#808080
+    array set style {
+        -color BCGYR
+        -constcolor white
+        -edgecolor black
         -edges 0
-        -edgecolor black
+        -lighting 1
         -linewidth 1.0
-        -opacity 0.4
-        -wireframe 0
-        -lighting 1
+        -mode lines
+        -numseeds 200
+        -opacity 1.0
         -seeds 1
         -seedcolor white
+        -streamlineslength 0.7
+        -surfacecolor white
+        -surfaceedgecolor black
+        -surfaceedges 0
+        -surfacelighting 1
+        -surfaceopacity 0.4
+        -surfacevisible 1
+        -surfacewireframe 0
         -visible 1
     }
+    array set style [$dataobj style $comp]
     if { $dataobj != $_first } {
-        set settings(-opacity) 1
-    }
-    array set settings $style
+        set style(-opacity) 1.0
+    }
     StartBufferingCommands
     SendCmd "streamlines add $tag"
-    SendCmd "streamlines seed visible off $tag"
+    SendCmd "streamlines color [Color2RGB $style(-constcolor)] $tag"
+    SendCmd "streamlines edges $style(-edges) $tag"
+    SendCmd "streamlines linecolor [Color2RGB $style(-edgecolor)] $tag"
+    SendCmd "streamlines linewidth $style(-linewidth) $tag"
+    SendCmd "streamlines lighting $style(-lighting) $tag"
+    SendCmd "streamlines opacity $style(-opacity) $tag"
+    SendCmd "streamlines seed color [Color2RGB $style(-seedcolor)] $tag"
+    SendCmd "streamlines seed visible $style(-seeds) $tag"
+    SendCmd "streamlines visible $style(-visible) $tag"
     set seeds [$dataobj hints seeds]
     if { $seeds != "" && ![info exists _seeds($dataobj)] } {
         set length [string length $seeds]
-        SendCmd "streamlines seed fmesh 200 data follows $length $tag"
+        SendCmd "streamlines seed fmesh $style(-numseeds) data follows $length $tag"
         SendData $seeds
         set _seeds($dataobj) 1
     }
+    set _settings(-streamlineslighting) $style(-lighting)
+    $itk_component(streammode) value $style(-mode)
+    AdjustSetting -streamlinesmode
+    set _settings(-streamlinesnumseeds) $style(-numseeds)
+    set _settings(-streamlinesopacity) [expr $style(-opacity) * 100.0]
+    set _settings(-streamlineslength) [expr $style(-streamlineslength) * 100.0]
+    set _settings(-streamlinesseedsvisible) $style(-seeds)
+    set _settings(-streamlinesvisible) $style(-visible)
+
     SendCmd "cutplane add $tag"
+
     SendCmd "polydata add $tag"
+    SendCmd "polydata color [Color2RGB $style(-surfacecolor)] $tag"
     SendCmd "polydata colormode constant {} $tag"
-    set _settings(-volumeedges) $settings(-edges)
-    set _settings(-volumelighting) $settings(-lighting)
-    set _settings(-volumeopacity) $settings(-opacity)
-    set _settings(-volumewireframe) $settings(-wireframe)
-    set _settings(-volumeopacity) [expr $settings(-opacity) * 100.0]
+    SendCmd "polydata edges $style(-surfaceedges) $tag"
+    SendCmd "polydata linecolor [Color2RGB $style(-surfaceedgecolor)] $tag"
+    SendCmd "polydata lighting $style(-surfacelighting) $tag"
+    SendCmd "polydata opacity $style(-surfaceopacity) $tag"
+    SendCmd "polydata wireframe $style(-surfacewireframe) $tag"
+    SendCmd "polydata visible $style(-surfacevisible) $tag"
+    set _settings(-surfaceedges) $style(-surfaceedges)
+    set _settings(-surfacelighting) $style(-surfacelighting)
+    set _settings(-surfaceopacity) [expr $style(-surfaceopacity) * 100.0]
+    set _settings(-surfacewireframe) $style(-surfacewireframe)
+    set _settings(-surfacevisible) $style(-surfacevisible)
     StopBufferingCommands
-    SetColormap $dataobj $comp
+    SetCurrentColormap $style(-color)
+    $itk_component(colormap) value $style(-color)
 }
 

branches/uq/gui/scripts/vtksurfaceviewer.tcl

@@ -134 +134 @@
     private variable _isolines
     private variable _contourList ""
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -143 +140 @@
     private variable _legendPending 0
     private variable _field      ""
-    private variable _colorMode "scalar";        #  Mode of colormap (vmag or scalar)
-    private variable _fieldNames {}
+    private variable _colorMode "scalar"; #  Mode of colormap (vmag or scalar)
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -1322 +1321 @@
             #SendCmd "contour2d colormode $_colorMode $_curFldName"
             SendCmd "polydata colormode $_colorMode $_curFldName"
+            UpdateContourList
+            SendCmd "contour2d contourlist [list $_contourList]"
             SendCmd "camera reset"
-            UpdateContourList
             DrawLegend
         }
@@ -1465 +1465 @@
     }
     # Set the legend on the first heightmap dataset.
-    if { $_currentColormap != ""  } {
+    if { $_currentColormap != "" } {
         set cmap $_currentColormap
         if { ![info exists _colormaps($cmap)] } {
@@ -2333 +2333 @@
                 -activeforeground $itk_option(-plotforeground) \
                 -font "Arial 8" \
-                -command [itcl::code $this LegendTitleAction save]
+                -command [itcl::code $this Combo invoke]
             set _fields($fname) [list $label $units $components]
             if { $_curFldName == "" } {

branches/uq/gui/scripts/vtkviewer.tcl

@@ -67 +67 @@
     private method BuildAxisTab {}
     private method BuildCameraTab {}
-    private method BuildColormap { name styles }
+    private method BuildColormap { name }
     private method BuildCutawayTab {}
     private method BuildDownloadPopup { widget command }
@@ -147 +147 @@
     private variable _start 0
     private variable _title ""
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -162 +159 @@
     private variable _rotateDelay 150
     private variable _scaleDelay 100
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -1090 +1090 @@
     }
     if {"" != $_first} {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set view $location
-        }
-
         foreach axis { x y z } {
             set label [$_first hints ${axis}label]
@@ -1808 +1803 @@
     array set style {
         -color BCGYR
-        -levels 6
-        -opacity 1.0
     }
     if {[$dataobj type $comp] == "molecule"} {
@@ -1829 +1822 @@
     array set style $_style($tag)
 
-    if { $style(-color) == "elementDefault" } {
-        set name "$style(-color)"
-    } else {
-        set name "$style(-color):$style(-levels):$style(-opacity)"
-    }
+    set name "$style(-color)"
     if { ![info exists _colormaps($name)] } {
-        BuildColormap $name [array get style]
+        BuildColormap $name
         set _colormaps($name) 1
     }
@@ -1858 +1847 @@
 # BuildColormap --
 #
-itcl::body Rappture::VtkViewer::BuildColormap { name styles } {
-    if { $name ==  "elementDefault" } {
+itcl::body Rappture::VtkViewer::BuildColormap { name } {
+    if { $name == "elementDefault" } {
         return
     }
-    array set style $styles
-    set cmap [ColorsToColormap $style(-color)]
+    set cmap [ColorsToColormap $name]
     if { [llength $cmap] == 0 } {
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    if { ![info exists _settings(polydata-opacity)] } {
-        set _settings(polydata-opacity) $style(-opacity)
-    }
-    set max $_settings(polydata-opacity)
-
     set amap "0.0 1.0 1.0 1.0"
     SendCmd "colormap add $name { $cmap } { $amap }"
@@ -2665 +2648 @@
                 -normscale 0
                 -opacity 1.0
-                -orientGlyphs 0
+                -orientglyphs 0
                 -outline 0
                 -ptsize 1.0
                 -quality 1
-                -scaleMode "vcomp"
+                -scalemode "vcomp"
                 -shape "sphere"
                 -visible 1
@@ -2678 +2661 @@
             if {$shape != ""} {
                 set settings(-shape) $shape
+            }
+            # Backwards compat with camel case style option
+            if { [info exists settings(-orientGlyphs)] } {
+                set settings(-orientglyphs) $settings(-orientGlyphs)
+                array unset settings -orientGlyphs
+            }
+            # Backwards compat with camel case style option
+            if { [info exists settings(-scaleMode)] } {
+                set settings(-scalemode) $settings(-scaleMode)
+                array unset settings -scaleMode
             }
             SendCmd "outline add $tag"
@@ -2692 +2685 @@
             # Omitting field name for gorient and smode commands
             # defaults to active scalars or vectors depending on mode
-            SendCmd "glyphs gorient $settings(-orientGlyphs) {} $tag"
-            SendCmd "glyphs smode $settings(-scaleMode) {} $tag"
+            SendCmd "glyphs gorient $settings(-orientglyphs) {} $tag"
+            SendCmd "glyphs smode $settings(-scalemode) {} $tag"
             SendCmd "glyphs edges $settings(-edges) $tag"
             SendCmd "glyphs linecolor [Color2RGB $settings(-edgecolor)] $tag"

branches/uq/gui/scripts/vtkvolumeviewer.tcl

@@ -537 +537 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::delete {args} {
@@ -818 +817 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+# Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::VtkVolumeViewer::isconnected {} {
@@ -834 +833 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+# Clients use this method to disconnect from the current rendering server.
 #
 itcl::body Rappture::VtkVolumeViewer::Disconnect {} {
@@ -1029 +1027 @@
     }
     if {"" != $_first} {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set view $location
-        }
-
         foreach axis { x y z } {
             set label [$_first hints ${axis}label]
@@ -1319 +1312 @@
 # AdjustSetting --
 #
-#       Changes/updates a specific setting in the widget.  There are
-#       usually user-setable option.  Commands are sent to the render
-#       server.
+# Changes/updates a specific setting in the widget.  There are
+# usually user-setable option.  Commands are sent to the render
+# server.
 #
 itcl::body Rappture::VtkVolumeViewer::AdjustSetting {what {value ""}} {
@@ -1517 +1510 @@
 # RequestLegend --
 #
-#       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.
+# Request a new legend from the server.  The size of the legend
+# is determined from the height of the canvas.
 #
 itcl::body Rappture::VtkVolumeViewer::RequestLegend {} {
@@ -2414 +2407 @@
 # GetDatasetsWithComponent --
 #
-#       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::VtkVolumeViewer::GetDatasetsWithComponent { cname } {

branches/uq/src/core/Makefile.in

@@ -36 +36 @@
                   -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
 
-CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) 
-CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) 
+CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
+CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
 
 INCLUDES        = \
@@ -104 +104 @@
                 xerror.h
 
-# Build the scew and b64 libraries directly into Rappture for now.  
+# Build the scew and b64 libraries directly into Rappture for now.
 # Note: This works because of viewpath-ing. See the VPATH variable.
 B64_OBJS        = \
@@ -153 +153 @@
                 RpDXWriter.h \
                 RpDXWriterFInterface.h \
-                RpDXWriterFStubs.h 
+                RpDXWriterFStubs.h
 OBJS +=         \
                 RpDXWriter.o \
-                RpDXWriterFInterface.o 
+                RpDXWriterFInterface.o
 endif
 
@@ -192 +192 @@
 .cc.o:
         $(CXX) $(CXX_SWITCHES) -c $?
-.c.o: 
+.c.o:
         $(CCC) $(CC_SWITCHES) -c $?
 

branches/uq/src/core/RpBindingsDict.cc

@@ -26 +26 @@
  * function's caller.
  *
- * Returns the key of the object in the dictionary 
+ * Returns the key of the object in the dictionary
  * On Error, returns 0 (which also means nothing can be stored at 0)
  */
@@ -120 +120 @@
  * This function stores the RpUnits names specified by 'objectName'
  * into the UnitsStr dictionary. This is helpful for writing bindings
- * for languages that can not accept pointers to provide back to the 
+ * for languages that can not accept pointers to provide back to the
  * function's caller.
  *
@@ -152 +152 @@
  * This function retrieves the RpUnits name referenced to by 'objKey'
  * from the UnitsStr dictionary. This is helpful for writing bindings
- * for languages that can not accept pointers to provide back to the 
+ * for languages that can not accept pointers to provide back to the
  * function's caller.
  *

branches/uq/src/core/RpBuffer.cc

@@ -37 +37 @@
 {}
 
-
 /**
  * Construct an empty Buffer of specified size.
@@ -48 +47 @@
 {}
 
-
 /**
  * Construct a Buffer loaded with initial data.
@@ -89 +87 @@
 }
 
-
 Buffer
 Buffer::operator+(const Buffer& b) const
@@ -98 +95 @@
 }
 
-
 Buffer&
 Buffer::operator+=(const Buffer& b)
@@ -106 +102 @@
 }
 
-
 Buffer::~Buffer()
 {}
-
 
 bool
@@ -142 +136 @@
     }   
     // Read the file contents directly onto the end of the old buffer.
-    numBytesRead = fread((char *)bytes() + oldSize, sizeof(char), 
+    numBytesRead = fread((char *)bytes() + oldSize, sizeof(char),
         stat.st_size, f);
     fclose(f);
     if (numBytesRead != (size_t)stat.st_size) {
-        status.addError("can't read %ld bytes from \"%s\": %s", stat.st_size, 
+        status.addError("can't read %ld bytes from \"%s\": %s", stat.st_size,
                         path, strerror(errno));
         return false;
@@ -155 +149 @@
 }
 
-
-bool
-Buffer::dump (Outcome &status, const char* path)
+bool
+Buffer::dump(Outcome &status, const char* path)
 {
     status.addContext("Rappture::Buffer::dump()");
@@ -179 +172 @@
 }
 
-
 bool
 Buffer::encode(Outcome &status, unsigned int flags)
@@ -218 +210 @@
     return true;
 }
-
 
 bool
@@ -273 +264 @@
 }
 
-
-bool
-Buffer::do_compress(Outcome& status, SimpleCharBuffer& bin, 
+bool
+Buffer::do_compress(Outcome& status, SimpleCharBuffer& bin,
                     SimpleCharBuffer& bout)
 {
@@ -419 +409 @@
 }
 
-
 bool
 Buffer::do_base64_enc(Outcome& status, const SimpleCharBuffer& bin,
@@ -439 +428 @@
 }
 
-
 bool
 Buffer::do_base64_dec(Outcome& status, const SimpleCharBuffer& bin,
@@ -458 +446 @@
 }
 
-
-}
-
-
-
+}

branches/uq/src/core/RpBuffer.h

@@ -25 +25 @@
 };
 
-
 #ifdef __cplusplus
-    extern "C" {
+extern "C" {
 #endif // ifdef __cplusplus
 
@@ -44 +43 @@
  */
 
-class Buffer : public SimpleCharBuffer{
+class Buffer : public SimpleCharBuffer {
 public:
     Buffer();
@@ -74 +73 @@
 
     bool do_compress(Outcome& status, SimpleCharBuffer& bin,
-                     SimpleCharBuffer& bout  );
-    bool do_decompress( Outcome& status, SimpleCharBuffer& bin,
-                        SimpleCharBuffer& bout  );
+                     SimpleCharBuffer& bout);
+    bool do_decompress(Outcome& status, SimpleCharBuffer& bin,
+                       SimpleCharBuffer& bout);
     bool do_base64_enc(Outcome& status, const SimpleCharBuffer& bin,
-                       SimpleCharBuffer& bout  );
+                       SimpleCharBuffer& bout);
     bool do_base64_dec(Outcome& status, const SimpleCharBuffer& bin,
-                       SimpleCharBuffer& bout  );
+                       SimpleCharBuffer& bout);
 };
 
@@ -86 +85 @@
 
 #ifdef __cplusplus
-    }
+}
 #endif // ifdef __cplusplus
 

branches/uq/src/core/RpBufferCInterface.cc

@@ -249 +249 @@
         flags |= RPENC_B64;
     }
-    ((Rappture::Buffer*)buf->_buf)->encode(s, flags); 
-    RpOutcomeToCOutcome(&s,&status);
-    return status;
-}
-
-RapptureOutcome
-RapptureBufferDecode(RapptureBuffer* buf, int decompress, int base64 )
+    ((Rappture::Buffer*)buf->_buf)->encode(s, flags);
+    RpOutcomeToCOutcome(&s,&status);
+    return status;
+}
+
+RapptureOutcome
+RapptureBufferDecode(RapptureBuffer* buf, int decompress, int base64)
 {
     Rappture::Outcome s;
@@ -289 +289 @@
 
 #ifdef __cplusplus
-    }
+}
 #endif // ifdef __cplusplus

branches/uq/src/core/RpBufferCInterface.h

@@ -1 @@
-
 /*
  * ----------------------------------------------------------------------
@@ -12 +11 @@
  * ======================================================================
  */
-
 
 #ifndef _RAPPTURE_BUFFER_C_H
@@ -39 +37 @@
     bool (*decode)(Outcome &result, bool, bool);
     */
-}RapptureBuffer;
+} RapptureBuffer;
 
 int RapptureBufferInit(RapptureBuffer* buf);
@@ -53 +51 @@
 RapptureOutcome RapptureBufferDump(RapptureBuffer* buf, const char* filename);
 RapptureOutcome RapptureBufferEncode(RapptureBuffer* buf, int compress,
-        int base64 );
-RapptureOutcome RapptureBufferDecode(RapptureBuffer* buf, 
-        int decompress, int base64 );
+                                     int base64);
+RapptureOutcome RapptureBufferDecode(RapptureBuffer* buf,
+                                     int decompress, int base64);
 
 #ifdef __cplusplus

branches/uq/src/core/RpDict.h

@@ -22 +22 @@
 /**************************************************************************/
 
-template <  typename KeyType,
-            typename ValType,
-            class _Compare=std::equal_to<KeyType> >
+template <typename KeyType,
+          typename ValType,
+          class _Compare=std::equal_to<KeyType> >
     class RpDict;
 
-template <  typename KeyType,
-            typename ValType,
-            class _Compare=std::equal_to<KeyType> >
+template <typename KeyType,
+          typename ValType,
+          class _Compare=std::equal_to<KeyType> >
     class RpDictEntry;
 
-template <  typename KeyType,
-            typename ValType,
-            class _Compare=std::equal_to<KeyType> >
+template <typename KeyType,
+          typename ValType,
+          class _Compare=std::equal_to<KeyType> >
     class RpDictIterator;
-
 
 /*
@@ -48 +47 @@
  * because RpBindingsDict uses it.
  */
-
 
 /**************************************************************************/
@@ -93 +91 @@
     private:
 
-        RpDict<KeyType,ValType,_Compare>& 
-            tablePtr;                   /* pointer to the table we want to 
+        RpDict<KeyType,ValType,_Compare>&
+            tablePtr;                   /* pointer to the table we want to
                                          * iterate */
         int srchNextIndex;              /* Index of next bucket to be
                                          * enumerated after present one. */
-        RpDictEntry<KeyType,ValType,_Compare>* 
+        RpDictEntry<KeyType,ValType,_Compare>*
             srchNextEntryPtr;           /* Next entry to be enumerated in the
                                          * the current bucket. */
 
 };
-
 
 template <typename KeyType, typename ValType, class _Compare>
@@ -113 +110 @@
         // operator==(const RpDictEntry& entry) const;
         //
-        //operator!=(const RpDictEntry& lhs, const RpDictEntry& rhs) const 
+        //operator!=(const RpDictEntry& lhs, const RpDictEntry& rhs) const
         //{
         //    if (lhs.key != rhs.key)
@@ -189 +186 @@
 };
 
-
 template <typename KeyType, typename ValType, class _Compare>
 class RpDict
@@ -207 +203 @@
         //
         /*virtual*/ RpDict<KeyType,ValType,_Compare>&
-                        set(    KeyType& key,
-                                ValType& value,
-                                RpDictHint hint=NULL,
-                                int *newPtr=NULL,
-                                bool ci=false);
+                        set(KeyType& key,
+                            ValType& value,
+                            RpDictHint hint=NULL,
+                            int *newPtr=NULL,
+                            bool ci=false);
 
         // find an RpUnits object that should exist in RpUnitsTable
-        // 
+        //
         /*virtual*/ RpDictEntry<KeyType,ValType,_Compare>&
-                        find(   KeyType& key,
-                                RpDictHint hint = NULL,
-                                bool ci=false   );
-
-        /*virtual*/ RpDictEntry<KeyType,ValType,_Compare>& operator[]( KeyType& key)
+                        find(KeyType& key,
+                             RpDictHint hint = NULL,
+                             bool ci=false);
+
+        /*virtual*/ RpDictEntry<KeyType,ValType,_Compare>& operator[](KeyType& key)
         {
             return find(key,NULL);
         }
 
-        RpDict<KeyType,ValType,_Compare>& setCI( bool val );
+        RpDict<KeyType,ValType,_Compare>& setCI(bool val);
         bool getCI();
         RpDict<KeyType,ValType,_Compare>& toggleCI();
@@ -263 +259 @@
         }
 
-        // copy constructor 
+        // copy constructor
         // RpDict (const RpDict& dict);
 
@@ -283 +279 @@
         const int REBUILD_MULTIPLIER;
 
-        RpDictEntry<KeyType,ValType,_Compare> 
+        RpDictEntry<KeyType,ValType,_Compare>
                     **buckets;        /* Pointer to bucket array.  Each
                                        * element points to first entry in
@@ -314 +310 @@
 
         RpDictEntry<KeyType,ValType,_Compare>*
-            search( KeyType& key, RpDictHint hint = NULL, bool ci = false );
+            search(KeyType& key, RpDictHint hint = NULL, bool ci = false);
 
         // static void RpDict::RebuildTable ();
@@ -326 +322 @@
 };
 
-
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -340 +335 @@
  * Side Effects:
  *  none.
- * 
+ *
  *
  *************************************************************************/
-
 template <typename KeyType, typename ValType, class _Compare>
 int
@@ -350 +344 @@
     return numEntries;
 }
-
 
 /**************************************************************************
@@ -359 +352 @@
  *
  * Results:
- *  Returns a reference to the RpDict object allowing the user to chain 
+ *  Returns a reference to the RpDict object allowing the user to chain
  *  together different commands such as
  *      rpdict_obj.set(key).find(a).erase(a);
@@ -370 +363 @@
 template <typename KeyType, typename ValType, class _Compare>
 RpDict<KeyType,ValType,_Compare>&
-RpDict<KeyType,ValType,_Compare>::set(  KeyType& key,
-                                        ValType& value,
-                                        RpDictHint hint,
-                                        int* newPtr,
-                                        bool ci )
+RpDict<KeyType,ValType,_Compare>::set(KeyType& key,
+                                      ValType& value,
+                                      RpDictHint hint,
+                                      int* newPtr,
+                                      bool ci)
 {
     RpDictEntry<KeyType,ValType,_Compare> *hPtr = NULL;
@@ -466 +459 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 RpDictEntry<KeyType,ValType,_Compare>&
-RpDict<KeyType,ValType,_Compare>::find( KeyType& key,
-                                        RpDictHint hint,
-                                        bool ci )
+RpDict<KeyType,ValType,_Compare>::find(KeyType& key,
+                                       RpDictHint hint,
+                                       bool ci)
 {
     RpDictEntry<KeyType,ValType,_Compare> *hPtr = NULL;
@@ -503 +495 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 RpDictEntry<KeyType,ValType,_Compare>*
-RpDict<KeyType,ValType,_Compare>::search(   KeyType& key,
-                                            RpDictHint hint,
-                                            bool ci )
-                                            // bool ci,
-                                            // RpDictEntryList* entryList)
+RpDict<KeyType,ValType,_Compare>::search(KeyType& key,
+                                         RpDictHint hint,
+                                         bool ci)
+                                         // bool ci,
+                                         // RpDictEntryList* entryList)
 {
     RpDictEntry<KeyType,ValType,_Compare> *hPtr = NULL;
@@ -572 +563 @@
 }
 
-
-
 /**************************************************************************
  *
@@ -589 +578 @@
 /*
 template <typename KeyType,typename ValType,class _Compare>
-RpDict<KeyType,ValType,_Compare>& 
-RpDictIterator<KeyType,ValType,_Compare>::getTable() 
+RpDict<KeyType,ValType,_Compare>&
+RpDictIterator<KeyType,ValType,_Compare>::getTable()
 {
     return tablePtr;
@@ -606 +595 @@
  * Side Effects:
  *  moves iterator to the beginning of the hash table.
- * 
+ *
  *
  *************************************************************************/
@@ -630 +619 @@
  * Side Effects:
  *  moves iterator to the next entry of the hash table if it exists.
- * 
+ *
  *
  *************************************************************************/
-
 template <typename KeyType,typename ValType,class _Compare>
 RpDictEntry<KeyType,ValType,_Compare>*
@@ -669 +657 @@
 template <typename KeyType, typename ValType, class _Compare>
 RpDict<KeyType,ValType,_Compare>&
-RpDict<KeyType,ValType,_Compare>::setCI( bool val )
+RpDict<KeyType,ValType,_Compare>::setCI(bool val)
 {
     caseInsensitive = val;
@@ -764 +752 @@
     return *nullEntry;
 }
-
 
 /*
@@ -784 +771 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 void
@@ -794 +780 @@
 
     // check to see if the object is associated with a table
-    // if object is not associated with a table, there is no 
+    // if object is not associated with a table, there is no
     // need to try to remove it from the table.
     if (tablePtr) {
@@ -804 +790 @@
 
         // remove the entry from the buckets
-        // 
+        //
         // if entry is the first entry in the bucket
         // move the bucket to point to the next entry
@@ -812 +798 @@
         else {
             // if the entry is not the first entry in the bucket
-            // search for the entry 
+            // search for the entry
             for (prevPtr = *bucketPtr; ; prevPtr = prevPtr->nextPtr) {
 
@@ -821 +807 @@
                     prevPtr->nextPtr = nextPtr;
                     break;
-                } 
+                }
             } // end for loop
         } // end else
@@ -843 +829 @@
 }
 
-
 /*
  *----------------------------------------------------------------------
@@ -859 +844 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 const KeyType*
@@ -884 +868 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 const ValType*
@@ -907 +890 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 const ValType*
@@ -944 +926 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 bool
@@ -954 +935 @@
     return false;
 }
-
 
 /*************************************************************************/
@@ -978 +958 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 void
 RpDict<KeyType,ValType,_Compare>::RebuildTable()
 {
-    int oldSize=0, count=0, index=0; 
+    int oldSize=0, count=0, index=0;
     RpDictEntry<KeyType,ValType,_Compare> **oldBuckets = NULL;
     RpDictEntry<KeyType,ValType,_Compare> **oldChainPtr = NULL, **newChainPtr = NULL;
@@ -996 +975 @@
      */
 
-
     numBuckets *= 4;
 
@@ -1054 +1032 @@
  *----------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 unsigned int
@@ -1082 +1059 @@
  * I chose the one below (multiply by 9 and add new character)
  * because of the following reasons:
- * 
+ *
  * 1. Multiplying by 10 is perfect for keys that are decimal strings,
  *    and multiplying by 9 is just about as good.
@@ -1091 +1068 @@
  *    works well both for decimal and non-decimal strings.
  */
-
-
 template <typename KeyType, typename ValType, class _Compare>
 unsigned int
@@ -1158 +1133 @@
  * ---------------------------------------------------------------------
  */
-
 template <typename KeyType, typename ValType, class _Compare>
 int
@@ -1166 +1140 @@
 }
 
-
-
 #endif

branches/uq/src/core/b64/cdecode.h

@@ -24 +24 @@
 int base64_decode_value(char value_in);
 
-int base64_decode_block(const char* code_in, const int length_in, 
+int base64_decode_block(const char* code_in, const int length_in,
         char* plaintext_out, base64_decodestate* state_in);
 

branches/uq/src/core/b64/decode.h

@@ -22 +22 @@
     base64_decodestate _state;
     int _buffersize;
-    
+
     decoder(int buffersize_in = 4096)
         : _buffersize(buffersize_in)

branches/uq/src/core/b64/encode.h

@@ -15 +15 @@
 {
         
-        extern "C" 
+        extern "C"
         {
                 #include "cencode.h"

branches/uq/src/core/rappture_fortran.c

@@ -100 +100 @@
 #   define rp_lib_element_id       RP_LIB_ELEMENT_ID
 #   define rp_lib_element_type     RP_LIB_ELEMENT_TYPE
-#   define rp_lib_element_str      RP_LIB_ELEMENT_STR 
+#   define rp_lib_element_str      RP_LIB_ELEMENT_STR
 #   define rp_lib_element_obj      RP_LIB_ELEMENT_OBJ
 #   define rp_lib_child_num        RP_LIB_CHILD_NUM
@@ -130 +130 @@
 
 extern "C"
-void rp_lib_element_comp( int* handle, 
-                            char* path,
-                            char* retText,
-                            int path_len,
-                            int retText_len );
-
-extern "C"
-void rp_lib_element_id(   int* handle, 
-                            char* path,
-                            char* retText,
-                            int path_len,
-                            int retText_len );
-
-extern "C"
-void rp_lib_element_type( int* handle,
-                            char* path,
-                            char* retText,
-                            int path_len,
-                            int retText_len );
-
-extern "C"
-void rp_lib_element_str(  int* handle, 
-                            char* path, 
-                            char* flavor,
-                            char* retText,
-                            int path_len,
-                            int flavor_len,
-                            int retText_len );
-
-extern "C"
-int rp_lib_element_obj(   int* handle, 
-                            char* path,
-                            int path_len );
-
-extern "C"
-int rp_lib_child_num(    int* handle, 
-                            char* path, 
-                            int path_len);
-
-extern "C"
-int rp_lib_child_comp(   int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       );
-
-extern "C"
-int rp_lib_child_id(     int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       );
-
-extern "C"
-int rp_lib_child_type(   int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       );
-
-extern "C"
-int rp_lib_child_str(    int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* flavor,   /* information you want returned*/
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int flavor_len, /* length of flavor */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       );
-
-extern "C"
-int rp_lib_child_obj(    int* handle, 
-                            char* path, 
-                            char* type, 
-                            int path_len,
-                            int type_len
-                          );
-
-extern "C"
-void rp_lib_get(          int* handle, 
-                            char* path,
-                            char* retText,
-                            int path_len,
-                            int retText_len );
-
-extern "C"
-double rp_lib_get_double( int* handle, 
-                            char* path,
-                            int path_len);
-
-extern "C"
-void rp_lib_put_str(     int* handle, 
-                            char* path, 
-                            char* value, 
-                            int* append,
-                            int path_len,
-                            int value_len ); 
-
-extern "C"
-void rp_lib_put_id_str(  int* handle, 
-                            char* path, 
-                            char* value, 
-                            char* id, 
-                            int* append,
-                            int path_len,
-                            int value_len,
-                            int id_len ); 
-
-extern "C"
-void rp_lib_put_obj(     int* handle, 
-                            char* path, 
-                            int* valHandle, 
-                            int* append,
-                            int path_len ); 
-
-extern "C"
-void rp_lib_put_id_obj(  int* handle, 
-                            char* path, 
-                            int* valHandle, 
-                            char* id, 
-                            int* append,
-                            int path_len,
-                            int id_len ); 
-
-extern "C"
-int rp_lib_remove(       int* handle, 
-                            char* path, 
-                            int path_len);
-
-extern "C"
-int rp_lib_xml_len(      int* handle);
-
-extern "C"
-void rp_lib_xml(         int* handle, 
-                            char* retText, 
-                            int retText_len);
-
-extern "C"
-int rp_lib_write_xml(     int* handle, 
-                            char* outFile, 
-                            int outFile_len);
+void rp_lib_element_comp(int* handle,
+                         char* path,
+                         char* retText,
+                         int path_len,
+                         int retText_len);
+
+extern "C"
+void rp_lib_element_id(int* handle,
+                       char* path,
+                       char* retText,
+                       int path_len,
+                       int retText_len);
+
+extern "C"
+void rp_lib_element_type(int* handle,
+                         char* path,
+                         char* retText,
+                         int path_len,
+                         int retText_len);
+
+extern "C"
+void rp_lib_element_str(int* handle,
+                        char* path,
+                        char* flavor,
+                        char* retText,
+                        int path_len,
+                        int flavor_len,
+                        int retText_len);
+
+extern "C"
+int rp_lib_element_obj(int* handle,
+                       char* path,
+                       int path_len);
+
+extern "C"
+int rp_lib_child_num(int* handle,
+                     char* path,
+                     int path_len);
+
+extern "C"
+int rp_lib_child_comp(int* handle,    /* integer handle of library */
+                      char* path,     /* DOM path of requested object */
+                      char* type,     /* specific name of element */
+                      int* childNum,  /* child number for iteration */
+                      char* retText,  /* buffer to store return text */
+                      int path_len,   /* length of path */
+                      int type_len,   /* length of type */
+                      int retText_len /* length of return text buffer */
+                      );
+
+extern "C"
+int rp_lib_child_id(int* handle,    /* integer handle of library */
+                    char* path,     /* DOM path of requested object */
+                    char* type,     /* specific name of element */
+                    int* childNum,  /* child number for iteration */
+                    char* retText,  /* buffer to store return text */
+                    int path_len,   /* length of path */
+                    int type_len,   /* length of type */
+                    int retText_len /* length of return text buffer */
+                    );
+
+extern "C"
+int rp_lib_child_type(int* handle,    /* integer handle of library */
+                      char* path,     /* DOM path of requested object */
+                      char* type,     /* specific name of element */
+                      int* childNum,  /* child number for iteration */
+                      char* retText,  /* buffer to store return text */
+                      int path_len,   /* length of path */
+                      int type_len,   /* length of type */
+                      int retText_len /* length of return text buffer */
+                      );
+
+extern "C"
+int rp_lib_child_str(int* handle,    /* integer handle of library */
+                     char* path,     /* DOM path of requested object */
+                     char* flavor,   /* information you want returned*/
+                     char* type,     /* specific name of element */
+                     int* childNum,  /* child number for iteration */
+                     char* retText,  /* buffer to store return text */
+                     int path_len,   /* length of path */
+                     int flavor_len, /* length of flavor */
+                     int type_len,   /* length of type */
+                     int retText_len /* length of return text buffer */
+                     );
+
+extern "C"
+int rp_lib_child_obj(int* handle,
+                     char* path,
+                     char* type,
+                     int path_len,
+                     int type_len);
+
+extern "C"
+void rp_lib_get(int* handle,
+                char* path,
+                char* retText,
+                int path_len,
+                int retText_len);
+
+extern "C"
+double rp_lib_get_double(int* handle,
+                         char* path,
+                         int path_len);
+
+extern "C"
+void rp_lib_put_str(int* handle,
+                    char* path,
+                    char* value,
+                    int* append,
+                    int path_len,
+                    int value_len);
+
+extern "C"
+void rp_lib_put_id_str(int* handle,
+                       char* path,
+                       char* value,
+                       char* id,
+                       int* append,
+                       int path_len,
+                       int value_len,
+                       int id_len);
+
+extern "C"
+void rp_lib_put_obj(int* handle,
+                    char* path,
+                    int* valHandle,
+                    int* append,
+                    int path_len);
+
+extern "C"
+void rp_lib_put_id_obj(int* handle,
+                       char* path,
+                       int* valHandle,
+                       char* id,
+                       int* append,
+                       int path_len,
+                       int id_len);
+
+extern "C"
+int rp_lib_remove(int* handle,
+                  char* path,
+                  int path_len);
+
+extern "C"
+int rp_lib_xml_len(int* handle);
+
+extern "C"
+void rp_lib_xml(int* handle,
+                char* retText,
+                int retText_len);
+
+extern "C"
+int rp_lib_write_xml(int* handle,
+                     char* outFile,
+                     int outFile_len);
+
 extern "C"
 void rp_quit();
@@ -306 +306 @@
 
 // global vars
-// dictionary to hold the python objects that 
+// dictionary to hold the python objects that
 // cannot be sent to fortran
 
@@ -313 +313 @@
 int rapptureStarted = 0;
 
-void rp_init() {
+void rp_init()
+{
     //
     PyObject* rpClass = NULL;
     int retVal = 0;
-    
+
     // initialize the interpreter
     Py_Initialize();
@@ -329 +330 @@
 }
 
-int rp_lib(const char* filePath, int filePath_len) 
+int rp_lib(const char* filePath, int filePath_len)
 {
     PyObject* lib = NULL;
@@ -341 +342 @@
 
     inFilePath = null_terminate((char*)filePath, filePath_len);
-    
+
     // error checking to make sure inText is valid???
-    
+
     // grab the rappture class from the dictionary
     rpClass = getObject(0);
@@ -367 +368 @@
 
 int rp_lib_element_obj(int* handle,     /* integer handle of library */
-                          char* path,     /* null terminated path */
-                          int path_len
-                        )
+                       char* path,     /* null terminated path */
+                       int path_len)
 {
     int newObjHandle = -1;
@@ -388 +388 @@
             if (lib) {
                 retObj = (PyObject*) rpElement(lib, inPath, flavor);
-                
+
                 if (retObj) {
 
@@ -406 +406 @@
 }
 
-void rp_lib_element_comp( int* handle, /* integer handle of library */
-                            char* path,      /* null terminated path */
-                            char* retText,   /* return buffer for fortran*/
-                            int path_len,
-                            int retText_len /* length of return text buffer */
-                          )
+void rp_lib_element_comp(int* handle, /* integer handle of library */
+                         char* path,      /* null terminated path */
+                         char* retText,   /* return buffer for fortran*/
+                         int path_len,
+                         int retText_len /* length of return text buffer */
+                         )
 {
     char* inPath = NULL;
@@ -426 +426 @@
 
     rp_lib_element_str(handle,inPath,"component",retText,path_len,10,retText_len);
-    
-    if (inPath) {
-        free(inPath);
-        inPath = NULL;
-    }
-
-}
-
-void rp_lib_element_id(   int* handle, /* integer handle of library */
-                            char* path,      /* null terminated path */
-                            char* retText,   /* return buffer for fortran*/
-                            int path_len,
-                            int retText_len /* length of return text buffer */
-                        ) 
+
+    if (inPath) {
+        free(inPath);
+        inPath = NULL;
+    }
+
+}
+
+void rp_lib_element_id(int* handle, /* integer handle of library */
+                       char* path,      /* null terminated path */
+                       char* retText,   /* return buffer for fortran*/
+                       int path_len,
+                       int retText_len /* length of return text buffer */
+                       )
 {
     char* inPath = NULL;
@@ -459 +459 @@
 }
 
-void rp_lib_element_type( int* handle, /* integer handle of library */
-                            char* path,      /* null terminated path */
-                            char* retText,   /* return buffer for fortran*/
-                            int path_len,
-                            int retText_len /* length of return text buffer */
-                          )
+void rp_lib_element_type(int* handle, /* integer handle of library */
+                         char* path,      /* null terminated path */
+                         char* retText,   /* return buffer for fortran*/
+                         int path_len,
+                         int retText_len /* length of return text buffer */
+                         )
 {
     char* inPath = NULL;
@@ -483 +483 @@
 }
 
-void rp_lib_element_str(  int* handle, /* integer handle of library */
-                            char* path,      /* null terminated path */
-                            char* flavor,    /* null terminated flavor */
-                            char* retText,   /* return buffer for fortran*/
-                            int path_len,
-                            int flavor_len,
-                            int retText_len /* length of return text buffer */
+void rp_lib_element_str(int* handle, /* integer handle of library */
+                        char* path,      /* null terminated path */
+                        char* flavor,    /* null terminated flavor */
+                        char* retText,   /* return buffer for fortran*/
+                        int path_len,
+                        int flavor_len,
+                        int retText_len /* length of return text buffer */
                         )
 {
@@ -498 +498 @@
 
     PyObject* lib = NULL;
-    
+
     char* retObj = NULL;
-    
+
     char* inPath = NULL;
     char* inFlavor = NULL;
@@ -517 +517 @@
                     if (retObj) {
                         xmlText = retObj;
-                    
+
                         fortranify(xmlText, retText, retText_len);
-            
+
                         /*
                         length_in = strlen(xmlText);
@@ -534 +534 @@
                         *(retText+length_out-1) = ' ';
                         */
-                        
+
                         free(retObj);
                         retObj = NULL;
                     }
                     else {
-                        
+
                     }
                 }
@@ -546 +546 @@
         }
     }
-    
+
     if (inPath) {
         free(inPath);
@@ -559 +559 @@
 }
 
-int rp_lib_child_num( int* handle, 
-                         char* path, 
-                         int path_len
-                       )
+int rp_lib_child_num(int* handle,
+                     char* path,
+                     int path_len)
 {
     int numChildren = 0;
@@ -571 +570 @@
 
     inPath = null_terminate(path,path_len);
-    
+
     if (rapptureStarted) {
         if ((handle) && (*handle != 0)) {
@@ -583 +582 @@
                 }
                 else {
-                    
+
                 }
             }
@@ -599 +598 @@
 
 
-int rp_lib_child_comp (   int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       )
+int rp_lib_child_comp(int* handle,    /* integer handle of library */
+                      char* path,     /* DOM path of requested object */
+                      char* type,     /* specific name of element */
+                      int* childNum,  /* child number for iteration */
+                      char* retText,  /* buffer to store return text */
+                      int path_len,   /* length of path */
+                      int type_len,   /* length of type */
+                      int retText_len /* length of return text buffer */
+                      )
 {
     int retVal = 0;
@@ -631 +630 @@
     }
 
-    retVal = rp_lib_child_str( handle,
-                                 inPath,
-                                 "component",
-                                 inType,
-                                 childNum,
-                                 retText,
-                                 path_len,
-                                 10,
-                                 type_len,
-                                 retText_len
-                               );
+    retVal = rp_lib_child_str(handle,
+                              inPath,
+                              "component",
+                              inType,
+                              childNum,
+                              retText,
+                              path_len,
+                              10,
+                              type_len,
+                              retText_len);
 
     if (inPath) {
@@ -656 +654 @@
 }
 
-int rp_lib_child_id(   int* handle,    /* integer handle of library */
-                          char* path,     /* DOM path of requested object */
-                          char* type,     /* specific name of element */
-                          int* childNum,  /* child number for iteration */
-                          char* retText,  /* buffer to store return text */
-                          int path_len,   /* length of path */
-                          int type_len,   /* length of type */
-                          int retText_len /* length of return text buffer */
-                       )
+int rp_lib_child_id(int* handle,    /* integer handle of library */
+                    char* path,     /* DOM path of requested object */
+                    char* type,     /* specific name of element */
+                    int* childNum,  /* child number for iteration */
+                    char* retText,  /* buffer to store return text */
+                    int path_len,   /* length of path */
+                    int type_len,   /* length of type */
+                    int retText_len /* length of return text buffer */
+                    )
 {
     int retVal = 0;
@@ -687 +685 @@
     }
 
-    retVal = rp_lib_child_str( handle,
-                                 inPath,
-                                 "id",
-                                 inType,
-                                 childNum,
-                                 retText,
-                                 path_len,
-                                 3,
-                                 type_len,
-                                 retText_len
-                               );
+    retVal = rp_lib_child_str(handle,
+                              inPath,
+                              "id",
+                              inType,
+                              childNum,
+                              retText,
+                              path_len,
+                              3,
+                              type_len,
+                              retText_len);
 
     if (inPath) {
@@ -712 +709 @@
 }
 
-int rp_lib_child_type (   int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       )
+int rp_lib_child_type(int* handle,    /* integer handle of library */
+                      char* path,     /* DOM path of requested object */
+                      char* type,     /* specific name of element */
+                      int* childNum,  /* child number for iteration */
+                      char* retText,  /* buffer to store return text */
+                      int path_len,   /* length of path */
+                      int type_len,   /* length of type */
+                      int retText_len /* length of return text buffer */
+                      )
 {
     int retVal = 0;
@@ -743 +740 @@
     }
 
-    retVal = rp_lib_child_str( handle,
-                                 inPath,
-                                 "type",
-                                 inType,
-                                 childNum,
-                                 retText,
-                                 path_len,
-                                 5,
-                                 type_len,
-                                 retText_len
-                               );
+    retVal = rp_lib_child_str(handle,
+                              inPath,
+                              "type",
+                              inType,
+                              childNum,
+                              retText,
+                              path_len,
+                              5,
+                              type_len,
+                              retText_len);
 
     if (inPath) {
@@ -768 +764 @@
 }
 
-int rp_lib_child_str (    int* handle,    /* integer handle of library */
-                            char* path,     /* DOM path of requested object */
-                            char* flavor,   /* information you want returned*/
-                            char* type,     /* specific name of element */
-                            int* childNum,  /* child number for iteration */
-                            char* retText,  /* buffer to store return text */
-                            int path_len,   /* length of path */
-                            int flavor_len, /* length of flavor */
-                            int type_len,   /* length of type */
-                            int retText_len /* length of return text buffer */
-                       )
+int rp_lib_child_str(int* handle,    /* integer handle of library */
+                     char* path,     /* DOM path of requested object */
+                     char* flavor,   /* information you want returned*/
+                     char* type,     /* specific name of element */
+                     int* childNum,  /* child number for iteration */
+                     char* retText,  /* buffer to store return text */
+                     int path_len,   /* length of path */
+                     int flavor_len, /* length of flavor */
+                     int type_len,   /* length of type */
+                     int retText_len /* length of return text buffer */
+                     )
 {
     int retVal = 0;
@@ -787 +783 @@
     PyObject* list = NULL;
     PyObject* list_item = NULL;
-    
+
     char* xmlChild = NULL;
     char* inPath = NULL;
     char* inType = NULL;
     char* inFlavor = NULL;
-    
+
     inPath = null_terminate(path,path_len);
     inFlavor = null_terminate(flavor,flavor_len);
@@ -801 +797 @@
             lib = getObject(*handle);
             if (lib) {
-                if(objType(inFlavor) == 1) {
+                if (objType(inFlavor) == 1) {
 
                     list = rpChildren_f(lib, inPath, inFlavor);
@@ -832 +828 @@
                         }
                     }
-                    else {
-                        
-                    }
                 }
             }
@@ -855 +848 @@
     }
 
-
     return retVal;
 }
 
- int rp_lib_child_obj ( int* handle, 
-                            char* path, 
-                            char* type, 
-                            int path_len,
-                            int type_len
-                          )
+int rp_lib_child_obj(int* handle,
+                     char* path,
+                     char* type,
+                     int path_len,
+                     int type_len)
 {
     int newObjHandle = -1;
@@ -870 +861 @@
     PyObject* lib = NULL;
     PyObject* list = NULL;
-    
+
     char* inPath = NULL;
     char* inType = NULL;
@@ -880 +871 @@
         if ((handle) && (*handle != 0)) {
             lib = getObject(*handle);
-            
+
             if (lib) {
                 list = rpChildren_f(lib, inPath, "object");
@@ -889 +880 @@
                     // Py_DECREF(list);
                 }
-                else {
-                    
-                }
             }
         }
@@ -907 +895 @@
 
     return newObjHandle;
-
-}
-
-
-void rp_lib_get( int* handle, /* integer handle of library */
-                   char* path,      /* null terminated path */
-                   char* retText,   /* return text buffer for fortran*/
-                   int path_len,
-                   int retText_len /* length of return text buffer */
-                 )
+}
+
+
+void rp_lib_get(int* handle, /* integer handle of library */
+                char* path,      /* null terminated path */
+                char* retText,   /* return text buffer for fortran*/
+                int path_len,
+                int retText_len /* length of return text buffer */
+                )
 {
     // int length_in = 0;
@@ -924 +911 @@
 
     PyObject* lib = NULL;
-    
+
     char* inPath = NULL;
 
@@ -932 +919 @@
         if ((handle) && (*handle != 0)) {
             lib = getObject(*handle);
-            
+
             if (lib) {
-                // retObj is a borrowed object 
+                // retObj is a borrowed object
                 // whose contents must not be modified
                 xmlText = rpGet(lib, inPath);
-                
+
                 if (xmlText) {
 
                     fortranify(xmlText, retText, retText_len);
-                    
+
                     /*
                     length_in = strlen(xmlText);
@@ -957 +944 @@
                     */
                 }
-
             }
         }
@@ -966 +952 @@
         inPath = NULL;
     }
-
-}
-
-double rp_lib_get_double( int* handle,   /* integer handle of library */
-                            char* path,    /* null terminated path */
-                            int path_len
-                          )
+}
+
+double rp_lib_get_double(int* handle,   /* integer handle of library */
+                         char* path,    /* null terminated path */
+                         int path_len)
 {
     double retVal = 0.0;
@@ -978 +962 @@
 
     PyObject* lib = NULL;
-    
+
     char* inPath = NULL;
 
@@ -988 +972 @@
         if ((handle) && (*handle != 0)) {
             lib = getObject(*handle);
-            
+
             if (lib) {
-                // retObj is a borrowed object 
+                // retObj is a borrowed object
                 // whose contents must not be modified
                 xmlText = rpGet(lib, inPath);
-                
+
                 if (xmlText) {
                     retVal = atof(xmlText);
                 }
-
             }
         }
@@ -1011 +994 @@
 
 
-void rp_lib_put_str( int* handle, 
-                        char* path, 
-                        char* value, 
-                        int* append,
-                        int path_len,
-                        int value_len
-                      ) 
+void rp_lib_put_str(int* handle,
+                    char* path,
+                    char* value,
+                    int* append,
+                    int path_len,
+                    int value_len)
 {
     char* inPath = NULL;
@@ -1024 +1006 @@
     inPath = null_terminate(path,path_len);
     inValue = null_terminate(value,value_len);
-
 
     if (inPath) {
@@ -1054 +1035 @@
 
 
-void rp_lib_put_id_str ( int* handle, 
-                        char* path, 
-                        char* value, 
-                        char* id, 
-                        int* append,
-                        int path_len,
-                        int value_len,
-                        int id_len
-                      ) 
-{
-    PyObject* lib = NULL;
-    
+void rp_lib_put_id_str(int* handle,
+                       char* path,
+                       char* value,
+                       char* id,
+                       int* append,
+                       int path_len,
+                       int value_len,
+                       int id_len)
+{
+    PyObject* lib = NULL;
+
     char* inPath = NULL;
     char* inValue = NULL;
@@ -1077 +1057 @@
         if ((handle) && (*handle != 0)) {
             lib = getObject(*handle);
-            
+
             if (lib) {
                 rpPut(lib, inPath, inValue, inId, *append);
@@ -1098 +1078 @@
         inId = NULL;
     }
-
-}
-
-void rp_lib_put_obj( int* handle, 
-                        char* path, 
-                        int* valHandle, 
-                        int* append,
-                        int path_len
-                      ) 
+}
+
+void rp_lib_put_obj(int* handle,
+                    char* path,
+                    int* valHandle,
+                    int* append,
+                    int path_len)
 {
     char* inPath = NULL;
@@ -1125 +1103 @@
 }
 
-void rp_lib_put_id_obj ( int* handle, 
-                        char* path, 
-                        int* valHandle, 
-                        char* id, 
-                        int* append,
-                        int path_len,
-                        int id_len
-                      ) 
+void rp_lib_put_id_obj(int* handle,
+                       char* path,
+                       int* valHandle,
+                       char* id,
+                       int* append,
+                       int path_len,
+                       int id_len)
 {
     PyObject* lib = NULL;
     PyObject* value = NULL;
-    
+
     char* inPath = NULL;
     char* inId = NULL;
@@ -1147 +1124 @@
             lib = getObject(*handle);
             value = getObject(*valHandle);
-            
+
             if (lib && value) {
-                // retObj is a borrowed object 
+                // retObj is a borrowed object
                 // whose contents must not be modified
                 rpPutObj(lib, inPath, value, inId, *append);
@@ -1165 +1142 @@
         inId = NULL;
     }
-
-}
-
-int rp_lib_remove (int* handle, char* path, int path_len) 
+}
+
+int rp_lib_remove(int* handle, char* path, int path_len)
 {
     int newObjHandle = -1;
@@ -1174 +1150 @@
     PyObject* lib = NULL;
     PyObject* removedObj = NULL;
-    
+
     char* inPath = NULL;
 
@@ -1185 +1161 @@
             if (lib) {
                 removedObj = rpRemove(lib, inPath);
-                
+
                 if (removedObj) {
                     newObjHandle = storeObject(removedObj);
                     // Py_DECREF(removedObj);
                 }
-
             }
         }
     }
-    
+
     if (inPath) {
         free(inPath);
@@ -1203 +1178 @@
 }
 
-int rp_lib_xml_len (int* handle)
+int rp_lib_xml_len(int* handle)
 {
     int length = -1;
@@ -1229 +1204 @@
 }
 
-void  rp_lib_xml(int* handle, char* retText, int retText_len)
+void rp_lib_xml(int* handle, char* retText, int retText_len)
 {
     // int length_in = 0;
@@ -1237 +1212 @@
 
     PyObject* lib = NULL;
-    
+
     if (rapptureStarted) {
         if ((handle) && (*handle != 0)) {
@@ -1244 +1219 @@
             if (lib) {
                 xmlText = rpXml(lib);
-                
+
                 if (xmlText) {
 
@@ -1266 +1241 @@
                     free(xmlText);
                 }
-                
             }
         }
@@ -1321 +1295 @@
 
     RpDictEntry DICT_TEMPLATE *hPtr;
-    // RpDictIterator DICT_TEMPLATE iter((RpDict&)*this);                     
+    // RpDictIterator DICT_TEMPLATE iter((RpDict&)*this);
     RpDictIterator DICT_TEMPLATE iter(fortObjDict);
-    
-    hPtr = iter.first();                                                      
-    
+
+    hPtr = iter.first();
+
     while (hPtr) {
         Py_DECREF(*(hPtr->getValue()));
         hPtr->erase();
-        hPtr = iter.next();                                                   
+        hPtr = iter.next();
     }
 
@@ -1341 +1315 @@
 }
 
-void rp_result(int* handle) {
+void rp_result(int* handle)
+{
     PyObject* lib = NULL;
 
@@ -1353 +1328 @@
 }
 
-int objType( char* flavor) 
+int objType( char* flavor)
 {
     if (flavor == NULL) {
@@ -1359 +1334 @@
         return 0;
     }
-    else if((*flavor == 'o')&&(strncmp(flavor,"object", 6)==0)){
+    else if ((*flavor == 'o') && (strncmp(flavor,"object", 6) == 0)) {
         // return a PyObject*
         return 0;
     }
-    else if ( 
-      ((*flavor == 't')&&(strncmp(flavor,"type", 4) == 0)) 
-    ||((*flavor == 'i')&&(strncmp(flavor,"id", 2) == 0))
-    ||((*flavor == 'c')&&(strncmp(flavor,"component", 9) == 0)))
+    else if (((*flavor == 't') && (strncmp(flavor,"type", 4) == 0)) ||
+             ((*flavor == 'i') && (strncmp(flavor,"id", 2) == 0)) ||
+             ((*flavor == 'c') && (strncmp(flavor,"component", 9) == 0)))
     {
         // return a char*
@@ -1378 +1352 @@
 }
 
-int storeObject(PyObject* objectName) {
-
+int storeObject(PyObject* objectName)
+{
     int retVal = -1;
     int dictKey = fortObjDict.size();
@@ -1388 +1362 @@
         // no error checking to make sure it was successful in entering
         // the new entry.
-        fortObjDict.set(dictKey,objectName, &newEntry); 
-    }
-    
+        fortObjDict.set(dictKey,objectName, &newEntry);
+    }
+
     retVal = dictKey;
     return retVal;
 }
 
-PyObject* getObject(int objKey) {
-
+PyObject* getObject(int objKey)
+{
     PyObject* retVal = *(fortObjDict.find(objKey).getValue());
 
@@ -1404 +1378 @@
 
    return retVal;
-
-}
+}

branches/uq/src/core/scew_extras.c

@@ -119 +119 @@
 }
 
-
 XML_Char const*
-scew_element_set_contents_binary(   scew_element* element,
-                                    XML_Char const* bytes,
-                                    unsigned int* nbytes    )
+scew_element_set_contents_binary(scew_element* element,
+                                 XML_Char const* bytes,
+                                 unsigned int* nbytes)
 {
     XML_Char* out = NULL;