Changeset 67 for trunk/gui

Timestamp:

Sep 25, 2005, 10:11:43 PM (19 years ago)

Author:

mmc

Message:

Fixed the resultset to include a -missingdata option, which
controls how we treat missing data. The old behavior was
"prompt", which prompts the user to simulate and fill in any
missing data. The new behavior is "skip", which adjusts the
controls to skip over missing data, jumping back to some
previous result. This makes it easier to examine data that
was actually simulated, especially when two controls must
change in unison to explore the data.

Location:

trunk/gui/scripts

Files:

• radiodial.tcl (modified) (1 diff)
• resultset.tcl (modified) (5 diffs)

trunk/gui/scripts/radiodial.tcl

@@ -234 +234 @@
         }
         set _current $newval
+
+        after cancel [itcl::code $this _redraw]
+        after idle [itcl::code $this _redraw]
+        event generate $itk_component(hull) <<Value>>
+
         return $_current
     }

trunk/gui/scripts/resultset.tcl

@@ -14 +14 @@
 option add *ResultSet.width 4i widgetDefault
 option add *ResultSet.height 4i widgetDefault
+option add *ResultSet.missingData skip widgetDefault
 option add *ResultSet.toggleBackground gray widgetDefault
 option add *ResultSet.toggleForeground white widgetDefault
@@ -28 +29 @@
     itk_option define -textfont textFont Font ""
     itk_option define -boldfont boldFont Font ""
+    itk_option define -missingdata missingData MissingData ""
     itk_option define -clearcommand clearCommand ClearCommand ""
     itk_option define -settingscommand settingsCommand SettingsCommand ""
@@ -413 +415 @@
             grid $w -row $_counter -column 1 -sticky ew
             bind $w <<Value>> \
-                [itcl::code $_dispatcher event -after 100 !settings]
+                [itcl::code $_dispatcher event -after 100 !settings column $col widget $w]
             set _col2widget($col) $w
 
@@ -566 +568 @@
         #
         _doSettings $plist
-    } else {
+    } elseif {$itk_option(-missingdata) == "skip"} {
+        #
+        # No data for these settings.  Try leaving the next
+        # column open, then the next, and so forth, until
+        # we find some data.
+        #
+        array set eventdata $args
+        if {[info exists eventdata(column)]} {
+            set changed $eventdata(column)
+            set allcols [lrange [$_results column names] 1 end]
+            set i [lsearch -exact $allcols $changed]
+            set search [concat \
+                [lrange $allcols [expr {$i+1}] end] \
+                [lrange $allcols 0 [expr {$i-1}]] \
+            ]
+            set nsearch [llength $search]
+
+            set tweak(widget) ""
+            set tweak(value) ""
+            for {set i 0} {$i < $nsearch} {incr i} {
+                set format $eventdata(column)
+                set tuple [$eventdata(widget) get current]
+                for {set j [expr {$i+1}]} {$j < $nsearch} {incr j} {
+                    set col [lindex $search $j]
+                    set w $_col2widget($col)
+                    lappend format $col
+                    lappend tuple [$w get current]
+                }
+                set ilist [$_results find -format $format -- $tuple]
+                if {[llength $ilist] > 0} {
+                    set col [lindex $search $i]
+                    set tweak(widget) $_col2widget($col)
+                    set first [lindex $ilist 0]
+                    set tweak(value) [$_results get -format $col -- $first]
+                    break
+                }
+            }
+
+            # set the value to the next valid result
+            if {$tweak(widget) != ""} {
+                $tweak(widget) current $tweak(value)
+            }
+        }
+
+    } elseif {$itk_option(-missingdata) == "prompt"} {
         # prompt the user to simulate these settings
         _doPrompt on
@@ -631 +677 @@
     $_dispatcher event -idle !settings
 }
+
+# ----------------------------------------------------------------------
+# OPTION: -missingdata
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::ResultSet::missingdata {
+    set opts {prompt skip}
+    if {[lsearch -exact $opts $itk_option(-missingdata)] < 0} {
+        error "bad value \"$itk_option(-missingdata)\": should be [join $opts {, }]"
+    }
+}