Changeset 33949 for branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool.pl

Timestamp:

May 29, 2012, 5:08:07 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/ippMonitor

Files:

• . (modified) (1 prop)
• czartool/czartool.pl (modified) (8 diffs)

branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool.pl

@@ -32 +32 @@
 my @publishingLabels = undef;
 
-my @stages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist", "pub"); 
+my @stages = ("chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist", "pub", "chipbackground"); 
 promptPoll();
 
@@ -155 +155 @@
 
     chomp($label);
-
-    printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                                         %32s                                                     |\n", $label);
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
-    printf("|   state    |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    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("%14s|", $stage)
+    }
+    printf("\n");
+    printf("+------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
 
     my $state;
-    my $stage;
     my $i=0;
     foreach $state (@states) {
@@ -172 +184 @@
         foreach $stage (@stages) {
 
-            printf("| %10s ", getStateAndFaultsString($label, $state, $stage));
+            printf("|%14s", getStateAndFaultsString($label, $state, $stage));
         }
 
@@ -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    |   magic    |  destreak  |    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("%14s|", $stage)
+    }
+    printf("\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
+
     foreach $stdsLabel (@stdscienceLabels) {
 
@@ -225 +255 @@
         foreach $stage (@stages) {
 
-            printf("| %10s ", getStateAndFaultsString($stdsLabel, $state, $stage));
+            printf("|%14s", getStateAndFaultsString($stdsLabel, $state, $stage));
         }
 
@@ -232 +262 @@
     }
 
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+-----+----------------------------------+---------------+---------------+");
+    foreach $stage (@stages) {
+        print "--------------+"
+    }
+    printf("\n");
 
 }