Changeset 29119 for trunk/tools/czartool/CzarDb.pm

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/czartool/CzarDb.pm (modified) (3 diffs)

trunk/tools/czartool/CzarDb.pm

@@ -242 +242 @@
 ###########################################################################
 sub createTimeSeriesData {
-    my ($self, $label, $stage, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff, $dataFileLin, $dataFileLog) = @_;
-
-    ${$dataFileLin} = "/tmp/czarplot_gnuplot_lin_".$label."_".$stage."_t.dat";
-    ${$dataFileLog} = "/tmp/czarplot_gnuplot_log_".$label."_".$stage."_t.dat";
-    open (GNUDATLIN, ">${$dataFileLin}");
-    open (GNUDATLOG, ">${$dataFileLog}");
+    my ($self, $label, $stage, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff, $dataFile, $isLog) = @_;
+
+    ${$dataFile} = "/tmp/czarplot_gnuplot_".$label."_".$stage."_t.dat";
+
+    open (GNUDAT, ">${$dataFile}") or print "* Problem opening gnuplot data file for plot for '$label' '$stage'\n";
 
     my $query = $self->{_db}->prepare(<<SQL);
@@ -264 +263 @@
 
     my $minProcessed = undef;
-
-    ($minProcessed, ${$maxY}, ${$minY}, ${$maxX}, ${$minX}, ${$timeDiff}) = $query->fetchrow_array();
+    my ($_maxY, $_minY, $_timeDiff);
+    ($minProcessed, $_maxY, $_minY, ${$maxX}, ${$minX}, $_timeDiff) = $query->fetchrow_array();
+
+    if ($_maxY > ${$maxY}) {${$maxY} = $_maxY;}
+    if ($_minY < ${$minY}) {${$minY} = $_minY;}
+    if ($_timeDiff > ${$timeDiff}) {${$timeDiff} = $timeDiff;}
 
     if (!defined $minProcessed) {return 0;}
@@ -284 +287 @@
         my ($timestamp, $pending, $faults, $processed) = @row;
 
-        my $processedLog = log($processed + 1);
-        my $pendingLog = log($pending + 1);
-        my $faultsLog = log($faults + 1);
-
-    #    print  "'$timestamp' '$pending' '$faults' '$processed'\n";
-        print GNUDATLIN "$timestamp $pending $faults $processed\n";
-        print GNUDATLOG "$timestamp $pendingLog $faultsLog $processedLog\n";
-    }
-
-    close(GNUDATLIN);
-    close(GNUDATLOG);
+        if ($isLog) {
+
+            $processed = log($processed + 1);
+            $pending = log($pending + 1);
+            $faults = log($faults + 1);
+        }
+
+        print GNUDAT "$timestamp $pending $faults $processed\n";
+    }
+
+    close(GNUDAT) or print "* Problem closing gnuplot data file for plot for '$label' '$stage'\n";
 
     return 1;