Changeset 1695 for branches/blt4

Timestamp:

Apr 16, 2010, 9:44:55 AM (15 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• examples/zoo/Makefile.in (modified) (1 diff)
• examples/zoo/filechoice/Makefile.in (added)
• examples/zoo/filechoice/filechoice.tcl (modified) (1 diff)
• gui/scripts/filechoiceentry.tcl (modified) (1 diff)
• gui/scripts/filelistentry.tcl (modified) (1 diff)
• gui/scripts/flowvisviewer.tcl (modified) (3 diffs)
• gui/scripts/molvisviewer.tcl (modified) (3 diffs)
• gui/scripts/tooltip.tcl (modified) (3 diffs)

branches/blt4/configure

@@ -8952 +8952 @@
 
 
-ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile lang/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/RpOctaveInterface.h lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
+ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile lang/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/RpOctaveInterface.h lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/filechoice/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -9729 +9729 @@
     "examples/zoo/enable/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/enable/Makefile" ;;
     "examples/zoo/field/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/field/Makefile" ;;
+    "examples/zoo/filechoice/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/filechoice/Makefile" ;;
     "examples/zoo/group/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/group/Makefile" ;;
     "examples/zoo/image/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefile" ;;

branches/blt4/configure.in

@@ -633 +633 @@
     examples/zoo/enable/Makefile
     examples/zoo/field/Makefile
+    examples/zoo/filechoice/Makefile
     examples/zoo/group/Makefile
     examples/zoo/image/Makefile

branches/blt4/examples/zoo/Makefile.in

@@ -22 +22 @@
                 enable \
                 field \
+                filechoice \
                 group \
                 image \

branches/blt4/examples/zoo/filechoice/filechoice.tcl

@@ -13 +13 @@
 set driver [Rappture::library [lindex $argv 0]]
 
-$driver put output.string(stats).about.label "Echo of choice"
 set choice [$driver get input.filelist(stats).current]
 set choice [join [split $choice ,] \n]
-$driver put output.string(stats).current $choice
+$driver put output.string(filelist).current $choice
+$driver put output.string(filelist).about.label "Echo of File List"
+$driver put output.string(filelist).about.description "Displays the values (one per line) from the filelist element."
+set choice [$driver get input.filechoice(stats).current]
+$driver put output.string(filechoice).about.label "Echo of File Choice"
+$driver put output.string(filechoice).about.description "Displays the value selected from the filechoice element."
+$driver put output.string(filechoice).current $choice
 
 # save the updated XML describing the run...

branches/blt4/gui/scripts/filechoiceentry.tcl

@@ -220 +220 @@
             set first $tail
         }
+        set tail [file root $tail]
         $itk_component(choice) choices insert end $file $tail
-        set _str2val($file) $tail
+        set _str2val($tail) $file
         set len [string length $tail]
         if {$len > $max} { set max $len }

branches/blt4/gui/scripts/filelistentry.tcl

@@ -325 +325 @@
     eval $_tree delete [$_tree tag nodes unused]
     $itk_component(tree) configure -width $max
+    catch { 
+    if { ![$itk_component(tree) selection present] } {
+        $itk_component(tree) selection set [$_tree firstchild root]
+    }
+    } err
+    puts stderr "select=$err"
 }
 

branches/blt4/gui/scripts/flowvisviewer.tcl

@@ -119 +119 @@
     private method str2millisecs { value } 
     private method millisecs2str { value } 
-    private method IsMapped { widget } 
     private method GetFlowInfo { widget }
     private method particles { tag name } 
@@ -2745 +2744 @@
         }
         "next" {
-            if { ![IsMapped $itk_component(3dview)] } {
+            if { ![winfo viewable $itk_component(3dview)] } {
                 flow stop
                 return
@@ -2948 +2947 @@
 }
 
-itcl::body Rappture::FlowvisViewer::IsMapped { w } {
-    while { $w != "" }  {
-        if { ![winfo ismapped $w] } {
-            return 0
-        }
-        set w [winfo parent $w]
-        if { [winfo toplevel $w] == $w } {
-            break
-        }
-    }
-    return 1
-}
-

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -91 +91 @@
     private method DownloadPopup { popup command } 
     private method EnableDownload { popup what }
-    private method IsMapped { widget } 
 
     private variable _icon 0
@@ -1006 +1005 @@
         unset _rocker(afterid)
     }
-    if { ![IsMapped $itk_component(3dview)] } {
+    if { ![winfo viewable $itk_component(3dview)] } {
         return
     }
@@ -1857 +1856 @@
 }
 
-itcl::body Rappture::MolvisViewer::IsMapped { w } {
-    while { $w != "" }  {
-        if { ![winfo ismapped $w] } {
-            return 0
-        }
-        set w [winfo parent $w]
-        if { [winfo toplevel $w] == $w } {
-            break
-        }
-    }
-    return 1
-}

branches/blt4/gui/scripts/tooltip.tcl

@@ -38 +38 @@
     itk_option define -message message Message ""
 
-    constructor {args} { # defined below }
-
-    public method show {where}
+    private common pending "" ;         # after ID for pending "tooltip show"
+    private common catalog    ;         # maps widget => message
+    private common delay      ;         # The delay in milliseconds to wait
+                                        # before presenting the tooltip.
+    constructor {args} { 
+        # defined below 
+    }
+    public method show { where }
     public method hide {}
-
-    public proc for {widget args}
-    public proc text {widget args}
-    private common catalog    ;# maps widget => message
-
+    
+    public proc for { widget args }
+    public proc text { widget args }
     public proc tooltip {option args}
-    private common pending "" ;# after ID for pending "tooltip show"
-
     public proc cue {option args}
+    public proc delay { widget args }
 
     bind RapptureTooltip <Enter> \
@@ -296 +298 @@
                 after cancel $pending
             }
-            set pending [after 750 [itcl::code tooltip show $widget $loc]]
+            set t 750
+            if { [info exists delay($widget)] } {
+                set t $delay($widget)
+            }
+            set pending [after $t [itcl::code tooltip show $widget $loc]]
         }
         show {
@@ -384 +390 @@
 
 # ----------------------------------------------------------------------
+# USAGE: delay <widget> ?<value>?
+#
+# Used to query or set the text used for the tooltip for a widget.
+# This is done automatically when you call the "for" proc, but it
+# is sometimes handy to query or change the text later.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tooltip::delay {widget args} {
+    if {[llength $args] == 0} {
+        if {[info exists delay($widget)]} {
+            return $delay($widget)
+        }
+        return ""
+    } elseif {[llength $args] == 1} {
+        set time [lindex $args 0]
+        set delay($widget) $time
+    } else {
+        error "wrong # args: should be \"delay widget ?millisecs?\""
+    }
+}
+
+# ----------------------------------------------------------------------
 # CONFIGURATION OPTION: -icon
 # ----------------------------------------------------------------------