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

Diff for /loncom/homework/drawimage.pm between versions 1.1 and 1.3

version 1.1, 2003/11/15 06:33:39 version 1.3, 2004/02/24 00:16:35
Line 82  sub start_line { Line 82  sub start_line {
  my $y2 = &Apache::lonxml::get_param('y2',$parstack,$safeeval);   my $y2 = &Apache::lonxml::get_param('y2',$parstack,$safeeval);
  my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);   my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);
  my $thickness = &Apache::lonxml::get_param('thickness',$parstack,$safeeval);   my $thickness = &Apache::lonxml::get_param('thickness',$parstack,$safeeval);
  my $i=(++$args{"cgi.$cgi_id.OBJCOUNT"})-1;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,$color,$thickness));   $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,$color,$thickness));
  $args{"cgi.$cgi_id.OBJTYPE"}.='LINE:';   $args{"cgi.$cgi_id.OBJTYPE"}.='LINE:';
     }      }
Line 108  sub start_rectangle { Line 108  sub start_rectangle {
    $safeeval);     $safeeval);
  my $filled = &Apache::lonxml::get_param('filled',$parstack,   my $filled = &Apache::lonxml::get_param('filled',$parstack,
  $safeeval);   $safeeval);
  my $i=(++$args{"cgi.$cgi_id.OBJCOUNT"})-1;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJ$i"}=   $args{"cgi.$cgi_id.OBJ$i"}=
     join(':',($x1,$y1,$x2,$y2,$color,$thickness,$filled));      join(':',($x1,$y1,$x2,$y2,$color,$thickness,$filled));
  $args{"cgi.$cgi_id.OBJTYPE"}.='RECTANGLE:';   $args{"cgi.$cgi_id.OBJTYPE"}.='RECTANGLE:';
Line 135  sub start_arc { Line 135  sub start_arc {
  my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);   my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);
  my $thickness = &Apache::lonxml::get_param('thickness',$parstack,$safeeval);   my $thickness = &Apache::lonxml::get_param('thickness',$parstack,$safeeval);
  my $filled = &Apache::lonxml::get_param('filled',$parstack,$safeeval);   my $filled = &Apache::lonxml::get_param('filled',$parstack,$safeeval);
  my $i=(++$args{"cgi.$cgi_id.OBJCOUNT"})-1;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJ$i"}=   $args{"cgi.$cgi_id.OBJ$i"}=
     join(':',($x,$y,$width,$height,$start,$end,$color,$thickness,      join(':',($x,$y,$width,$height,$start,$end,$color,$thickness,
       $filled));        $filled));
Line 150  sub end_arc { Line 150  sub end_arc {
     return $result;      return $result;
 }  }
   
 sub start_arc {  sub start_fill {
     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') {
  my $x = &Apache::lonxml::get_param('x',$parstack,$safeeval);   my $x = &Apache::lonxml::get_param('x',$parstack,$safeeval);
  my $y = &Apache::lonxml::get_param('y',$parstack,$safeeval);   my $y = &Apache::lonxml::get_param('y',$parstack,$safeeval);
  my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);   my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);
  my $i=(++$args{"cgi.$cgi_id.OBJCOUNT"})-1;   my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
  $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$color));   $args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$color));
  $args{"cgi.$cgi_id.OBJTYPE"}.='FILL:';   $args{"cgi.$cgi_id.OBJTYPE"}.='FILL:';
     }      }
     return $result;      return $result;
 }  }
   
 sub end_arc {  sub end_fill {
     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.1  
changed lines
  Added in v.1.3

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