Changeset 29119 for trunk/tools/czarplot.pl

Timestamp:

Sep 3, 2010, 3:55:23 PM (16 years ago)

Author:

rhenders

Message:

Changes to way log/linear plots are generated

File:

• trunk/tools/czarplot.pl (modified) (3 diffs)

trunk/tools/czarplot.pl

@@ -8 +8 @@
 
 use czartool::CzarDb;
-use czartool::Czarplot;
+use czartool::Plotter;
 
 my $czarDbName = "czardb";
@@ -85 +85 @@
 
 
-# GENE PLOTS my $czarplot = new czartool::Czarplot($czarDb, "%Y%m%d-%H%M%S", $savingToFile ? "png size 1280,960 font \"/usr/share/fonts/corefonts/arial.ttf\" 12" : "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);
+# GENE PLOTS my $plotter = new czartool::Plotter($czarDb, "%Y%m%d-%H%M%S", $savingToFile ? "png size 1280,960 font \"/usr/share/fonts/corefonts/arial.ttf\" 12" : "X11", $path, $save_temps);
+my $plotter = new czartool::Plotter($czarDb, "%Y%m%d-%H%M%S", $savingToFile ? "png font \"/usr/share/fonts/corefonts/arial.ttf\" 8" : "X11", $path, $save_temps);
 
 # sort out times
@@ -92 +92 @@
 if (!$begin) {
     if ($interval) {$begin = $czarDb->subtractInterval($end, $interval);}
-    else {$begin =  strftime('%Y-%m-%d 06:30',localtime);}
+    else {$begin =  strftime('%Y-%m-%d 06:35',localtime);}
 }
 
 my $diskUsage = 1; # TODO
 
-if (!$nebulous && $timeSeries) {$czarplot->createTimeSeries($label, $stage, $begin, $end, !$log, $log);}
-if ($histogram) {$czarplot->createHistogram($label, $begin, $end);}
-if ($nebulous && $timeSeries) {$czarplot->plotStorageTimeSeries($begin, $end);}
-elsif ($nebulous) {$czarplot->plotDiskUsageHistogram();}
+if (!$nebulous && $timeSeries) {$plotter->createTimeSeries($label, $stage, $begin, $end, $log);}
+if ($histogram) {$plotter->createHistogram($label, $begin, $end);}
+if ($nebulous && $timeSeries) {$plotter->plotStorageTimeSeries($begin, $end);}
+elsif ($nebulous) {$plotter->plotDiskUsageHistogram();}