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

Diff for /loncom/homework/imageresponse.pm between versions 1.48 and 1.49

version 1.48, 2004/02/18 00:23:01 version 1.49, 2004/02/23 23:55:40
Line 112  sub prep_image { Line 112  sub prep_image {
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $respid=$Apache::inputtags::response['-1'];      my $respid=$Apache::inputtags::response['-1'];
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
     my %x;      my (%x,$i);
     $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);      $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);
     my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});      my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
     #draws 2 xs on the image at the clicked location      #draws 2 xs on the image at the clicked location
     #one in white and then one in red on top of the one in white      #one in white and then one in red on top of the one in white
     if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/) {      if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/) {
  $x{"cgi.$id.LINECOUNT"}=4;  
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
Line 127  sub prep_image { Line 126  sub prep_image {
  my $ymin=($y-$length);   my $ymin=($y-$length);
  my $ymax=($y+$length);   my $ymax=($y+$length);
   
  $x{"cgi.$id.LINE0"}=   $x{"cgi.$id.OBJTYPE"}.='LINE:';
     join(':',(($xmin),($ymin),($xmax),($ymax),   $i=$x{"cgi.$id.OBJCOUNT"}++;
       "FFFFFF",($width+$extrawidth)));   $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
  $x{"cgi.$id.LINE1"}=        "FFFFFF",($width+$extrawidth)));
     join(':',(($xmin),($ymax),($xmax),($ymin),   $x{"cgi.$id.OBJTYPE"}.='LINE:';
       "FFFFFF",($width+$extrawidth)));   $i=$x{"cgi.$id.OBJCOUNT"}++;
  $x{"cgi.$id.LINE2"}=   $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
     join(':',(($xmin),($ymin),($xmax),($ymax),        "FFFFFF",($width+$extrawidth)));
       "FF0000",($width)));   $x{"cgi.$id.OBJTYPE"}.='LINE:';
  $x{"cgi.$id.LINE3"}=   $i=$x{"cgi.$id.OBJCOUNT"}++;
     join(':',(($xmin),($ymax),($xmax),($ymin),   $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
       "FF0000",($width)));        "FF0000",($width)));
    $x{"cgi.$id.OBJTYPE"}.='LINE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
         "FF0000",($width)));
     }      }
     if ($mode eq 'answer') {      if ($mode eq 'answer') {
  my $width = 1;   my $width = 1;
Line 146  sub prep_image { Line 149  sub prep_image {
  my @areas = @{ $Apache::response::foilgroup{"$name.area"} };   my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
  foreach my $area (@areas) {   foreach my $area (@areas) {
     if ($area=~/^rectangle:/) {      if ($area=~/^rectangle:/) {
    $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
  my ($x1,$y1,$x2,$y2)=   my ($x1,$y1,$x2,$y2)=
     ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);      ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
  my $i=$x{"cgi.$id.BOXCOUNT"}++;   $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",
  $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",  
       ($width+$extrawidth)));        ($width+$extrawidth)));
  $i=$x{"cgi.$id.BOXCOUNT"}++;   $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
  $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));   $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));
     } elsif ($area=~/^polygon:(.*)/) {      } elsif ($area=~/^polygon:(.*)/) {
  my $i=$x{"cgi.$id.POLYCOUNT"}++;   $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
  $x{"cgi.$id.POLYOPT$i"}=join(':',("FFFFFF",($width+$extrawidth)));   $i=$x{"cgi.$id.OBJCOUNT"}++;
  $x{"cgi.$id.POLY$i"}=$1;   $x{"cgi.$id.OBJ$i"}=join(':',("FFFFFF",($width+$extrawidth)));
  $i=$x{"cgi.$id.POLYCOUNT"}++;   $x{"cgi.$id.OBJEXTRA$i"}=$1;
  $x{"cgi.$id.POLYOPT$i"}=join(':',("00FF00",$width));   $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
  $x{"cgi.$id.POLY$i"}=$1;   $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',("00FF00",$width));
    $x{"cgi.$id.OBJEXTRA$i"}=$1;
     }      }
  }   }
     }      }
Removed from v.1.48  
changed lines
  Added in v.1.49

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