Changeset 30586 for branches/czw_branch/20101203/tools/czartool/Plotter.pm

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• tools/czartool/Plotter.pm (modified) (7 diffs)

branches/czw_branch/20101203/tools/czartool/Plotter.pm

@@ -7 +7 @@
 
 use File::Temp;
+
+use czartool::Config;
 
 my @allStages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
@@ -18 +20 @@
     my $class = shift;
     my $self = {
-        _gpc1Db => shift,
-        _czarDb => shift,
+        _config => shift,
         _dateFormat => shift,
         _outputFormat => shift,
@@ -27 +28 @@
 
     bless $self, $class;
+    $self->init();
     return $self;
 }
@@ -38 +40 @@
     my $class = shift;
     my $self = {
-        _gpc1Db => shift,
-        _czarDb => shift,
+        _config => shift,
         _outputPath => shift,
         _save_temps => shift,
                                                     };
-
     $self->{_dateFormat} = "%Y%m%d-%H%M%S";
-    $self->{_outputFormat} = "png font \"/usr/share/fonts/corefonts/arial.ttf\" 8"; # TODO path needs to be in config
-
-        bless $self, $class;
+    $self->{_outputFormat} = "png font \"".$self->{_config}->getGnuplotFont()."\" ".$self->{_config}->getGnuplotFontSize();
+
+    bless $self, $class;
+    $self->init();
     return $self;
 }
@@ -59 +60 @@
     my $class = shift;
     my $self = {
-        _gpc1Db => shift,
-        _czarDb => shift,
+        _config => shift,
         _save_temps => shift,
     };
@@ -69 +69 @@
 
     bless $self, $class;
+    $self->init();
     return $self;
 }
 
-
+###########################################################################
+#
+# Some initialisation code common to all constructors
+#
+###########################################################################
+sub init {
+    my ($self) = @_;
+
+    $self->{_gpc1Db} = $self->{_config}->getGpc1Instance();
+    $self->{_czarDb} = $self->{_config}->getCzarDbInstance();
+}
 
 ###########################################################################
@@ -508 +519 @@
     GP->autoflush(1);
 
+    my $datFile = $tmpFile->filename;
     if ($self->{_outputFormat} ne "X11") {print GP "set output \"$outputFile\";";}
-    print GP
-        "set term $self->{_outputFormat};" .
-        "set title \"Total available cluster space over time\\nFrom $fromTime to $toTime HST\";" .
-        "set key left top;" .
-        "set xdata time;" .
-        "set timefmt \"$self->{_dateFormat}\";" .
-        "set format x \"$timeFormat\";" .
-        "set xtics \"$minX\", $divX, \"$maxX\";" .
-        "set grid xtics;" .
-        "set xlabel \"Time\";" .
-        "set ylabel \"Available (TB)\";" .
-        "plot " . 
-        "'".$tmpFile->filename."' using 1:2 title \"Available\" with lines lt 2 lw 2\n";
+    print GP <<PLOT;
+        set term $self->{_outputFormat}
+        set title "Total available cluster space over time\\nFrom $fromTime to $toTime HST"
+        set key left top
+        set xdata time
+        set timefmt "$self->{_dateFormat}"
+        set format x "$timeFormat"
+        set xtics "$minX", $divX, "$maxX"
+        set grid xtics
+        set xlabel "Time"
+        set ylabel "Available (TB)"
+        plot "$datFile" using 1:2 title "Available" with lines lt 2 lw 2
+PLOT
 
     print GP "\n";