Changeset 30250 for trunk/tools/czartool/Plotter.pm

Timestamp:

Jan 12, 2011, 2:52:40 PM (16 years ago)

Author:

rhenders

Message:

Long overdue introduction of XML config file for czartool

File:

• trunk/tools/czartool/Plotter.pm (modified) (6 diffs)

trunk/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();
+}
 
 ###########################################################################