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

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

version 1.8, 2001/12/19 19:22:52 version 1.13, 2001/12/21 15:27:29
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 12/15/01 Matthew  # 12/15/01 Matthew
 # 12/18 Matthew  # 12/18 12/19 12/20 Matthew
 package Apache::lonplot;  package Apache::lonplot;
   
 use strict;  use strict;
   use Apache::File;
 use Apache::response;  use Apache::response;
 use Apache::lonxml;  use Apache::lonxml;
 use Digest::MD5  qw(md5 md5_hex md5_base64);  
   use Digest::MD5 qw(md5_base64);
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::lonplot',('plot'));    &Apache::lonxml::register('Apache::lonplot',('plot'));
 }  }
   
   ## 
   ## Description of data structures:
   ##
   ##  %plot       %key    %axis
   ## --------------------------
   ##  height      title   color
   ##  width       box     xmin
   ##  bgcolor     pos     xmax
   ##  fgcolor             ymin
   ##  transparent         ymax
   ##  grid
   ##  border
   ##  font
   ##
   ##  @labels: $labels[$i] = \%label
   ##           %label: text, xpos, ypos, justify
   ## 
   ##  @curves: $curves[$i] = \%curve
   ##        %curve: name, linestyle, ( function | data )
   ##
   ##  $curves[$i]->{'data'} = [ [x1,x2,x3,x4],
   ##                            [y1,y2,y3,y4] ]
   ##
   ##------------------------------------------------------------
 ##  ##
 ## Tests used in checking the validitity of input  ## Tests used in checking the validitity of input
 ##  ##
 my $int_test       = sub {$_[0]=~/^\d+$/};  my $int_test       = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
 my $real_test      = sub {$_[0]=~/^[+-]?\d*\.?\d*$/};  my $real_test      = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*$/};
 my $color_test     = sub {$_[0]=~/^x[\da-f]{6}$/};  my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
 my $onoff_test     = sub {$_[0]=~/^(on|off)$/};  my $onoff_test     = sub {$_[0]=~/^(on|off)$/};
 my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below)+$/};  my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below)+$/};
 my $sml_test       = sub {$_[0]=~/^(small|medium|large)$/};  my $sml_test       = sub {$_[0]=~/^(small|medium|large)$/};
 my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};  my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};
 my $words_test     = sub {$_[0]=~/^((\w+\b*)+$/};  my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^(\w+ ?)+$/};
 ##  ##
 ## Default values for attributes of elements  ## Default values for attributes of elements
 ##  ##
 my %plot_defaults =   my %plot_defaults = 
     (      (
      height       => {default => 200,       test => $int_test  },       height       => {default => 200,       test => $int_test   },
      width        => {default => 200,       test => $int_test  },       width        => {default => 200,       test => $int_test   },
      bgcolor      => {default => 'xffffff', test => $color_test},       bgcolor      => {default => 'xffffff', test => $color_test },
      fgcolor      => {default => 'x000000', test => $color_test},       fgcolor      => {default => 'x000000', test => $color_test },
      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   }
      );       );
   
 my %key_defaults =   my %key_defaults = 
     (      (
      title => { default => '',          test => $words_test  },       title => { default => '',          test => $words_test   },
      box   => { default => 'off',       test => $onoff_test  },       box   => { default => 'off',       test => $onoff_test   },
      pos   => { default => 'top right', test => $key_pos_test}       pos   => { default => 'top right', test => $key_pos_test }
      );       );
   
 my %label_defaults =   my %label_defaults = 
     (      (
      xpos    => {default => 0,         test => $real_test                   },       xpos    => {default => 0,         test => $real_test     },
      ypos    => {default => 0,         test => $real_test                   },       ypos    => {default => 0,         test => $real_test     },
      justify => {default => 'left',           justify => {default => 'left',    
                  test => sub {$_[0]=~/^(left|right|center)$/}}                   test => sub {$_[0]=~/^(left|right|center)$/} }
      );       );
   
 my %axis_defaults =   my %axis_defaults = 
     (      (
      color     => {default => 'x000000', test => $color_test},       color     => {default => 'x000000', test => $color_test},
 #     thickness => {default => 1,         test => $int_test  },       xmin      => {default => '-10.0',   test => $real_test },
      xmin      => {default => -10.0,     test => $real_test },       xmax      => {default => ' 10.0',   test => $real_test },
      xmax      => {default =>  10.0,     test => $real_test },       ymin      => {default => '-10.0',   test => $real_test },
      ymin      => {default => -10.0,     test => $real_test },       ymax      => {default => ' 10.0',   test => $real_test }
      ymax      => {default =>  10.0,     test => $real_test }  
      );       );
   
 my %curve_defaults =   my %curve_defaults = 
     (      (
      color     => {default => 'x000000', test => $color_test      },       color     => {default => 'x000000', test => $color_test     },
      name      => {default => 'x000000', test => sub {$_[0]=~/^[\w ]*$/} },       name      => {default => '',        test => $words_test     },
      linestyle => {default => 'lines',   test => $linestyle_test  }       linestyle => {default => 'lines',   test => $linestyle_test }
      );       );
   
 ##  ##
Line 101  my %curve_defaults = Line 127  my %curve_defaults =
 my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves);  my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves);
   
 sub start_plot {  sub start_plot {
     %plot = '';   %key='';    %axis='';       %plot    = undef;   %key     = undef;   %axis   = undef; 
     $title='';    $xlabel=''; $ylabel='';      $title   = undef;   $xlabel  = undef;   $ylabel = undef;
     @labels = ''; @curves='';      $#labels = -1;      $#curves = -1;
     #      #
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &Apache::lonxml::register('Apache::plot',      &Apache::lonxml::register('Apache::lonplot',
      ('title','xlabel','ylabel','key','axis','label','curve'));       ('title','xlabel','ylabel','key','axis','label','curve'));
     push (@Apache::lonxml::namespace,'plot');      push (@Apache::lonxml::namespace,'plot');
     ## Always evaluate the insides of the <plot></plot> tags      ## Always evaluate the insides of the <plot></plot> tags
Line 115  sub start_plot { Line 141  sub start_plot {
     $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);      $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
     &Apache::lonxml::newparser($parser,\$inside);      &Apache::lonxml::newparser($parser,\$inside);
     ##-------------------------------------------------------      ##-------------------------------------------------------
     &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,'plot');      &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
       $tagstack->[-1]);
     if ($target eq 'web') {      if ($target eq 'web') {
     }      }
     return '';      return '';
Line 128  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) { } # This is an error
    ##
    ## Determine filename
  my $tmpdir = '/home/httpd/perl/tmp/';   my $tmpdir = '/home/httpd/perl/tmp/';
  my $filename = $tmpdir.$ENV{'user.name'}.'_'.$ENV{'user.domain'}.   my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
     '_plot.data';      '_'.time.'_'.$$.'_plot.data';
  my $usersees=md5_base64($filename.'_'.$ENV{'REMOTE_ADDR'});  
   
  ## Write the plot description to the file   ## Write the plot description to the file
  my $fh=&Apache::File->new('/home/httpd/perl/tmp/'.$realname);   my $fh=Apache::File->new(">$tmpdir$filename");
  &write_gnuplot_file($fh);   $result .= '<pre>';
    $result .= $filename.$/;
    print $fh &write_gnuplot_file();
    $result .= '</pre>'.$/;
  ## return image tag for the plot   ## return image tag for the plot
  $result = '<img src=\"/cgi-bin/plot.cgi?'.$usersees.'"';   $result .= <<"ENDIMAGE";
   <img src = "/cgi-bin/plot.gif?$filename" 
        alt = "/cgi-bin/plot.gif?$filename" />
   ENDIMAGE
     }      }
     return $result;      return $result;
 }  }
Line 148  sub end_plot { Line 189  sub end_plot {
 sub start_key {  sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,$tagstack);      &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
       $tagstack->[-1]);
     if ($target eq 'web') {      if ($target eq 'web') {
  # This routine should never return anything.   # This routine should never return anything.
     }      }
Line 225  sub start_label { Line 267  sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my %label;      my %label;
     &get_attributes($label,\%label_defaults,$parstack,$safeeval,$tagstack);      &get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
     $label->{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);      $tagstack->[-1]);
       $label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
       if (! &$words_test($label{'text'})) {
    # I should probably warn about it, too.
    $label{'text'} = 'Illegal text';
       }
     push(@labels,\%label);      push(@labels,\%label);
     if ($target eq 'web') {      if ($target eq 'web') {
  # This routine should never return anything.   # This routine should never return anything.
Line 248  sub start_curve { Line 295  sub start_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my %curve;      my %curve;
     &get_attributes($curve,\%curve_defaults,$parstack,$safeeval,$tagstack);      &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
     push (@curves,$curve);      $tagstack->[-1]);
       push (@curves,\%curve);
     &Apache::lonxml::register('Apache::lonplot',('function','data'));      &Apache::lonxml::register('Apache::lonplot',('function','data'));
     push (@Apache::lonxml::namespace,'curve');      push (@Apache::lonxml::namespace,'curve');
     if ($target eq 'web') {      if ($target eq 'web') {
Line 272  sub end_curve { Line 320  sub end_curve {
 sub start_function {  sub start_function {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if (exists($curves[-1]->{'data'}) {      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 <function> precludes use of <data>.  The <data> will be omitted in favor of the <function> declaration.');
  delete($curves[-1]->{'data'});   delete $curves[-1]->{'data'} ;
     }      }
     $curves[-1]->{'function'} =       $curves[-1]->{'function'} = 
  &Apache::lonxml::get_all_text("/function",$$parser[-1]);   &Apache::lonxml::get_all_text("/function",$$parser[-1]);
Line 297  sub start_data { Line 345  sub start_data {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if (exists($curves[-1]->{'function'})) {      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 <data> precludes use of <function>.'.
               '  The <function> will be omitted in favor of the <data>'.
               ' declaration.');
  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+$|^\s+)//g;      $datatext =~ s/\s+//g;  # No whitespace, numbers must be seperated
     $datatext =~ s/\s+/ /g;                              # by commas
     if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {      if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {
  &Apache::lonxml::warning('Malformed data: '.$datatext);   &Apache::lonxml::warning('Malformed data: '.$datatext);
  $datatext = '';   $datatext = '';
Line 310  sub start_data { Line 360  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 = split /,/,$datatext;
     push( @{$curves[-1]->{'data'}},\@data;      for (my $i=0;$i<=$#data;$i++) {
    # Check that it's non-empty
    # Check that it's a number
    # Maybe I need a 'debug=on' switch to list the data set
    #    out in a warning?
       }
       push  @{$curves[-1]->{'data'}},\@data;
     if ($target eq 'web') {      if ($target eq 'web') {
  # This routine should never return anything.   # This routine should never return anything.
     }      }
Line 331  sub end_data { Line 387  sub end_data {
 sub start_axis {  sub start_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);      &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
       $tagstack->[-1]);
     if ($target eq 'web') {      if ($target eq 'web') {
  # This routine should never return anything.   # This routine should never return anything.
     }      }
Line 347  sub end_axis { Line 404  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{
     %values   = %{shift};      my $values   = shift;
     %defaults = %{shift};      my $defaults = shift;
     $parstack = shift;      my $parstack = shift;
     $safeeval = shift;      my $safeeval = shift;
     $tag      = shift;      my $tag      = shift;
     my $attr;      my $attr;
     foreach $attr (keys %defaults) {      foreach $attr (keys %{$defaults}) {
  $values{$attr} = &Apache::lonxml::get_param($attr,$parstack,$safeeval);   $values->{$attr} = 
  if ($values{$attr} eq '' | !defined($values{$attr})) {               &Apache::lonxml::get_param($attr,$parstack,$safeeval);
     $values{$attr} = $defaults{$attr};   if ($values->{$attr} eq '' | !defined($values->{$attr})) {
       $values->{$attr} = $defaults->{$attr}->{'default'};
     next;      next;
  }   }
  my $test = $defaults{$attr}->{'test'};   my $test = $defaults->{$attr}->{'test'};
  if (! &$test($values{$attr})) {   if (! &$test($values->{$attr})) {
     &Apache::lonxml::warning      &Apache::lonxml::warning
  ($tag.':'.$attr.': Bad value.'.'Replacing your value with : '   ($tag.':'.$attr.': Bad value.'.'Replacing your value with : '
  .$defaults{$attr} );   .$defaults->{$attr}->{'default'} );
     $values{$attr} = $defaults{$attr};      $values->{$attr} = $defaults->{$attr}->{'default'};
    }
     }      }
     return ;      return ;
 }  }
   
 sub write_gnuplot_file {  sub write_gnuplot_file {
     my $fh = shift;  
     my $gnuplot_input = '';      my $gnuplot_input = '';
       my $curve;
     # Collect all the colors      # Collect all the colors
     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 ';
     $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');      $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
     $gnuplot_input .= $plot{'font'} . ' ';      $gnuplot_input .= $plot{'font'} . ' ';
     $gnuplot_input .= 'size ' . $plot{'width'} . ' ';      $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
     $gnuplot_input .= $plot{'height'} . ' ';  
     $gnuplot_input .= "@Colors\n";      $gnuplot_input .= "@Colors\n";
     # grid      # grid
     $gnuplot_input .= ($plot->{'grid'} eq 'on' ?      $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
        'set grid\n'            :  
        ''                      );  
     # border      # border
     $gnuplot_input .= ($plot->{'border'} eq 'on'?      $gnuplot_input .= ($plot{'border'} eq 'on'?
        'set border\n'           :         'set border'.$/           :
        'set noborder\n'         );    # 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 title  $title->{'text'}      $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
 set xlabel $xlabel->{'text'}      $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
 set ylabel $ylabel->{'text'}      if (defined(%axis)) {
 set xrange $axis->{'xmin'}:$axis->{'xmax'}   $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
 set yrange $axis->{'ymin'}:$axis->{'ymax'}   $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
 ENDLABELS  
     }      }
     # Key      # Key
     if (defined($key{'pos'})) {      if (defined(%key)) {
  $gnuplot_input .= 'set key '.$key->{'pos'}.' ';   $gnuplot_input .= 'set key '.$key{'pos'}.' ';
  $gnuplot_input .= ($key->{'box'} eq 'on' ? 'box ' : 'nobox ');   if ($key{'title'} ne '') {
  if ($key->{'title'} ne '') {      $gnuplot_input .= 'title "'.$key{'title'}.'" ';
     $gnuplot_input .= 'title "'$key->{'title'}.'"\n';   } 
  } else {   $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
     $gnuplot_input .= '\n';  
  }  
     } else {      } else {
  $gnuplot_input .= 'set nokey\n';   $gnuplot_input .= 'set nokey'.$/;
     }          }
     # axis  
     $gnuplot_input .= 'set xrange ['.$axis{'xmin'}.':'.$axis{'xmin'}.']\n';  
     $gnuplot_input .= 'set yrange ['.$axis{'ymin'}.':'.$axis{'ymin'}.']\n';  
     # labels      # labels
       my $label;
     foreach $label (@labels) {      foreach $label (@labels) {
  $gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.   $gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
     $label->{'x'}.','.$label->{'y'}.'\n';      $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;
     }      }
     # curves      # curves
     $gnuplot_input .= 'plot ';      $gnuplot_input .= 'plot ';
     my $datatext = '';      my $datatext = '';
     foreach $curve (@curves) {      for (my $i = 0;$i<=$#curves;$i++) {
    $curve = $curves[$i];
    $gnuplot_input.= ', ' if ($i > 0);
  if (exists($curve->{'function'})) {   if (exists($curve->{'function'})) {
     $gnuplot_input.= $curve->{'function'}.' with '.$curve->{'linestyle'};      $gnuplot_input.= 
    $curve->{'function'}.' title "'.
    $curve->{'name'}.'" with '.
    $curve->{'linestyle'};
  } elsif (exists($curve->{'data'})) {   } elsif (exists($curve->{'data'})) {
     $gnuplot_input.= '\'-\' with '.$curve->{'linestyle'};      $gnuplot_input.= '\'-\' title "'.
    $curve->{'name'}.'" with '.
    $curve->{'linestyle'};
     my @Data = @{$curve->{'data'}};      my @Data = @{$curve->{'data'}};
     for ($i =0; $i<=$#Data; $i++) {      my @Data0 = @{$Data[0]};
       for (my $i =0; $i<=$#Data0; $i++) {
    my $dataset;
  foreach $dataset (@Data) {   foreach $dataset (@Data) {
     $datatext .= $dataset[$i] . ' ';      $datatext .= $dataset->[$i] . ' ';
  }   }
  $datatext .='\n';   $datatext .= $/;
     }      }
     $datatext .='\n';      $datatext .=$/;
  }   }
     }      }
     $gnuplot_input .= $datatext;      $gnuplot_input .= $/.$datatext;
     print $fh $gnuplot_input;      return $gnuplot_input;
 }  }
   
 1;  1;
Removed from v.1.8  
changed lines
  Added in v.1.13

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