Changeset 2087

Timestamp:

Feb 7, 2011 6:13:01 PM (13 years ago)

Author:

braffert

Message:

tester: added progress bar when running test

Location:

trunk/tester

Files:

• example/fermi_broken.tcl (modified) (1 diff)
• scripts/main.tcl (modified) (2 diffs)

trunk/tester/example/fermi_broken.tcl

@@ -30 +30 @@
 
 # take a while and give some output along the way
+Rappture::Utils::progress 0 -mesg "Starting..."
 puts "Taking a while to run..."
-after 2000
+after 1000
 puts "making some progress"
-after 2000
+after 1000
 puts "done"
+Rappture::Utils::progress 10 -mesg "Starting, for real now."
+after 1000
 
 # Label output graph with title, x-axis label,

trunk/tester/scripts/main.tcl

@@ -171 +171 @@
 pack $win.testrun.title -side top -anchor w
 
+Rappture::Progress $win.testrun.progress
 button $win.testrun.abort -text "Abort"
 pack $win.testrun.abort -side bottom -pady {8 0}
@@ -346 +347 @@
             # plug this object into the "Abort" button
             $testrun.abort configure -command [list $testobj abort]
+
+            # hide progress bar
+            pack forget $testrun.progress
         }
         add {
+            set message [lindex $args 0]
+            # scan for progress updates
+            while {[regexp -indices \
+                {=RAPPTURE-PROGRESS=> *([-+]?[0-9]+) +([^\n]*)(\n|$)} $message \
+                 match percent mesg]} {
+
+                foreach {i0 i1} $percent break
+                set percent [string range $message $i0 $i1]
+
+                foreach {i0 i1} $mesg break
+                set mesg [string range $message $i0 $i1]
+
+                pack $testrun.progress -fill x -padx 10 -pady 10
+                $testrun.progress settings -percent $percent -message $mesg
+
+                foreach {i0 i1} $match break
+                set message [string replace $message $i0 $i1]
+            }
+
             $testrun.scrl.info configure -state normal
-            $testrun.scrl.info insert end [lindex $args 0]
+            $testrun.scrl.info insert end $message
 
             # if there are too many lines, delete some