svn commit: r329045 - /spamassassin/trunk/masses/rule-qa/rule-hits-over-time

[jm...@apache.org]

Author: jm
Date: Thu Oct 27 19:35:05 2005
New Revision: 329045

URL: http://svn.apache.org/viewcvs?rev=329045&view=rev
Log:
at least make the background colour more consistent, at black

Modified:
    spamassassin/trunk/masses/rule-qa/rule-hits-over-time

Modified: spamassassin/trunk/masses/rule-qa/rule-hits-over-time
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/rule-hits-over-time?rev=329045&r1=329044&r2=329045&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/rule-hits-over-time (original)
+++ spamassassin/trunk/masses/rule-qa/rule-hits-over-time Thu Oct 27 19:35:05 2005
@@ -22,6 +22,7 @@
 use SDBM_File;
 use GD;
 use GD::Graph;
+use GD::Graph::colour qw(:colours :lists :files :convert);
 
 use strict;
 use warnings;
@@ -71,6 +72,8 @@
 # my $y_ceiling                     = 3000; # mails per $period
 
 my $fname_counter = 1;
+my %graph_png_data = ();
+
 my %allbuckets = ();
 my %allresults = ();
 my @allfiles = ();
@@ -85,9 +88,10 @@
 my $seen_n;
 
 my $tmpdir = "/tmp/rulehits.$$";
+my $outdir = ".";
 if ($opt_cgi) {
   mkdir ($tmpdir) or die "collided on $tmpdir";
-  chdir ($tmpdir);
+  $outdir = $tmpdir;
 }
 
 my $file_sets = [ ];    # split into ham and spam
@@ -96,6 +100,9 @@
   $file_sets = [ [ 'TITLE:hits in ham' ], [ 'TITLE:hits in spam' ] ];
 }
 
+# create all images as truecolor, with opaque background
+GD::Image->trueColor(1);
+
 foreach my $file (@ARGV) {
   if ($graph_files_individually) {
     push @{$file_sets}, [ $file ];
@@ -128,7 +135,7 @@
     }
     push (@allfiles, $file);
 
-    if (1) {
+    if (0) {
       # use an on-disk file to avoid massive VM usage for this hash
       # on huge datasets
       unlink("graph.tmp.dir");
@@ -150,24 +157,35 @@
   plot_gd();
 }
 
-my $format = $gd->export_format;
+my $format = "png";
+# my $format = $gd->export_format;
 
 if (!$graph_files_individually) {
-  my $both = new GD::Image($graph_x, $graph_y * 2);
-  my $file01 = new GD::Image("file01.$format") or die;
-  my $file02 = new GD::Image("file02.$format") or die;
-  $both->copy($file01, 0, 0, 0, 0, $graph_x-1, $graph_y-1);
-  $both->copy($file02, 0, $graph_y, 0, 0, $graph_x-1, $graph_y-1);
+  my $both = GD::Image->new($graph_x, 15 + ($graph_y * 2), 1);
+  my $file01 = GD::Image->newFromPngData($graph_png_data{"file01"}, 1);
+  my $file02 = GD::Image->newFromPngData($graph_png_data{"file02"}, 1);
+
+  # I thought this might work around the "black background" issue,
+  # but it doesn't :(
+  # my $white = $both->colorAllocate(255,255,255);
+  # $both->filledRectangle(0, 0, $graph_x, 15 + ($graph_y * 2), $white);
+
+  $both->copy($file01, 0, 5, 0, 0, $graph_x-1, $graph_y-1);
+  $both->copy($file02, 0, 10 + $graph_y, 0, 0, $graph_x-1, $graph_y-1);
+
+  # $both->copyResampled($file01, 0, 5, 0, 0,
+  #            $graph_x/2, $graph_y/2, $graph_x-1, $graph_y-1);
+  # $both->copyResampled($file02, 0, 10 + $graph_y, 0, 0,
+  #            $graph_x/2, $graph_y/2, $graph_x-1, $graph_y-1);
 
   if ($opt_cgi) {
     use CGI qw(:standard);
-    my $format = $gd->export_format;
-    print header("image/$format"); binmode STDOUT;
+    # print header("image/$format"); binmode STDOUT;
     print STDOUT $both->$format();
   }
   else {
     open(IMG, ">both.$format") or die $!; binmode IMG;
-    print IMG $gd->gd()->$format();
+    print IMG $both->$format();
     close IMG;
   }
 
@@ -272,7 +290,6 @@
   $this_file_results->{"n".$lastbucket} = $seen_n; $seen_n = 0;
 }
 
-
 sub create_gd {
   my $title = shift;
 
@@ -281,12 +298,14 @@
   $gd->set (
       title => $title,
       box_axis => 1,
+      transparent => 1,
+      interlaced => 0,
       # show_values => 1,
 
-      bgclr => "#ffffff",
-      fgclr => "#000000",
-      boxclr => "#fdfdfd",
-      labelclr => "#000000",
+      # bgclr => "#ffffff",     # doesn't seem to work?!
+      # boxclr => "#ffffff",
+      fgclr => "#444444",
+      labelclr => "#333333",
 
       dclrs => [
         "#33cc00",  # green
@@ -298,6 +317,10 @@
         "#333333",  # dark grey
         "#999999"   # light grey
       ],
+
+      t_margin => 5,
+      b_margin => 5,
+      l_margin => 5,
       r_margin => 20,
 
       y_label => ($scale_to_total_volume ?
@@ -334,14 +357,19 @@
 
     ';
   }
+  elsif (!$graph_files_individually) {
+    $gd->plot($graph_data);
+    my $graphname = sprintf("file%02d", $fname_counter++);
+    $gd->gd()->transparent(-1);
+    $graph_png_data{$graphname} = $gd->gd()->png;
+  }
   else {
     $gd->plot($graph_data);
-    my $format = $gd->export_format;
-    my $fname = sprintf("file%02d.%s", $fname_counter++, $format);
+    my $format = "png";
+    my $fname = sprintf("$outdir/file%02d.%s", $fname_counter++, $format);
     open(IMG, ">$fname") or die $!;
     binmode IMG;
     print IMG $gd->gd()->$format();
     close IMG;
-
   }
 }