Changeset 1677 for branches/blt4/gui

Timestamp:

Mar 29, 2010 4:28:58 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• controls.tcl (modified) (1 diff)
• filechoiceentry.tcl (modified) (3 diffs)
• filelistentry.tcl (added)
• xylegend.tcl (modified) (1 diff)

branches/blt4/gui/scripts/Makefile.in

@@ -49 +49 @@
                 $(srcdir)/field3dresult.tcl \
                 $(srcdir)/filechoiceentry.tcl \
+                $(srcdir)/filelistentry.tcl \
                 $(srcdir)/filexfer.tcl \
                 $(srcdir)/flowdial.tcl \

branches/blt4/gui/scripts/controls.tcl

@@ -138 +138 @@
         filechoice {
             Rappture::FileChoiceEntry $w $_owner $path
+            bind $w <<Value>> [itcl::code $this _controlChanged $name]
+        }
+        filelist {
+            Rappture::FileListEntry $w $_owner $path
             bind $w <<Value>> [itcl::code $this _controlChanged $name]
         }

branches/blt4/gui/scripts/filechoiceentry.tcl

@@ -79 +79 @@
             set i1 [expr $first + 2]
             set i2 [expr $last  - 2]
-            set path [string range $glob $i1 $i2]
-            set value [$_owner xml get $_path.$cname]
-            set value [$_owner xml get $path]
+            set cpath [string range $glob $i1 $i2]
+            set value [$_owner xml get $cpath.$cname]
             set glob [string replace $glob $first $last $value]
-            $_owner notify add $this $path [itcl::code $this _whenidle]
+            $_owner notify add $this $cpath [itcl::code $this _whenidle]
         }
     }
@@ -205 +204 @@
             set i1 [expr $first + 2]
             set i2 [expr $last  - 2]
-            set path [string range $glob $i1 $i2]
-            set value [$_owner xml get $path.current]
-            puts stderr "$path.current: value=$value"
+            set cpath [string range $glob $i1 $i2]
+            set value [$_owner xml get $cpath.current]
+            puts stderr "$cpath.current: value=$value"
             if { $value == "" } {
-                set value [$_owner xml get $path.default]
-                puts stderr "$path.default: value=$value"
+                puts stderr "$_owner xml get $cpath.default"
+                set value [$_owner xml get $cpath.default]
+                puts stderr "$cpath.default: value=$value"
             }
             set glob [string replace $glob $first $last $value]
         }
-        puts stderr "after glob=$glob"
         # Replace the template with the substituted value.
         set files [glob -nocomplain $glob]
-        puts stderr "files=$files"
         set allfiles [concat $allfiles $files]
     }
@@ -254 +252 @@
 itcl::body Rappture::FileChoiceEntry::_tooltip {} {
     set tip [string trim [$_owner xml get $_path.about.description]]
-
+    puts stderr "tip=$tip, $_owner=$_owner path=$_path.about.description"
     # get the description for the current choice, if there is one
     set str [$itk_component(choice) value]
     set path [$itk_component(choice) translate $str]
-    set desc ""
-    if {$path != ""} {
-        set desc [$_owner xml get $path.about.description]
+    set desc $path
+    if {$path == ""} {
+        set desc [$_owner xml get $_path.about.description]
     }
 

branches/blt4/gui/scripts/xylegend.tcl

@@ -116 +116 @@
             -height 100
     }
+    
     blt::tk::scrollbar $itk_interior.scrl.xs
     blt::tk::scrollbar $itk_interior.scrl.ys