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

Diff for /loncom/xml/lonplot.pm between versions 1.15 and 1.16

version 1.15, 2001/12/21 20:06:25 version 1.16, 2001/12/21 21:39:51
Line 87  my %plot_defaults = Line 87  my %plot_defaults =
      transparent  => {default => 'off',     test => $onoff_test },       transparent  => {default => 'off',     test => $onoff_test },
      grid         => {default => 'off',     test => $onoff_test },       grid         => {default => 'off',     test => $onoff_test },
      border       => {default => 'on',      test => $onoff_test },       border       => {default => 'on',      test => $onoff_test },
      font         => {default => 'medium',  test => $sml_test   }       font         => {default => 'medium',  test => $sml_test   },
        align        => {default => 'left',    test => $words_test }
      );       );
   
 my %key_defaults =   my %key_defaults = 
Line 187  sub end_plot { Line 188  sub end_plot {
  close($fh);   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" 
      alt = "/cgi-bin/plot.gif?$filename" />       width  = "$plot{'width'}" 
        height = "$plot{'height'}"
        align  = "$plot{'align'}"
        alt    = "/cgi-bin/plot.gif?$filename" />
 ENDIMAGE  ENDIMAGE
     }      }
     return $result;      return $result;
Line 360  sub start_data { Line 364  sub start_data {
  delete($curves[-1]->{'function'});   delete($curves[-1]->{'function'});
     }      }
     my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);      my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
     $datatext =~ s/\s+//g;  # No whitespace, numbers must be seperated      $datatext =~ s/\s+/ /g;  # No whitespace, numbers must be seperated
                             # by commas                              # by commas
     if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {      if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {
  &Apache::lonxml::warning('Malformed data: '.$datatext);   &Apache::lonxml::warning('Malformed data: '.$datatext);
Line 369  sub start_data { Line 373  sub start_data {
     # Need to do some error checking on the @data array -       # Need to do some error checking on the @data array - 
     # make sure it's all numbers and make sure each array       # make sure it's all numbers and make sure each array 
     # is of the same length.      # is of the same length.
     my @data = split /,/,$datatext;      my @data;
       if ($datatext =~ /,/) {
           @data = split /,/,$datatext;
       } else { # Assume it's space seperated.
           @data = split / /,$datatext;
       }
     for (my $i=0;$i<=$#data;$i++) {      for (my $i=0;$i<=$#data;$i++) {
  # Check that it's non-empty   # Check that it's non-empty
  # Check that it's a number   # Check that it's a number
Removed from v.1.15  
changed lines
  Added in v.1.16

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