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

Diff for /loncom/xml/lonplot.pm between versions 1.108 and 1.109

version 1.108, 2005/05/31 22:15:32 version 1.109, 2005/06/07 22:30:42
Line 39  use Apache::lonnet; Line 39  use Apache::lonnet;
   
 use vars qw/$weboutputformat $versionstring/;  use vars qw/$weboutputformat $versionstring/;
   
 #  
 #   This variable allows a callback to be registered  
 #   if a gnuplot tag block is performed.  
 #  
 my $notify_callback;  
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::lonplot',('gnuplot'));      &Apache::lonxml::register('Apache::lonplot',('gnuplot'));
Line 54  BEGIN { Line 50  BEGIN {
     if ($versionstring =~ /^gnuplot 4/) {      if ($versionstring =~ /^gnuplot 4/) {
         $weboutputformat = 'png';          $weboutputformat = 'png';
     }      }
     $notify_callback = undef;  
           
 }  }
   
 # register_callback(\&callback)  
 #    Arranges for callback to be invoked on the </gnuplot>  
 #    tag.  
 #   
 sub register_callback {  
     $notify_callback = shift;  
 }  
 # clear_callback();  
 #     Undefs the callback.  
 #  
 sub clear_callback {  
     $notify_callback = undef;  
 }  
 # invoke_callback()  
 #     Invokes the callback if defined  
 #  
 sub invoke_callback {  
     if (defined $notify_callback) {  
  &$notify_callback();  
     }  
 }  
   
 ##   ## 
 ## Description of data structures:  ## Description of data structures:
Line 565  ENDIMAGE Line 539  ENDIMAGE
     &Apache::lonxml::debug(" gnuplot ht  = $Apache::lonplot::plot{'height'}");      &Apache::lonxml::debug(" gnuplot ht  = $Apache::lonplot::plot{'height'}");
     #might be inside the safe space, register the URL for later      #might be inside the safe space, register the URL for later
     &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");      &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
     $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';      $result  = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'} \n";
       $result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";
       $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_end($target,$token);   $result.=&Apache::edit::tag_end($target,$token);
     }      }
     &invoke_callback();  
     return $result;      return $result;
 }  }
   
Removed from v.1.108  
changed lines
  Added in v.1.109

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