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

Diff for /loncom/homework/drawimage.pm between versions 1.4 and 1.5

version 1.4, 2004/03/16 22:27:37 version 1.5, 2004/03/16 23:08:23
Line 38  BEGIN { Line 38  BEGIN {
   
 sub start_drawimage {  sub start_drawimage {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     &Apache::lonxml::register('Apache::drawimage',('textlabel','line','rectangle','arc','fill'));      &Apache::lonxml::register('Apache::drawimage',('text','line','rectangle','arc','fill'));
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $cgi_id=&Apache::loncommon::get_cgi_id();   $cgi_id=&Apache::loncommon::get_cgi_id();
  %args=();   %args=();
Line 72  sub end_drawimage { Line 72  sub end_drawimage {
     return $result;      return $result;
 }  }
   
 sub start_textlabel {  sub start_text {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
Line 80  sub start_textlabel { Line 80  sub start_textlabel {
         my $y     = &Apache::lonxml::get_param('y',$parstack,$safeeval);          my $y     = &Apache::lonxml::get_param('y',$parstack,$safeeval);
         my $font  = &Apache::lonxml::get_param('font',$parstack,$safeeval);          my $font  = &Apache::lonxml::get_param('font',$parstack,$safeeval);
         my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);          my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);
  my $text  = &Apache::lonxml::get_all_text("/textlabel",$parser);          my $direction = &Apache::lonxml::get_param('direction',$parstack,$safeeval);
    my $text  = &Apache::lonxml::get_all_text("/text",$parser);
         $text = &Apache::lonnet::escape($text);          $text = &Apache::lonnet::escape($text);
         $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';          $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
  my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$text,$font,$color));   $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$text,$font,$color,$direction));
     }      }
     return $result;      return $result;
 }  }
   
 sub end_textlabel {  sub end_text {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     return $result;      return $result;
Removed from v.1.4  
changed lines
  Added in v.1.5

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