Changeset 1399 for trunk/gui/scripts

Timestamp:

Apr 15, 2009 2:03:05 PM (15 years ago)

Author:

gah

Message:

quick fix for sequence/radiodial

Location:

trunk/gui/scripts

Files:

• resultset.tcl (modified) (3 diffs)
• sidebarframe.tcl (modified) (2 diffs)

trunk/gui/scripts/resultset.tcl

@@ -66 +66 @@
     protected method _toggleAll {{column "current"}}
     protected method _getValues {column {which ""}}
+    protected method _getRawValues {column {which ""}}
     protected method _getTooltip {role column}
     protected method _getParamDesc {which {index "current"}}
@@ -652 +653 @@
 
             $dial clear
-            foreach {label val} [_getValues $col all] {
+            foreach {label val} [_getRawValues $col all] {
                 $dial add $label $val
             }
@@ -1524 +1525 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _getRawValues <column> ?<which>?
+#
+# Called automatically whenever the user hovers a control within
+# this widget.  Returns the tooltip associated with the control.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_getRawValues {col {which ""}} {
+    if {$col == "xmlobj"} {
+        # load the Simulation # control
+        set nruns [$_results size]
+        for {set n 0} {$n < $nruns} {incr n} {
+            set v "#[expr {$n+1}]"
+            set label2val($v) $n
+        }
+    } else {
+        set vlist ""
+        foreach rec [$_results get -format [list xmlobj $col]] {
+            lappend vlist [lindex $rec 1]
+        }
+        # Don't have normalized. Sort and create nums
+        set n 0
+        foreach v [lsort $vlist] {
+            incr n
+            set label2val($v) $n
+        }
+    }
+    switch -- $which {
+        current {
+            set curr $_cntlInfo($this-$col-value)
+            if {[info exists label2val($curr)]} {
+                return [list $curr $label2val($curr)]
+            }
+            return ""
+        }
+        all {
+            return [array get label2val]
+        }
+        default {
+            if {[string is integer $which]} {
+                if {$col == "xmlobj"} {
+                    set val "#[expr {$which+1}]"
+                } else {
+                    set val [lindex [$_results get -format $col $which] 0]
+                }
+                if {[info exists label2val($val)]} {
+                    return [list $val $label2val($val)]
+                }
+                return ""
+            }
+            error "bad option \"$which\": should be all, current, or an integer index"
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _getTooltip <role> <column>
 #

trunk/gui/scripts/sidebarframe.tcl

@@ -189 +189 @@
 
     #
-    # Tabs used to select sidebar panels
+    # Tabs used to select sidebar panels.  
+    #
+    # Note:  Bugs in BLT 2.4 tabset/VNC server crashes the server 
+    #        when -outerpad is set to 0.
     #
     itk_component add tabs {
@@ -195 +198 @@
             -highlightthickness 0 -tearoff 0 -side left \
             -bd 0 -gap 0 -tabborderwidth 1 \
-            -outerpad 0
+            -outerpad 1
     } {
         keep -background -cursor