Changeset 1966 for trunk/tester/testtree.tcl

Timestamp:

Nov 25, 2010 11:32:59 PM (13 years ago)

Author:

braffert

Message:

Developing regression tester

File:

• trunk/tester/testtree.tcl (modified) (7 diffs)

trunk/tester/testtree.tcl

@@ -22 +22 @@
 namespace eval Rappture::Regression::TestTree { #forward declaration }
 
-# ----------------------------------------------------------------------
-# CONSTRUCTOR
-# ----------------------------------------------------------------------
 itcl::class Rappture::Regression::TestTree {
     inherit itk::Widget 
 
     public variable command
+    public variable selectcommand
     public variable testdir
 
@@ -41 +39 @@
 }
 
-# TODO: figure out exactly what should go in here.
 itk::usual TestTree {
     keep -background -foreground -font
 }
-itk::usual TreeView {
-    keep -background -foreground -font
-}
-
+
+# ----------------------------------------------------------------------
+# CONSTRUCTOR
+# ----------------------------------------------------------------------
 itcl::body Rappture::Regression::TestTree::constructor {args} {
-    # TODO: Use separate tree data structure and insert into treeview
-    puts "Constructing TestTree."
-
     itk_component add treeview {
         blt::treeview $itk_interior.treeview -separator . -autocreate true \
             -selectmode multiple 
+    } {
     }
     $itk_component(treeview) column insert 0 result
@@ -66 +61 @@
     }
     pack $itk_component(bottomBar) -fill x
+    # TODO: Adjust spacing in bottom bar
 
     itk_component add bSelectAll {
@@ -83 +79 @@
     }
     pack $itk_component(lSelected) -side left -expand yes -fill x
-    $itk_component(treeview) configure -selectcommand "$this updateLabel"
 
     itk_component add bRun {
@@ -101 +96 @@
 itcl::configbody Rappture::Regression::TestTree::testdir {
     populate
+}
+
+# Forward the TestTree's selectcommand to the treeview, and update the label
+# as well.
+itcl::configbody Rappture::Regression::TestTree::selectcommand {
+    $itk_component(treeview) configure -selectcommand \
+        "$this updateLabel; $selectcommand"
 }
 
@@ -113 +115 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Regression::TestTree::populate {} {
-    puts "Populating TestTree."
     $itk_component(treeview) delete 0
     # TODO: add an appropriate icon
@@ -205 +206 @@
 itcl::body Rappture::Regression::TestTree::updateLabel {} {
     set n [llength [getSelected]]
-    $itk_component(lSelected) configure -text "$n tests selcted"
+    if {$n == 1} {
+        $itk_component(lSelected) configure -text "1 test selcted"
+    } else {
+        $itk_component(lSelected) configure -text "$n tests selected"
+    }
+
     if {$n > 0} {
         $itk_component(bRun) configure -state normal