Changeset 4992 for branches/uiuc_vtk_viewers/gui

Timestamp:

Feb 10, 2015 7:17:06 PM (9 years ago)

Author:

dkearney

Message:

merging trunk changes to uiuc_vtk_viewers

Location:

branches/uiuc_vtk_viewers

Files:

• . (modified) (1 prop)
• gui/apps/execute.tcl (modified) (3 diffs)
• gui/apps/launcher.tcl (modified) (5 diffs)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/main.tcl (modified) (6 diffs)
• gui/scripts/map.tcl (modified) (1 diff)
• gui/scripts/mapviewer.tcl (modified) (26 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (2 diffs)
• gui/scripts/textentry.tcl (modified) (1 diff)
• gui/scripts/tool.tcl (modified) (1 diff)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (1 diff)
• gui/src/RpDicomToVtk.cc (modified) (6 diffs)
• gui/src/RpReadPoints.c (modified) (1 diff)

branches/uiuc_vtk_viewers/gui/apps/execute.tcl

@@ -67 +67 @@
 set toolobj [Rappture::library $toolxml]
 set TaskObj [Rappture::Task ::#auto $toolobj $installdir]
+set LogFid ""
 
-# tasks in execute mode run quietly and don't try to save results
-$TaskObj configure -jobstats "" -resultdir ""
+# Define some things that we need for logging status...
+# ----------------------------------------------------------------------
+proc log_output {message} {
+    global LogFid
+
+    if {$LogFid ne ""} {
+        #
+        # Scan through and pick out any =RAPPTURE-PROGRESS=> messages.
+        #
+        set percent ""
+        while {[regexp -indices \
+                {=RAPPTURE-PROGRESS=> *([-+]?[0-9]+) +([^\n]*)(\n|$)} $message \
+                 match percent mesg]} {
+
+            foreach {i0 i1} $percent break
+            set percent [string range $message $i0 $i1]
+
+            foreach {i0 i1} $mesg break
+            set mesg [string range $message $i0 $i1]
+
+            foreach {i0 i1} $match break
+            set message [string replace $message $i0 $i1]
+        }
+        if {$percent ne ""} {
+            # report the last percent progress found
+            log_append progress "$percent% - $mesg"
+        }
+    }
+}
+
+# Actually write to the log file
+proc log_append {level message} {
+    global LogFid
+
+    if {$LogFid ne ""} {
+        set date [clock format [clock seconds] -format {%Y-%m-%dT%H:%M:%S%z}]
+        set host [info hostname]
+        puts $LogFid "$date $host rappture [pid] \[$level\] $message"
+        flush $LogFid
+    }
+}
+
+# Actually write to the log file
+proc log_stats {args} {
+    set line ""
+    foreach {key val} $args {
+        append line "$key=$val "
+    }
+    log_append usage $line
+}
+
+# Parse command line options to see 
+# ----------------------------------------------------------------------
+Rappture::getopts argv params {
+    value -status ""
+    value -output ""
+    value -cleanup no
+}
+
+if {$params(-status) ne ""} {
+    set LogFid [open $params(-status) w]
+    $TaskObj configure -logger {log_append status} -jobstats log_stats
+}
+
+if {$params(-output) eq ""} {
+    # no output? then run quietly and don't try to save results
+    $TaskObj configure -jobstats "" -resultdir ""
+}
 
 # Transfer input values from driver to TaskObj, and then run.
@@ -80 +147 @@
         lappend args $path [$driverobj get $path.current]
     }
+}
+
+if {$params(-status) ne ""} {
+    # recording status? then look through output for progress messages
+    lappend args -output log_output
 }
 
@@ -95 +167 @@
     $runxml put output.status failed
 }
-$runxml put output.time [clock format [clock seconds]]
 
-$runxml put tool.version.rappture.version $::Rappture::version
-$runxml put tool.version.rappture.revision $::Rappture::build
-
-if {[info exists tcl_platform(user)]} {
-    $runxml put output.user $::tcl_platform(user)
+# Handle output
+# ----------------------------------------------------------------------
+switch -- $params(-output) {
+    "" {
+        # no output file -- write to stdout
+        puts "<?xml version=\"1.0\"?>\n[$runxml xml]"
+    }
+    "@default" {
+        # do the usual Rappture thing -- move to results dir
+        # but ignore any errors if it fails
+        catch {$TaskObj save $runxml}
+    }
+    default {
+        # save to the specified file
+        $TaskObj save $runxml $params(-output)
+    }
 }
 
-puts "<?xml version=\"1.0\"?>\n[$runxml xml]"
+if {$params(-cleanup)} {
+    file delete -force -- $driverxml
+}
+
+log_append status "exit $status"
 exit $status

branches/uiuc_vtk_viewers/gui/apps/launcher.tcl

@@ -27 +27 @@
 set mainscript ""
 set alist ""
+set loadlist ""
 set toolxml ""
+
+# ----------------------------------------------------------------------
+#  Look for parameters passed into the tool session.  If there are
+#  any "file" parameters, they indicate files that should be loaded
+#  for browsing or executed to get results:
+#
+#    file(load):/path/to/run.xml
+#    file(execute):/path/to/driver.xml
+# ----------------------------------------------------------------------
+set params(opt) ""
+set params(load) ""
+set params(execute) ""
+set params(input) ""
+
+if {[info exists env(TOOL_PARAMETERS)]} {
+    # if we can't find the file, wait a little
+    set ntries 25
+    while {$ntries > 0 && ![file exists $env(TOOL_PARAMETERS)]} {
+        after 200
+        incr ntries -1
+    }
+
+    if {![file exists $env(TOOL_PARAMETERS)]} {
+        # still no file after all that? then skip parameters
+        puts stderr "WARNING: can't read tool parameters in file \"$env(TOOL_PARAMETERS)\"\nFile not found."
+
+    } elseif {[catch {
+        # read the file and parse the contents
+        set fid [open $env(TOOL_PARAMETERS) r]
+        set info [read $fid]
+        close $fid
+    } result] != 0} {
+        puts stderr "WARNING: can't read tool parameters in file \"$env(TOOL_PARAMETERS)\"\n$result"
+
+    } else {
+        # parse the contents of the tool parameter file
+        foreach line [split $info \n] {
+            set line [string trim $line]
+            if {$line eq "" || [regexp {^#} $line]} {
+                continue
+            }
+
+            if {[regexp {^([a-zA-Z]+)(\(into\:)(.+)\)\:(.+)$} $line match type name path value]
+                || [regexp {^([a-zA-Z]+)(\([^)]+\))?\:(.+)} $line match type name value]} {
+                if {$type eq "file"} {
+                    switch -exact -- $name {
+                        "(load)" - "" {
+                            lappend params(load) $value
+                            set params(opt) "-load"
+                        }
+                        "(execute)" {
+                            set params(execute) $value
+                            set params(opt) "-execute"
+                        }
+                        "(input)" {
+                            set params(input) $value
+                            set params(opt) "-input"
+                        }
+                        "(into:" {
+                            namespace eval ::Rappture { # forward decl }
+                            set ::Rappture::parameters($path) $value
+                        }
+                        default {
+                            puts stderr "WARNING: directive $name not recognized for file parameter \"$value\""
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
 # scan through the arguments and look for the function
@@ -81 +153 @@
                 lappend alist -tool $toolxml
             }
-            -tool - -testdir - -nosim {
+            -testdir - -nosim {
                 lappend alist $opt [lindex $argv 0]
                 set argv [lrange $argv 1 end]
@@ -93 +165 @@
             }
             -load {
-                lappend alist $opt
                 while { [llength $argv] > 0 } {
                     set val [lindex $argv 0]
@@ -99 +170 @@
                         break
                     }
-                    lappend alist $val
+                    lappend loadlist $val
                     set argv [lrange $argv 1 end]
                 }
@@ -115 +186 @@
 }
 
-# If no arguments, assume that it's the -run option
+# If no arguments, check to see if there are any tool parameters.
+# If not, then assume that it's the -run option.
 if {$mainscript eq ""} {
-    package require RapptureGUI
-    set guidir $RapptureGUI::library
-    set mainscript [file join $guidir scripts main.tcl]
-    set reqpkgs Tk
+    switch -- $params(opt) {
+        -load {
+            # add tool parameters to the end of any files given on cmd line
+            set loadlist [concat $loadlist $params(load)]
+            set alist [concat $alist -load $loadlist]
+
+            package require RapptureGUI
+            set guidir $RapptureGUI::library
+            set mainscript [file join $guidir scripts main.tcl]
+            set reqpkgs Tk
+        }
+        -execute {
+            if {[llength $params(execute)] != 1} {
+                puts stderr "ERROR: wrong number of (execute) files in TOOL_PARAMETERS (should be only 1)"
+                exit 1
+            }
+            set driverxml [lindex $params(execute) 0]
+            if {![file readable $driverxml]} {
+                puts stderr "error: driver file \"$driverxml\" not found"
+                exit 1
+            }
+            set dir [file dirname [info script]]
+            set mainscript [file join $dir execute.tcl]
+            set reqpkgs ""
+
+            # When executing from TOOL_PARAMETERS file directives,
+            # report status, clean up, and save output to data/results.
+            # This helps the web services interface do its thing.
+            set alist [list \
+                -output @default \
+                -status rappture.status \
+                -cleanup yes]
+        }
+        "" - "-input" {
+            package require RapptureGUI
+            set guidir $RapptureGUI::library
+            set mainscript [file join $guidir scripts main.tcl]
+            set reqpkgs Tk
+
+            # finalize the -input argument for "rappture -run"
+            if {$params(input) ne ""} {
+                if {![file readable $params(input)]} {
+                    puts stderr "error: driver file \"$params(input)\" not found"
+                    exit 1
+                }
+                set alist [concat $alist -input $params(input)]
+            }
+
+            # finalize any pending -load arguments for "rappture -run"
+            if {[llength $loadlist] > 0} {
+                set alist [concat $alist -load $loadlist]
+            }
+        }
+        default {
+            puts stderr "internal error: funny action \"$params(opt)\" inferred from TOOL_PARAMETERS"
+            exit 1
+        }
+    }
+} else {
+    # finalize any pending -load arguments for "rappture -run"
+    if {[llength $loadlist] > 0} {
+        set alist [concat $alist -load $loadlist]
+    }
 }
 

branches/uiuc_vtk_viewers/gui/scripts/field.tcl

@@ -41 +41 @@
 #       mesh        3   points-on-mesh                  isosurface      vtkvis
 #       dx          3   DX                              volume          nanovis
-#       unirect2d   2   unirect3d + extents > 1 flow    flow            nanovis
-#       unirect3d   3   unirect2d + extents > 1 flow    flow            nanovis
-#       
+#       unirect2d   2   unirect2d + extents > 1 flow    flow            nanovis
+#       unirect3d   3   unirect3d + extents > 1 flow    flow            nanovis
+#
 # With <views>, can specify which viewer for specific datasets.  So it's OK
 # for the same dataset to be viewed in more than one way.

branches/uiuc_vtk_viewers/gui/scripts/main.tcl

@@ -93 +93 @@
     value -tool tool.xml
     list  -load ""
+    value -input ""
     value -nosim 0
-}
-
-proc ReadToolParameters { numTries } {
-    incr numTries -1 
-    if { $numTries < 0 } {
-        return
-    }
-    global env
-    set paramsFile $env(TOOL_PARAMETERS)
-    if { ![file readable $paramsFile] } {
-        after 500 ReadToolParmeters $numTries
-        return
-    }
-    catch { 
-        set f [open $paramsFile "r"]
-        set contents [read $f]
-        close $f
-        set pattern {^file\((.*)\):(.*)$} 
-        foreach line [split $contents "\n"] {
-            if { [regexp $pattern $line match path rest] } {
-                set ::Rappture::parameters($path) $rest
-            }
-        }
-    }
-}
-
-if { [info exists env(TOOL_PARAMETERS)] } {
-    ReadToolParameters 10
 }
 
@@ -132 +105 @@
     set status [catch {Rappture::library $runfile} result]
     lappend loadobjs $result
+}
+
+set inputobj {}
+if {$params(-input) ne ""} {
+    if {![file exists $params(-input)]} {
+        puts stderr "can't find input file: \"$params(-input)\""
+        exit 1
+    }
+    if {[catch {Rappture::library $params(-input)} result] == 0} {
+        set inputobj $result
+    }
 }
 
@@ -143 +127 @@
     # run.xml files they are loading.
     set pseudotool ""
-    if {0 == [llength $loadobjs]} {
+    if {[llength $loadobjs] == 0 && $inputobj eq ""} {
         puts stderr "can't find tool \"$params(-tool)\""
         exit 1
@@ -151 +135 @@
     # if there are loaders or notes, they will still need
     # examples/ and docs/ dirs from the install location
-    foreach runobj $loadobjs {
+    set check [concat $loadobjs $inputobj]
+    foreach runobj $check {
         set tdir \
             [string trim [$runobj get tool.version.application.directory(tool)]]
@@ -374 +359 @@
 
 # load previous xml runfiles
-if {0 != [llength $params(-load)]} {
+if {[llength $params(-load)] > 0} {
     foreach runobj $loadobjs {
-        # this doesn't seem to work with loaders
-        # loaders seem to get their value after this point
-        # may need to tell loader elements to update its value
-        $tool load $runobj
         $f.analyze load $runobj
     }
+    # load the inputs for the very last run
+    $tool load $runobj
+
     # don't need simulate button if we cannot simulate
     if {$params(-nosim)} {
@@ -388 +372 @@
     $f.analyze configure -notebookpage analyze
     $win.pager current analyzer
+} elseif {$params(-input) ne ""} {
+    $tool load $inputobj
+}
+
+# let components (loaders) settle after the newly loaded runs
+update
+
+foreach path [array names ::Rappture::parameters] {
+    set fname $::Rappture::parameters($path)
+    if {[catch {
+          set fid [open $fname r]
+          set info [read $fid]
+          close $fid}] == 0} {
+
+        set w [$tool widgetfor $path]
+        if {$w ne ""} {
+            if {[catch {$w value [string trim $info]} result]} {
+                puts stderr "WARNING: bad tool parameter value for \"$path\""
+                puts stderr "  $result"
+            }
+        } else {
+            puts stderr "WARNING: can't find control for tool parameter: $path"
+        }
+    }
 }
 

branches/uiuc_vtk_viewers/gui/scripts/map.tcl

@@ -129 +129 @@
         }
         # Common settings (for all layer types) with defaults
-        foreach { key defval } { visible true } {
+        foreach { key defval } { visible 1 cache 1 } {
             $_tree set $child $key $defval
             set val [$layers get $layer.$key]

branches/uiuc_vtk_viewers/gui/scripts/mapviewer.tcl

@@ -79 +79 @@
     private method BuildDownloadPopup { widget command } 
     private method BuildLayerTab {}
+    private method BuildMapTab {}
     private method BuildTerrainTab {}
-    private method ChangeLayerVisibility { dataobj layer }
     private method Connect {}
     private method CurrentLayers {args}
@@ -104 +104 @@
     private method Rotate {option x y}
     private method Select {option x y}
+    private method SetLayerOpacity { dataobj layer {value 100}}
     private method SetLayerStyle { dataobj layer }
+    private method SetLayerVisibility { dataobj layer }
     private method SetTerrainStyle { style }
-    private method SetOpacity { dataset }
     private method UpdateLayerControls {}
     private method Zoom {option {x 0} {y 0}}
@@ -121 +122 @@
     private variable _motion;
     private variable _settings
+    private variable _opacity
     private variable _visibility
     private variable _style;            # Array of current component styles.
@@ -184 +186 @@
     $_parser alias camera   [itcl::code $this camera]
     $_parser alias screen   [itcl::code $this ReceiveScreenInfo]
+
+    # Millisecond delay before animated wait dialog appears
+    set _waitTimeout 500
 
     # Settings for mouse motion events: these are required
@@ -236 +241 @@
         terrain-vertscale      1.0
         terrain-wireframe      0
+        time                   12
     }]
+
+    set _settings(time) [clock format [clock seconds] -format %k -gmt 1]
+
     itk_component add view {
         canvas $itk_component(plotarea).view \
@@ -301 +310 @@
 
     BuildLayerTab
+    BuildMapTab
     BuildTerrainTab
     BuildCameraTab
@@ -940 +950 @@
         set _hardcopy($tag) $bytes
     }
+    set _waitTimeout 0
 }
 
@@ -1046 +1057 @@
             } else {
                 if { $_mapsettings(type) == "geocentric" } {
+                    $itk_component(grid) configure -state normal
+                    $itk_component(time_l) configure -state normal
+                    $itk_component(time) configure -state normal
                     SendCmd "map reset geocentric"
                 }  else {
+                    $itk_component(grid) configure -state disabled
+                    $itk_component(time_l) configure -state disabled
+                    $itk_component(time) configure -state disabled
                     set proj $_mapsettings(projection)
                     if { $proj == "" } { 
@@ -1084 +1101 @@
     set count 0
 
+    set haveTerrain 0
     foreach dataobj [get -objects] {
         set _obj2datasets($dataobj) ""
@@ -1104 +1122 @@
                 SetLayerStyle $dataobj $layer
             }
+            if {$info(type) == "elevation"} {
+                set haveTerrain 1
+            }
             lappend _obj2datasets($dataobj) $layer
             # FIXME: This is overriding all layers' initial visibility setting
@@ -1109 +1130 @@
                 SendCmd "map layer visible 1 $layer"
                 set _visibility($layer) 1
-                #SetLayerOpacity $layer
-            }
-        }
+                #SetLayerOpacity $dataobj $layer
+            }
+        }
+    }
+
+    if ($haveTerrain) {
+        $itk_component(vscale_l) configure -state normal
+        $itk_component(vscale) configure -state normal
+    } else {
+        $itk_component(vscale_l) configure -state disabled
+        $itk_component(vscale) configure -state disabled
     }
 
@@ -1519 +1548 @@
             SendCmd "map terrain wireframe $bool"
         }
+        "time" {
+            set val $_settings($what)
+            SendCmd "map time $val"
+        }
         default {
             error "don't know how to fix $what"
@@ -1545 +1578 @@
 }
 
-itcl::body Rappture::MapViewer::BuildTerrainTab {} {
+itcl::body Rappture::MapViewer::BuildMapTab {} {
 
     set fg [option get $itk_component(hull) font Font]
@@ -1551 +1584 @@
 
     set inner [$itk_component(main) insert end \
-        -title "Terrain Settings" \
-        -icon [Rappture::icon surface]]
+        -title "Map Settings" \
+        -icon [Rappture::icon wrench]]
     $inner configure -borderwidth 4
 
@@ -1561 +1594 @@
         -font "Arial 9" -anchor w 
 
-    checkbutton $inner.grid \
+    itk_component add grid {
+        checkbutton $inner.grid \
         -text "Show Graticule" \
         -variable [itcl::scope _settings(grid)] \
         -command [itcl::code $this AdjustSetting grid] \
         -font "Arial 9" -anchor w 
+    } {
+        ignore -font
+    }
 
     checkbutton $inner.wireframe \
@@ -1585 +1622 @@
         -font "Arial 9" -anchor w
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w 
+    itk_component add time_l {
+        label $inner.time_l -text "Time (UTC)" -font "Arial 9"
+    } {
+        ignore -font
+    }
+    itk_component add time {
+        ::scale $inner.time -from 0 -to 23.9 -orient horizontal \
+            -resolution 0.1 \
+            -variable [itcl::scope _settings(time)] \
+            -showvalue on \
+            -command [itcl::code $this AdjustSetting time]
+    }
+
+    blt::table $inner \
+        0,0 $inner.posdisp   -cspan 2 -anchor w -pady 2 \
+        1,0 $inner.grid      -cspan 2 -anchor w -pady 2 \
+        2,0 $inner.wireframe -cspan 2 -anchor w -pady 2 \
+        3,0 $inner.lighting  -cspan 2 -anchor w -pady 2 \
+        4,0 $inner.time_l    -cspan 2 -anchor w -pady 2 \
+        4,1 $inner.time      -cspan 2 -fill x   -pady 2
+#        4,0 $inner.edges     -cspan 2  -anchor w -pady 2
+
+    blt::table configure $inner r* c* -resize none
+    blt::table configure $inner r5 c1 -resize expand
+}
+
+itcl::body Rappture::MapViewer::BuildTerrainTab {} {
+
+    set fg [option get $itk_component(hull) font Font]
+    #set bfg [option get $itk_component(hull) boldFont Font]
+
+    set inner [$itk_component(main) insert end \
+        -title "Terrain Settings" \
+        -icon [Rappture::icon surface]]
+    $inner configure -borderwidth 4
+
+    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w
     itk_component add terrainpalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
@@ -1595 +1668 @@
         [itcl::code $this AdjustSetting terrain-palette]
 
-    label $inner.vscale_l -text "Vertical Scale" -font "Arial 9" -anchor w 
-    ::scale $inner.vscale -from 0 -to 10 -orient horizontal \
-        -variable [itcl::scope _settings(terrain-vertscale)] \
-        -width 10 \
-        -resolution 0.1 \
-        -showvalue on \
-        -command [itcl::code $this AdjustSetting terrain-vertscale]
+    itk_component add vscale_l {
+        label $inner.vscale_l -text "Vertical Scale" -font "Arial 9" -anchor w
+    }
+    itk_component add vscale {
+        ::scale $inner.vscale -from 0 -to 10 -orient horizontal \
+            -variable [itcl::scope _settings(terrain-vertscale)] \
+            -width 10 \
+            -resolution 0.1 \
+            -showvalue on \
+            -command [itcl::code $this AdjustSetting terrain-vertscale]
+    }
     $inner.vscale set $_settings(terrain-vertscale)
 
     blt::table $inner \
-        0,0 $inner.posdisp   -cspan 2  -anchor w -pady 2 \
-        1,0 $inner.grid      -cspan 2  -anchor w -pady 2 \
-        2,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
-        3,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
-        4,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
-        5,0 $inner.vscale_l  -anchor w -pady 2 \
-        5,1 $inner.vscale    -fill x   -pady 2 \
-        6,0 $inner.palette_l -anchor w -pady 2 \
-        6,1 $inner.palette   -fill x   -pady 2  
+        0,0 $inner.vscale_l  -anchor w -pady 2 \
+        0,1 $inner.vscale    -fill x   -pady 2
+#        1,0 $inner.palette_l -anchor w -pady 2 \
+#        1,1 $inner.palette   -fill x   -pady 2  
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r8 c1 -resize expand
+    blt::table configure $inner r3 c1 -resize expand
 }
 
@@ -1726 +1798 @@
                 set _view($name) $value
             }
-            puts stderr "view: $_view(x), $_view(y), $_view(z), $_view(heading), $_view(pitch), $_view(distance), {$_view(srs)}, {$_view(verticalDatum)}"
+#            puts stderr "view: $_view(x), $_view(y), $_view(z), $_view(heading), $_view(pitch), $_view(distance), {$_view(srs)}, {$_view(verticalDatum)}"
         }
         "go" {
@@ -1870 +1942 @@
             if { [info exists info(opacity)] } {
                 set settings(-opacity) $info(opacity)
-            }
+                set _opacity($layer) $info(opacity)
+            }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             if {!$_sendEarthFile} {
                 switch -- $info(driver)  {
@@ -1878 +1952 @@
                     "gdal" {
                         SendCmd [list map layer add image gdal \
-                                     $info(gdal.url) $layer]
+                                     $info(gdal.url) $info(cache) $layer]
                     }
                     "tms" {
                         SendCmd [list map layer add image tms \
-                                     $info(tms.url) $layer]
+                                     $info(tms.url) $info(cache) $layer]
                     }
                     "wms" {
                         SendCmd [list map layer add image wms \
-                                     $info(wms.url) \
+                                     $info(wms.url) $info(cache)\
                                      $info(wms.layers) \
                                      $info(wms.format) \
@@ -1894 +1968 @@
                     "xyz" {
                         SendCmd [list map layer add image xyz \
-                                     $info(xyz.url) \
+                                     $info(xyz.url) $info(cache) \
                                      $layer]
                     }
@@ -1935 +2009 @@
                 set settings(-opacity) $info(opacity)
             }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             SendCmd [list map layer add line $info(ogr.url) $layer]
             SendCmd "map layer opacity $settings(-opacity) $layer"
@@ -1950 +2025 @@
                 set settings(-opacity) $info(opacity)
             }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             SendCmd [list map layer add polygon $info(ogr.url) $layer]
             SendCmd "map layer opacity $settings(-opacity) $layer"
@@ -1973 +2049 @@
                 set settings(-opacity) $info(opacity)
             }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             set contentExpr $info(content)
             if {[info exists info(priority)]} {
@@ -1992 +2069 @@
 }
 
-itcl::body Rappture::MapViewer::SetOpacity { dataset } { 
-    foreach {dataobj layer} [split $dataset -] break
-    set type [$dataobj type $layer]
-    set val $_settings(-opacity)
+itcl::body Rappture::MapViewer::SetLayerOpacity { dataobj layer {value 100}} {
+    set val $_opacity($layer)
     set sval [expr { 0.01 * double($val) }]
-    if { !$_obj2ovride($dataobj-raise) } {
-        # This is wrong.  Need to figure out why raise isn't set with 1
-        #set sval [expr $sval * .6]
-    }
-    SendCmd "$type opacity $sval $dataset"
-}
-
-itcl::body Rappture::MapViewer::ChangeLayerVisibility { dataobj layer } { 
+    SendCmd "map layer opacity $sval $layer"
+}
+
+itcl::body Rappture::MapViewer::SetLayerVisibility { dataobj layer } {
     set bool $_visibility($layer)
     SendCmd "map layer visible $bool $layer"
@@ -2022 +2093 @@
             array unset info
             array set info [$dataobj layer $layer]
-            checkbutton $f.$layer \
+            checkbutton $f.${layer}-visible \
                 -text $info(label) \
+                -font "Arial 9" -anchor w \
                 -variable [itcl::scope _visibility($layer)] \
                 -command [itcl::code $this \
-                              ChangeLayerVisibility $dataobj $layer] \
-                    -font "Arial 9" -anchor w 
-            blt::table $f $row,0 $f.$layer -anchor w -pady 2 
-            Rappture::Tooltip::for $f.$layer $info(description)
+                              SetLayerVisibility $dataobj $layer]
+            blt::table $f $row,0 $f.${layer}-visible -anchor w -pady 2 -cspan 2
+            Rappture::Tooltip::for $f.${layer}-visible $info(description)
             incr row
+            if { $info(type) != "elevation" } {
+                label $f.${layer}-opacity_l -text "Opacity" -font "Arial 9"
+                ::scale $f.${layer}-opacity -from 0 -to 100 \
+                    -orient horizontal -showvalue off \
+                    -variable [itcl::scope _opacity($layer)] \
+                    -command [itcl::code $this \
+                                  SetLayerOpacity $dataobj $layer]
+                blt::table $f $row,0 $f.${layer}-opacity_l -anchor w -pady 2
+                blt::table $f $row,1 $f.${layer}-opacity -anchor w -pady 2
+                incr row
+            }
         }
     }

branches/uiuc_vtk_viewers/gui/scripts/nanovisviewer.tcl

@@ -1269 +1269 @@
         "-cutplanesvisible" {
             set bool $_settings($what)
+            # We only set cutplanes on the first dataset.
             set datasets [CurrentDatasets -cutplanes]
             set tag [lindex $datasets 0]
@@ -1363 +1364 @@
             set axis [string range $what 1 1]
             set bool $_settings($what)
+            # We only set cutplanes on the first dataset.
             set datasets [CurrentDatasets -cutplanes] 
             set tag [lindex $datasets 0]

branches/uiuc_vtk_viewers/gui/scripts/textentry.tcl

@@ -106 +106 @@
     # the string alone. 
     set str [string trim [$_owner xml get $path.default]]
-    if { [info exists ::Rappture::parameters($path.default)] } {
-        set fileName $::Rappture::parameters($path.default)
-        catch { 
-            set f [open $fileName "r"]
-            set contents [read $f]
-            close $f
-            set str $contents
-        } 
-    }
     if {"" != $str} {
         value $str

branches/uiuc_vtk_viewers/gui/scripts/tool.tcl

@@ -31 +31 @@
     public method run {args} {
         sync  ;# sync all widget values to XML
-        eval $_task run $args
+
+        foreach {status result} [eval $_task run $args] break
+        if {$status == 0} {
+            # move good results to the data/results directory
+            $_task save $result
+        }
+
+        return [list $status $result]
     }
     public method abort {} {

branches/uiuc_vtk_viewers/gui/scripts/vtkisosurfaceviewer.tcl

@@ -2354 +2354 @@
     SendCmd "cutplane add $tag"
     SendCmd "cutplane color [Color2RGB $itk_option(-plotforeground)] $tag"
+    foreach axis {x y z} {
+        set pos [expr $_settings(-${axis}cutplaneposition) * 0.01]
+        set visible $_settings(-${axis}cutplanevisible)
+        SendCmd "cutplane slice $axis $pos $tag"
+        SendCmd "cutplane axis $axis $visible $tag"
+    }
     SendCmd "cutplane visible $style(-cutplanesvisible) $tag"
 

branches/uiuc_vtk_viewers/gui/src/RpDicomToVtk.cc

@@ -27 +27 @@
 #include <stdio.h>
 #include "tcl.h"
+
+// #define RP_DICOM_TRACE
 
 static int
@@ -95 +97 @@
     int series = 0;
 
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "Num Studies: %d\n", numStudies);
+#endif
     vtkStringArray *files;
 #if 0
     for (int i = 0; i < numStudies; i++) {
         int numSeries = sorter->GetNumberOfSeriesInStudy(i);
+#ifdef RP_DICOM_TRACE
         fprintf(stderr, "Study %d: %d series\n", i, numSeries);
+#endif
         int k = sorter->GetFirstSeriesInStudy(i);
         for (int j = 0; j < numSeries; j++) {
@@ -144 +150 @@
 #ifdef USE_VTK_DICOM_PACKAGE
     vtkStringArray *ids = reader->GetStackIDs();
+#ifdef RP_DICOM_TRACE
     for (int i = 0; i < ids->GetNumberOfValues(); i++) {
         fprintf(stderr, "Stack: %s\n", ids->GetValue(i).c_str());
     }
+#endif
     vtkIntArray *fidxArray = reader->GetFileIndexArray();
     vtkDICOMMetaData *md = reader->GetMetaData();
@@ -160 +168 @@
     }
 #endif
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "Number of data elements: %d\n", md->GetNumberOfDataElements());
-
+#endif
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("num_files", -1));
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewIntObj(md->GetNumberOfInstances()));
@@ -234 +243 @@
 
     Tcl_ListObjAppendList(interp, objPtr, metaDataObj);
-
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "writing VTK\n");
-
+#endif
     vtkSmartPointer<vtkDataSetWriter> writer = vtkSmartPointer<vtkDataSetWriter>::New();
     writer->SetInputConnection(reader->GetOutputPort());
@@ -242 +251 @@
     writer->WriteToOutputStringOn();
     writer->Update();
-
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "writing VTK...done\n");
-
+#endif
     Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("vtkdata", -1));
 

branches/uiuc_vtk_viewers/gui/src/RpReadPoints.c

@@ -88 +88 @@
     return TCL_OK;
 }
-    
+
 /* 
  *  ReadPoints string dimVar pointsVar