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

[sakharuk]

sakharuk		Wed Sep 10 09:50:30 2003 EDT

  Modified files:              
    /loncom/xml	lonplot.pm 
  Log:
  Bug 2138 (Gnuplot: allow separate font size for print and screen) is fixed. I've implemented one particular font "Helvetica" with default size 25pt. If you want to change these defaults feel free to do this. You even can introduce some additional attributes to have possibility dinamically overwrite these parameters. Unfortunately I do not know sufficiently well lonplot.pm module so this can be done far better by Mattew.
  
  
Index: loncom/xml/lonplot.pm
diff -u loncom/xml/lonplot.pm:1.87 loncom/xml/lonplot.pm:1.88
--- loncom/xml/lonplot.pm:1.87	Thu Aug 28 16:38:25 2003
+++ loncom/xml/lonplot.pm	Wed Sep 10 09:50:29 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.87 2003/08/28 20:38:25 matthew Exp $
+# $Id: lonplot.pm,v 1.88 2003/09/10 13:50:29 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1024,7 +1024,7 @@
 	# set output
 	$gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {
-	$gnuplot_input .= "set term postscript eps monochrome solid\n";
+	$gnuplot_input .= "set term postscript eps monochrome solid \"Helvetica\" 25 \n";
 	$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
 	    &Apache::lonnet::unescape($filename).".eps\"\n";
     }
@@ -1044,9 +1044,9 @@
     $gnuplot_input .= "set samples $plot{'samples'}\n";
     # title, xlabel, ylabel
     # titles
-    $gnuplot_input .= "set title  \"$title\"\n"  if (defined($title)) ;
-    $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
-    $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
+    $gnuplot_input .= "set title  \"$title\" font \"Helvetica,25pt\"\n"  if (defined($title)) ;
+    $gnuplot_input .= "set xlabel \"$xlabel\" font \"Helvetica,25pt\" \n" if (defined($xlabel));
+    $gnuplot_input .= "set ylabel \"$ylabel\" font \"Helvetica,25pt\"\n" if (defined($ylabel));
     # tics
     if (%xtics) {    
 	$gnuplot_input .= "set xtics $xtics{'location'} ";
@@ -1081,7 +1081,7 @@
     my $label;
     foreach $label (@labels) {
 	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
-	    $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;
+	    $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.' font "Helvetica,25pt"'.$/ ;
     }
     if ($target eq 'tex') {
         $gnuplot_input .="set size 1,".$plot{'height'}/$plot{'width'}*1.38;