[BACK]Return to lonplot.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.13 and 1.14

version 1.13, 2001/12/21 15:27:29 version 1.14, 2001/12/21 16:59:01
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 12/15/01 Matthew  # 12/15/01 Matthew
 # 12/18 12/19 12/20 Matthew  # 12/17 12/18 12/19 12/20 12/21 Matthew
 package Apache::lonplot;  package Apache::lonplot;
   
 use strict;  use strict;
Line 56  sub BEGIN { Line 56  sub BEGIN {
 ##  ##
 ##  @labels: $labels[$i] = \%label  ##  @labels: $labels[$i] = \%label
 ##           %label: text, xpos, ypos, justify  ##           %label: text, xpos, ypos, justify
 ##   ##
 ##  @curves: $curves[$i] = \%curve  ##  @curves: $curves[$i] = \%curve
 ##        %curve: name, linestyle, ( function | data )  ##           %curve: name, linestyle, ( function | data )
 ##  ##
 ##  $curves[$i]->{'data'} = [ [x1,x2,x3,x4],  ##  $curves[$i]->{'data'} = [ [x1,x2,x3,x4],
 ##                            [y1,y2,y3,y4] ]  ##                            [y1,y2,y3,y4] ]
Line 158  sub end_plot { Line 158  sub end_plot {
  ##   ##
  ## Make sure we have all the input we need:   ## Make sure we have all the input we need:
  if (! defined(%plot  )) { &set_defaults(\%plot,\%plot_defaults); }   if (! defined(%plot  )) { &set_defaults(\%plot,\%plot_defaults); }
  if (! defined(%key   )) {} # No key for this plot    if (! defined(%key   )) {} # No key for this plot
  if (! defined(%axis  )) { &set_defaults(\%axis,\%axis_defaults); }   if (! defined(%axis  )) { &set_defaults(\%axis,\%axis_defaults); }
  if (! defined($title )) {} # No title for this plot    if (! defined($title )) {} # No title for this plot
  if (! defined($xlabel)) {} # No xlabel for this plot    if (! defined($xlabel)) {} # No xlabel for this plot
  if (! defined($ylabel)) {} # No ylabel for this plot    if (! defined($ylabel)) {} # No ylabel for this plot
  if ($#labels < 0) { } # No labels for this plot   if ($#labels < 0) { } # No labels for this plot
  if ($#curves < 0) { } # This is an error   if ($#curves < 0) { 
       &Apache::lonxml::warning("No curves specified for plot!!!!");
       return '';
    }
    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");
    return '';
       }
    }
  ##   ##
  ## Determine filename   ## Determine filename
  my $tmpdir = '/home/httpd/perl/tmp/';   my $tmpdir = '/home/httpd/perl/tmp/';
Line 172  sub end_plot { Line 182  sub end_plot {
     '_'.time.'_'.$$.'_plot.data';      '_'.time.'_'.$$.'_plot.data';
  ## Write the plot description to the file   ## Write the plot description to the file
  my $fh=Apache::File->new(">$tmpdir$filename");   my $fh=Apache::File->new(">$tmpdir$filename");
  $result .= '<pre>';  
  $result .= $filename.$/;  
  print $fh &write_gnuplot_file();   print $fh &write_gnuplot_file();
  $result .= '</pre>'.$/;   close($fh);
  ## return image tag for the plot   ## return image tag for the plot
  $result .= <<"ENDIMAGE";   $result .= <<"ENDIMAGE";
 <img src = "/cgi-bin/plot.gif?$filename"   <img src = "/cgi-bin/plot.gif?$filename" 
Removed from v.1.13  
changed lines
  Added in v.1.14

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>