[LON-CAPA-cvs] cvs: loncom /xml lonplot.pm

[matthew]

matthew		Thu Feb 24 17:01:40 2005 EDT

  Modified files:              
    /loncom/xml	lonplot.pm 
  Log:
  Added "plotcolor" attribute on the <gnuplot> tag.  Choices are "monochrome",
  "color", and "colour".  Defaults to "monochrome".
  
  
Index: loncom/xml/lonplot.pm
diff -u loncom/xml/lonplot.pm:1.104 loncom/xml/lonplot.pm:1.105
--- loncom/xml/lonplot.pm:1.104	Thu Dec  2 10:38:11 2004
+++ loncom/xml/lonplot.pm	Thu Feb 24 17:01:40 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.104 2004/12/02 15:38:11 www Exp $
+# $Id: lonplot.pm,v 1.105 2005/02/24 22:01:40 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -119,11 +119,10 @@
 ###################################################################
 my @gnuplot_edit_order = 
     qw/alttag bgcolor fgcolor height width font transparent grid samples 
-    border align texwidth texfont plottype lmargin rmargin tmargin bmargin 
-    major_ticscale minor_ticscale/;
+    border align texwidth texfont plotcolor plottype lmargin rmargin tmargin
+    bmargin major_ticscale minor_ticscale/;
 
-my $margin_choices = ['default',
-                      qw{0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20}];
+my $margin_choices = ['default',0..20];
 
 my %gnuplot_defaults = 
     (
@@ -215,6 +214,13 @@
          edit_type   => 'choice',
          choices     => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/],
          },
+     plotcolor   => {
+         default     => 'monochrome',
+         test        => sub {$_[0]=~/^(monochrome|color|colour)$/},
+         description => 'Color setting for printing:',
+         edit_type   => 'choice',
+         choices     => [qw/monochrome color colour/],
+         },
      plottype  => {
 	 default     => 'Cartesian',
 	 test        => sub {$_[0]=~/^(Polar|Cartesian)$/},
@@ -1038,7 +1044,7 @@
 	# set output
 	$gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {
-	$gnuplot_input .= "set term postscript eps monochrome solid \"Helvetica\" $pt \n";
+	$gnuplot_input .= "set term postscript eps $plot{'plotcolor'} solid \"Helvetica\" $pt \n";
 	$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
 	    &Apache::lonnet::unescape($filename).".eps\"\n";
     }