Changeset 170 for trunk

Timestamp:

Feb 10, 2006 8:27:40 PM (18 years ago)

Author:

mmc

Message:

• Fixed the ResultSet? widget so that results with spaces in the name work properly when picking a combination that doesn't exist and skipping ahead to one that does.

• Fixed the font in the runinfo area to use a fixed width font for simulator output, so ASCII art shows up properly.

Location:

trunk/gui/scripts

Files:

• analyzer.tcl (modified) (6 diffs)
• resultset.tcl (modified) (2 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -27 +27 @@
 option add *Analyzer.font \
     -*-helvetica-medium-r-normal-*-*-120-* widgetDefault
+option add *Analyzer.codeFont \
+    -*-courier-medium-r-normal-*-*-120-* widgetDefault
 option add *Analyzer.textFont \
     -*-helvetica-medium-r-normal-*-*-120-* widgetDefault
@@ -35 +37 @@
     inherit itk::Widget
 
+    itk_option define -codefont codeFont Font ""
     itk_option define -textfont textFont Font ""
     itk_option define -boldtextfont boldTextFont Font ""
@@ -165 +168 @@
         usual
         ignore -borderwidth -relief
-        rename -font -textfont textFont Font
+        rename -font -codefont codeFont Font
     }
     $w.info contents $w.info.text
-
-    $itk_component(runinfo) tag configure ERROR -foreground red
 
     itk_component add progress {
@@ -225 +226 @@
 
     eval itk_initialize $args
+
+    $itk_component(runinfo) tag configure ERROR -foreground red
+    $itk_component(runinfo) tag configure text -font $itk_option(-textfont)
 
     #
@@ -300 +304 @@
     $itk_component(runinfo) configure -state normal
     $itk_component(runinfo) delete 1.0 end
-    $itk_component(runinfo) insert end "Running simulation...\n\n"
+    $itk_component(runinfo) insert end "Running simulation...\n\n" text
     $itk_component(runinfo) configure -state disabled
 
@@ -341 +345 @@
         $itk_component(runinfo) configure -state normal
         $itk_component(runinfo) delete 1.0 end
-        $itk_component(runinfo) insert end "Problem launching job:\n\n"
+        $itk_component(runinfo) insert end "Problem launching job:\n\n" text
         _simOutput $result
         $itk_component(runinfo) configure -state disabled

trunk/gui/scripts/resultset.tcl

@@ -591 +591 @@
             for {set i 0} {$i < $nsearch} {incr i} {
                 set format $eventdata(column)
-                set tuple [$eventdata(widget) get current]
+                set tuple [list [$eventdata(widget) get current]]
                 for {set j [expr {$i+1}]} {$j < $nsearch} {incr j} {
                     set col [lindex $search $j]
@@ -603 +603 @@
                     set tweak(widget) $_col2widget($col)
                     set first [lindex $ilist 0]
-                    set tweak(value) [$_results get -format $col -- $first]
+                    set tweak(value) [lindex [$_results get -format $col -- $first] 0]
                     break
                 }