Changeset 997 for trunk/gui

Timestamp:

Apr 24, 2008 11:30:56 AM (16 years ago)

Author:

dkearney

Message:

added ability for sequence.elemtents to contain a free text label. users can write their own label to sequence.element.about.label and it will show up next to the "Frame = 1" text just above the play button. Also made the "Frame = 1" text optional. if the user leaves out sequence.index.label, the "Frame = 1" will not show up.

Location:

trunk/gui/scripts

Files:

• resultviewer.tcl (modified) (4 diffs)
• sequence.tcl (modified) (6 diffs)
• sequenceresult.tcl (modified) (2 diffs)

trunk/gui/scripts/resultviewer.tcl

@@ -44 +44 @@
     private variable _dataslots ""   ;# list of all data objects in this widget
 }
-                                                                                
+
 itk::usual ResultViewer {
     keep -background -foreground -cursor -font
@@ -239 +239 @@
                     set mode "contour"
                     if {![info exists _mode2widget($mode)]} {
-                        set mesh [$dataobj mesh]
+                        set mesh [$dataobj mesh]
                         set fmt [expr {("" != $mesh) ? "vtk" : "heightmap"}]
                         set w $itk_interior.contour
@@ -245 +245 @@
                         set _mode2widget($mode) $w
                     }
-                }
+                }
                 3D {
                     set mode "field3D"
@@ -414 +414 @@
             return [Rappture::Curve ::#auto $xmlobj $path]
         }
-        histogram {
+        histogram {
             return [Rappture::Histogram ::#auto $xmlobj $path]
         }

trunk/gui/scripts/sequence.tcl

@@ -23 +23 @@
 
     public method value {pos}
+    public method label {pos}
     public method index {pos}
     public method size {}
@@ -29 +30 @@
     private variable _xmlobj ""  ;# ref to lib obj with sequence data
     private variable _dataobjs   ;# maps index => data object
+    private variable _labels     ;# maps index => labels
     private variable _indices    ;# list of sorted index values
     private variable _hints      ;# cache of hints stored in XML
@@ -51 +53 @@
         }
 
+        # check for an element about.label stanza
+        set elelabel [$xmlobj get $path.$name.about.label]
+
         set ctype ""
         set _dataobjs($index) ""
+        set _labels($index) ""
         foreach cname [$_xmlobj children $name] {
             set type [$xmlobj element -as type $path.$name.$cname]
@@ -60 +66 @@
                     continue
                 }
+                about {
+                    # ignore this
+                    continue
+                }
                 curve {
                     set obj [Rappture::Curve ::#auto $xmlobj $path.$name.$cname]
@@ -100 +110 @@
             if {$type == $ctype} {
                 lappend _dataobjs($index) $obj
+                set _labels($index) $elelabel
             } else {
                 itcl::delete object $obj
@@ -172 +183 @@
 
 # ----------------------------------------------------------------------
+# USAGE: label <pos>
+#
+# Returns the label for the element as position <pos> in the
+# list of all elements.  Here, <pos> runs from 0 to size-1.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Sequence::label {pos} {
+    set i [lindex [lindex $_indices $pos] 0]
+    return $_labels($i)
+}
+
+# ----------------------------------------------------------------------
 # USAGE: index <pos>
 #

trunk/gui/scripts/sequenceresult.tcl

@@ -115 +115 @@
     }
     pack $itk_component(indexValue) -side left
+
+    # add an element.about.label stanza
+    itk_component add eleLabel {
+        label $itk_component(info).elabel -padx 10
+    }
+    pack $itk_component(eleLabel) -side left
 
     itk_component add options {
@@ -538 +544 @@
     }
 
-    set val [$itk_component(dial) get -format label current]
-    $itk_component(indexValue) configure -text "= $val"
-    set _pos [lsearch -glob $_indices $val*]
+    # if the indexLabel is empty, don't show indexValue
+    if {"" != [$_topmost hints indexlabel]} {
+        set val [$itk_component(dial) get -format label current]
+        $itk_component(indexValue) configure -text "= $val"
+        set _pos [lsearch -glob $_indices $val*]
+    }
+
+    # populate the label for this element
+    $itk_component(eleLabel) configure -text "[$_topmost label $_pos]"
 
     $viewer delete