Index: branches/eam_branches/ipp-20100621/tools/czarplot.pl
===================================================================
--- branches/eam_branches/ipp-20100621/tools/czarplot.pl	(revision 28794)
+++ branches/eam_branches/ipp-20100621/tools/czarplot.pl	(revision 28980)
@@ -21,4 +21,5 @@
 my $histogram = undef;
 my $timeSeries = undef;
+my $nebulous = undef;
 my $savingToFile = undef;
 
@@ -32,4 +33,5 @@
         "output|o=s" => \$path,
         "histogram|h" => \$histogram,
+        "nebulous|n" => \$nebulous,
         "timeseries|t" => \$timeSeries,
         "verbose|v" => \$verbose,
@@ -41,6 +43,8 @@
 if (!$timeSeries) {
     print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";} 
+if (!$nebulous) {
+    print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";} 
 if (!$label) {
-    print "* OPTIONAL: choose a label                  -l <labellName>             (default='all_labels')\n";}
+    print "* OPTIONAL: choose a label                  -l <labellName>             (default='all_stdscience_labels')\n";}
 if (!$stage) {
     print "* OPTIONAL: choose a stage                  -s <chip|cam|warp|etc>      (default=none)\n";}
@@ -57,6 +61,6 @@
 
 # default values
-if (!$label) {$label = "all_labels";}
-if (!$histogram && !$timeSeries) {$timeSeries = 1; $histogram = 1;}
+if (!$label) {$label = "all_stdscience_labels";}
+if (!$nebulous && !$histogram && !$timeSeries) {$timeSeries = 1; $histogram = 0;}
 if (!$verbose) {$verbose = 0;}
 if (!$save_temps) {$save_temps = 0;}
@@ -67,5 +71,5 @@
 $czarDb->setDateFormat("%Y%m%d-%H%i%s");
 
-my $czarplot = new czartool::Czarplot($czarDb, "%Y%m%d-%H%M%S", $savingToFile ? "png" : "X11", $path, $save_temps);
+my $czarplot = new czartool::Czarplot($czarDb, "%Y%m%d-%H%M%S", $savingToFile ? "png font \"/usr/share/fonts/corefonts/arial.ttf\" 8" : "X11", $path, $save_temps);
 
 my @allStages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
@@ -78,5 +82,9 @@
 }
 
-if ($timeSeries) {$czarplot->createTimeSeries($label, $stage, $begin, $end);}
+my $diskUsage = 1; # TODO
+
+if (!$nebulous && $timeSeries) {$czarplot->createTimeSeries($label, $stage, $begin, $end);}
 if ($histogram) {$czarplot->createHistogram($label, $begin, $end);}
+if ($nebulous && $timeSeries) {$czarplot->plotStorageTimeSeries($begin, $end);}
+elsif ($nebulous) {$czarplot->plotDiskUsageHistogram();}