--- loncom/xml/lonplot.pm	2003/02/07 22:03:21	1.81
+++ loncom/xml/lonplot.pm	2003/09/19 20:05:29	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.81 2003/02/07 22:03:21 albertel Exp $
+# $Id: lonplot.pm,v 1.90 2003/09/19 20:05:29 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,8 @@
 package Apache::lonplot;
 
 use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
 use Apache::File;
 use Apache::response;
 use Apache::lonxml;
@@ -112,7 +114,8 @@ my $words_test     = sub {$_[0]=~s/\s+/
 ##                                                               ##
 ###################################################################
 my @gnuplot_edit_order = 
-    qw/alttag bgcolor fgcolor height width font transparent grid samples border align/;
+    qw/alttag bgcolor fgcolor height width font transparent grid samples 
+    border align texwidth plottype/;
 
 my $gnuplot_help_text = <<"ENDPLOTHELP";
 <p>
@@ -221,7 +224,21 @@ my %gnuplot_defaults =
 	 description => 'alignment for image in html',
 	 edit_type   => 'choice',
 	 choices     => ['left','right','center']
-	 } 
+	 },
+     texwidth     => {
+         default     => '93',
+         test        => $int_test,
+         description => 'Width of plot when printed (mm)',
+         edit_type   => 'entry',
+         size        => '5'
+         },
+     plottype  => {
+	 default     => 'Cartesian',
+	 test        => sub {$_[0]=~/^(Polar|Cartesian)$/},
+	 description => 'Plot type:',
+	 edit_type   => 'choice',
+         choices     => ['Polar','Cartesian']
+         },
      );
 
 my %key_defaults = 
@@ -274,43 +291,51 @@ my %label_defaults =
      }
      );
 
-my @tic_edit_order = ('location','mirror','start','increment','end');
+my @tic_edit_order = ('location','mirror','start','increment','end',
+                      'minorfreq');
 my %tic_defaults =
     (
      location => {
 	 default => 'border', 
 	 test => sub {$_[0]=~/^(border|axis)$/},
-	 description => 'Location of tick marks',
+	 description => 'Location of major tic marks',
 	 edit_type   => 'choice',
 	 choices     => ['border','axis']
 	 },
      mirror => {
 	 default => 'on', 
 	 test => $onoff_test,
-	 description => 'mirror ticks on opposite axis?',
+	 description => 'mirror tics on opposite axis?',
 	 edit_type   => 'onoff'
 	 },
      start => {
 	 default => '-10.0',
 	 test => $real_test,
-	 description => 'Start ticks at',
+	 description => 'Start major tics at',
 	 edit_type   => 'entry',
 	 size        => '10'
 	 },
      increment => {
 	 default => '1.0',
 	 test => $real_test,
-	 description => 'Place a tick every',
+	 description => 'Place a major tic every',
 	 edit_type   => 'entry',
 	 size        => '10'
 	 },
      end => {
 	 default => ' 10.0',
 	 test => $real_test,
-	 description => 'Stop ticks at ',
+	 description => 'Stop major tics at ',
 	 edit_type   => 'entry',
 	 size        => '10'
 	 },
+     minorfreq => {
+	 default => '0',
+	 test => $int_test,
+	 description => 'Number of minor tics between major tic marks',
+	 edit_type   => 'entry',
+	 size        => '10'
+	 },         
      );
 
 my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
@@ -441,10 +466,10 @@ my %curve_defaults =
 my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
 
 sub start_gnuplot {
-    %plot    = ();      %key     = ();      %axis   = (); 
-    $title   = undef;   $xlabel  = undef;   $ylabel = undef;
-    $#labels = -1;      $#curves = -1;
-    %xtics    = ();      %ytics    = ();
+    undef(%plot);   undef(%key);    undef(%axis);
+    undef($title);  undef($xlabel); undef($ylabel);
+    undef(@labels); undef(@curves);
+    undef(%xtics);  undef(%ytics);
     #
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
@@ -506,7 +531,8 @@ sub end_gnuplot {
 ENDIMAGE
         } elsif ($target eq 'tex') {
 	    &Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
-	    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics{'.&Apache::lonnet::unescape($filename).'.eps}';
+
+	    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_end($target,$token);
@@ -798,7 +824,11 @@ sub start_function {
     my $result='';
     if ($target eq 'web' || $target eq 'tex') {
 	if (exists($curves[-1]->{'data'})) {
-	    &Apache::lonxml::warning('Use of <function> precludes use of <data>.  The <data> will be omitted in favor of the <function> declaration.');
+	    &Apache::lonxml::warning
+                ('Use of the <b>curve function</b> tag precludes use of '.
+                 ' the <b>curve data</b> tag.  '.
+                 'The curve data tag will be omitted in favor of the '.
+                 'curve function declaration.');
 	    delete $curves[-1]->{'data'} ;
 	}
         my $function = &Apache::lonxml::get_all_text("/function",$parser);
@@ -834,9 +864,11 @@ sub start_data {
     my $result='';
     if ($target eq 'web' || $target eq 'tex') {
 	if (exists($curves[-1]->{'function'})) {
-	    &Apache::lonxml::warning('Use of <data> precludes use of .'.
-	    '<function>.  The <function> will be omitted in favor of '.
-            'the <data> declaration.');
+	    &Apache::lonxml::warning
+                ('Use of the <b>curve function</b> tag precludes use of '.
+                 ' the <b>curve data</b> tag.  '.
+                 'The curve function tag will be omitted in favor of the '.
+                 'curve data declaration.');
 	    delete($curves[-1]->{'function'});
 	}
 	my $datatext = &Apache::lonxml::get_all_text("/data",$parser);
@@ -860,14 +892,14 @@ sub start_data {
 	    # Check that it's non-empty
 	    if (! defined($data[$i])) {
 		&Apache::lonxml::warning(
-		    'undefined <data> value.  Replacing with '.
+		    'undefined curve data value.  Replacing with '.
 		    ' pi/e = 1.15572734979092');
 		$data[$i] = 1.15572734979092;
 	    }
 	    # Check that it's a number
 	    if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
 		&Apache::lonxml::warning(
-		    'Bad <data> value of '.$data[$i].'  Replacing with '.
+		    'Bad curve data value of '.$data[$i].'  Replacing with '.
 		    ' pi/e = 1.15572734979092');
 		$data[$i] = 1.15572734979092;
 	    }
@@ -955,8 +987,13 @@ sub set_defaults {
 sub get_attributes{
     my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
     foreach my $attr (keys(%{$defaults})) {
-	$values->{$attr} = 
-	    &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+	if ($attr eq 'texwidth') {
+	    $values->{$attr} = 
+		&Apache::lonxml::get_param($attr,$parstack,$safeeval,undef,1);
+	} else {
+	    $values->{$attr} = 
+		&Apache::lonxml::get_param($attr,$parstack,$safeeval);
+	}
 	if ($values->{$attr} eq '' | !defined($values->{$attr})) {
 	    $values->{$attr} = $defaults->{$attr}->{'default'};
 	    next;
@@ -997,10 +1034,16 @@ sub write_gnuplot_file {
 	# 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";
     }
+    # cartesian or polar?
+    if (lc($plot{'plottype'}) eq 'polar') {
+        $gnuplot_input .= 'set polar'.$/;
+    } else {
+        # Assume Cartesian
+    }
     # grid
     $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
     # border
@@ -1011,9 +1054,15 @@ sub write_gnuplot_file {
     $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));
+    if ($target eq 'tex') {
+        $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));
+    } else {
+        $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));
+    }
     # tics
     if (%xtics) {    
 	$gnuplot_input .= "set xtics $xtics{'location'} ";
@@ -1021,6 +1070,9 @@ sub write_gnuplot_file {
 	$gnuplot_input .= "$xtics{'start'}, ";
 	$gnuplot_input .= "$xtics{'increment'}, ";
 	$gnuplot_input .= "$xtics{'end'}\n";
+        if ($xtics{'minorfreq'} != 0) {
+            $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
+        } 
     }
     if (%ytics) {    
 	$gnuplot_input .= "set ytics $ytics{'location'} ";
@@ -1028,6 +1080,9 @@ sub write_gnuplot_file {
 	$gnuplot_input .= "$ytics{'start'}, ";
 	$gnuplot_input .= "$ytics{'increment'}, ";
         $gnuplot_input .= "$ytics{'end'}\n";
+        if ($ytics{'minorfreq'} != 0) {
+            $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
+        } 
     }
     # axis
     if (%axis) {
@@ -1048,7 +1103,7 @@ sub write_gnuplot_file {
     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;
@@ -1135,7 +1190,7 @@ sub check_inputs {
     my $curve;
     foreach $curve (@curves) {
 	if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
-	    &Apache::lonxml::warning("One of the curves specified did not contain any <data> or <function> declarations\n");
+	    &Apache::lonxml::warning("One of the curves specified did not contain any curve data or curve function declarations\n");
 	    return '';
 	}
     }