Changeset 33802

Timestamp:

Apr 18, 2012, 3:29:38 PM (14 years ago)

Author:

rhenders

Message:

improved table printing so that new stages can be added/removed easily

File:

• trunk/ippMonitor/czartool/czartool.pl (modified) (5 diffs)

trunk/ippMonitor/czartool/czartool.pl

@@ -155 +155 @@
 
     chomp($label);
-
-    printf("\n+--------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                            %32s                                        |\n", $label);
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
-    printf("|   state    |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |    dist    |   publish  |\n");
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    my $stage;
+
+    printf("\n|  %32s  \n", $label);
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "------------+"
+    }
+    printf("\n");
+    printf("|   state    |");
+    foreach $stage (@stages) {
+
+        printf(" %10s |", $stage)
+    }
+    printf("\n");
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "------------+"
+    }
+    printf("\n");
 
     my $state;
-    my $stage;
     my $i=0;
     foreach $state (@states) {
@@ -179 +191 @@
     }
 
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "------------+"
+    }
+    printf("\n");
 
 }
@@ -191 +207 @@
     my ($state) = @_;
 #print time, $/;
-    printf("\n+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                                                 %10s (any faults are shown in parentheses)                                                               |\n", $state);
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
-    printf("| no  |              label               | distributing? |  publishing?  |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |    dist    |   publish  |\n");
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    my $stage;
+
+    printf("|\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "------------+"
+    }
+    printf("\n");
+    printf("| no  |              label               | distributing? |  publishing?  |");
 
     my $stdsLabel;
@@ -202 +222 @@
     my $distributing;
     my $publishing;
-    my $stage;
     my $i=1;
+    foreach $stage (@stages) {
+
+        printf(" %10s |", $stage)
+    }
+    printf("\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "------------+"
+    }
+    printf("\n");
+
     foreach $stdsLabel (@stdscienceLabels) {
 
@@ -232 +262 @@
     }
 
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "------------+"
+    }
+    printf("\n");
 
 }