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

Diff for /loncom/homework/drawimage.pm between versions 1.6 and 1.7

version 1.6, 2004/03/23 20:38:09 version 1.7, 2004/09/09 07:24:56
Line 32  use Apache::loncommon; Line 32  use Apache::loncommon;
   
 my %args;  my %args;
 my $cgi_id;  my $cgi_id;
   my @cgi_ids;
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::drawimage',('drawimage'));      &Apache::lonxml::register('Apache::drawimage',('drawimage'));
 }  }
   
 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',('text','line','rectangle','arc','fill'));      &Apache::lonxml::register('Apache::drawimage',('text','line','rectangle','arc','fill','polygon','image'));
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  $cgi_id=&Apache::loncommon::get_cgi_id();   my $new_id=&Apache::loncommon::get_cgi_id();
  %args=();   if ($cgi_id) { push(@cgi_ids,$cgi_id); } else { undef(%args); }
    $cgi_id=$new_id;
     }      }
       return '';
 }  }
   
 sub end_drawimage {  sub end_drawimage {
     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') {
  if ($target eq 'web') {   my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
     my $width =    my $height =&Apache::lonxml::get_param('height',$parstack,$safeeval);
  &Apache::lonxml::get_param('width',$parstack,$safeeval);   my $bgcolor =&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
     my $height =   if (!$width) { $width=300; }
  &Apache::lonxml::get_param('height',$parstack,$safeeval);   if (!$height) { $height=300; }
     my $bgcolor =   $result.="<img width='$width' height='$height'
  &Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);  
     if (!$width) { $width=300; }  
     if (!$height) { $height=300; }  
     $result.="<img width='$width' height='$height'  
                            src='/adm/randomlabel.png?token=$cgi_id' />\n";                             src='/adm/randomlabel.png?token=$cgi_id' />\n";
     $args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height));   $args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height));
     $args{"cgi.$cgi_id.BGCOLOR"}=join(':',($bgcolor));   $args{"cgi.$cgi_id.BGCOLOR"}=join(':',($bgcolor));
     &Apache::lonnet::appenv(%args);   &Apache::lonnet::appenv(%args);
  } elsif ($target eq 'tex') {   if (@cgi_ids) {
     #FIXME generate image some how      $cgi_id=pop(@cgi_ids);
     #probably Simple::PostScript   } else {
       undef($cgi_id);
  }   }
       } elsif ($target eq 'edit') {
       } elsif ($target eq 'modified') {
     }      }
     &Apache::lonxml::deregister('Apache::drawimage',('line','rectangle'));      
       &Apache::lonxml::register('Apache::drawimage',
         ('text','line','rectangle','arc','fill',
          'polygon'));
     return $result;      return $result;
 }  }
   
Line 197  sub end_fill { Line 202  sub end_fill {
     return $result;      return $result;
 }  }
   
   my @polygon;
   sub start_polygon {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       &Apache::lonxml::register('Apache::drawimage',('point'));
       if ($target eq 'web') {
    undef(@polygon);
       }
       return $result;
   }
   
   sub end_polygon {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;    
       if ($target eq 'web') {
    my $color=&Apache::lonxml::get_param('color',$parstack,$safeeval);
    my $filled=&Apache::lonxml::get_param('filled',$parstack,$safeeval);
    my $open=&Apache::lonxml::get_param('open',$parstack,$safeeval);
    my $thickness = &Apache::lonxml::get_param('thickness',$parstack,
      $safeeval);
    my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
    $args{"cgi.$cgi_id.OBJTYPE"}.='POLYGON:';
    $args{"cgi.$cgi_id.OBJ$i"}=join(':',($color,$thickness,$open,$filled));
    $args{"cgi.$cgi_id.OBJEXTRA$i"}=join('-',@polygon);
       }
       &Apache::lonxml::deregister('Apache::drawimage',('point'));
       return $result;
   }
   
   sub start_point {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web') {
    my $x = &Apache::lonxml::get_param('x',$parstack,$safeeval);
           my $y = &Apache::lonxml::get_param('y',$parstack,$safeeval);
    push (@polygon,"($x,$y)");
       }
       return $result;
   }
   
   sub end_point {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       return $result;
   }
   
   sub start_image {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web' || $target eq 'tex') {
    &Apache::lonxml::startredirection();
       }
       return $result;
   }
   
   sub end_image {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web' || $target eq 'tex') {
    my $bgimg=&Apache::lonxml::endredirection();
    &Apache::lonnet::logthis("image $bgimg");
    my $x = &Apache::lonxml::get_param('x',$parstack,$safeeval);
           my $y = &Apache::lonxml::get_param('y',$parstack,$safeeval);
    my $clipx = &Apache::lonxml::get_param('clipx',$parstack,$safeeval);
           my $clipy = &Apache::lonxml::get_param('clipy',$parstack,$safeeval);
    my $clipwidth = 
       &Apache::lonxml::get_param('clipwidth',$parstack,$safeeval);
           my $clipheight = 
       &Apache::lonxml::get_param('clipheight',$parstack,$safeeval);
    my $scaledwidth = 
       &Apache::lonxml::get_param('scaledwidth',$parstack,$safeeval);
           my $scaledheight = 
       &Apache::lonxml::get_param('scaledheight',$parstack,$safeeval);
    my $transparent = 
       &Apache::lonxml::get_param('transparent',$parstack,$safeeval);
    $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
    &Apache::lonnet::logthis("image af clean $bgimg");
    my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
    $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
    $args{"cgi.$cgi_id.OBJ$i"} = 
       join(':',($x,$y,&Apache::lonnet::escape($bgimg),$transparent,
         $clipx,$clipy,$scaledwidth,$scaledheight,$clipwidth,$clipheight));
       }
       return $result;
   }
 1;  1;
 __END__  __END__
Removed from v.1.6  
changed lines
  Added in v.1.7

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