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

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

version 1.12, 2001/12/20 22:36:35 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 116  my %axis_defaults = Line 116  my %axis_defaults =
   
 my %curve_defaults =   my %curve_defaults = 
     (      (
      color     => {default => 'x000000', test => $color_test             },       color     => {default => 'x000000', test => $color_test     },
      name      => {default => 'x000000', test => sub {1} },#sub {$_[0]=~/^[\w ]*$/} },       name      => {default => '',        test => $words_test     },
      linestyle => {default => 'lines',   test => $linestyle_test         }       linestyle => {default => 'lines',   test => $linestyle_test }
      );       );
   
 ##  ##
Line 155  sub end_plot { Line 155  sub end_plot {
  ('title','xlabel','ylabel','key','axis','label','curve'));   ('title','xlabel','ylabel','key','axis','label','curve'));
     my $result = '';      my $result = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  ## Determine filename -- Need to use the 'id' thingy that Gerd    ##
  ## mentioned.   ## Make sure we have all the input we need:
    if (! defined(%plot  )) { &set_defaults(\%plot,\%plot_defaults); }
    if (! defined(%key   )) {} # No key for this plot
    if (! defined(%axis  )) { &set_defaults(\%axis,\%axis_defaults); }
    if (! defined($title )) {} # No title for this plot
    if (! defined($xlabel)) {} # No xlabel for this plot
    if (! defined($ylabel)) {} # No ylabel for this plot
    if ($#labels < 0) { } # No labels for this plot
    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
  my $tmpdir = '/home/httpd/perl/tmp/';   my $tmpdir = '/home/httpd/perl/tmp/';
  my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.   my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
     '_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" 
Line 394  sub end_axis { Line 412  sub end_axis {
     return $result;      return $result;
 }  }
   
   ##----------------------------------------------------------- set_defaults
   sub set_defaults {
       my $var      = shift;
       my $defaults = shift;
       my $key;
       foreach $key (keys %$defaults) {
    $var->{$key} = $defaults->{$key}->{'default'};
       }
   }
   
 ##------------------------------------------------------------------- misc  ##------------------------------------------------------------------- misc
 sub get_attributes{  sub get_attributes{
     my $values   = shift;      my $values   = shift;
Line 427  sub write_gnuplot_file { Line 455  sub write_gnuplot_file {
     my @Colors;      my @Colors;
     push @Colors, $plot{'bgcolor'};      push @Colors, $plot{'bgcolor'};
     push @Colors, $plot{'fgcolor'};       push @Colors, $plot{'fgcolor'}; 
     push @Colors, $axis{'color'};      push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
     push @Colors, $axis{'color'};       push @Colors, $Colors[-1];  # Redundancy
     foreach $curve (@curves) {      foreach $curve (@curves) {
  push @Colors, ($curve->{'color'} ne '' ?    push @Colors, ($curve->{'color'} ne '' ? 
        $curve->{'color'}       :          $curve->{'color'}       : 
        $plot{'fgcolor'}      );         $plot{'fgcolor'}        );
     }      }
     # set term      # set term
     $gnuplot_input .= 'set term gif ';      $gnuplot_input .= 'set term gif ';
Line 446  sub write_gnuplot_file { Line 474  sub write_gnuplot_file {
     $gnuplot_input .= ($plot{'border'} eq 'on'?      $gnuplot_input .= ($plot{'border'} eq 'on'?
        'set border'.$/           :         'set border'.$/           :
        'set noborder'.$/         );    # title, xlabel, ylabel         'set noborder'.$/         );    # title, xlabel, ylabel
     {      $gnuplot_input .= "set output\n";
     $gnuplot_input .= <<"ENDLABELS";      $gnuplot_input .= "set title  \"$title\"\n"  if (defined($title)) ;
 set output       $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
 set title  "$title"      $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
 set xlabel "$xlabel"      if (defined(%axis)) {
 set ylabel "$ylabel"   $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
 set xrange \[$axis{'xmin'}:$axis{'xmax'}\]   $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
 set yrange \[$axis{'ymin'}:$axis{'ymax'}\]  
 ENDLABELS  
     }      }
     # Key      # Key
     if (defined($key{'pos'})) {      if (defined(%key)) {
  $gnuplot_input .= 'set key '.$key{'pos'}.' ';   $gnuplot_input .= 'set key '.$key{'pos'}.' ';
  if ($key{'title'} ne '') {   if ($key{'title'} ne '') {
     $gnuplot_input .= 'title "'.$key{'title'}.'" ';      $gnuplot_input .= 'title "'.$key{'title'}.'" ';
Line 465  ENDLABELS Line 491  ENDLABELS
  $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;   $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
     } else {      } else {
  $gnuplot_input .= 'set nokey'.$/;   $gnuplot_input .= 'set nokey'.$/;
     }          }
     # labels      # labels
     my $label;      my $label;
     foreach $label (@labels) {      foreach $label (@labels) {
Removed from v.1.12  
changed lines
  Added in v.1.14

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