[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.58.2.1

version 1.48, 2004/02/18 00:23:01 version 1.58.2.1, 2005/01/31 22:47:43
Line 31 Line 31
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
 use Image::Magick;  use Image::Magick();
 use Apache::randomlylabel;  use Apache::randomlylabel();
 use Apache::londefdef;  use Apache::londefdef();
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
   use Apache::lonlocal;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));      &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
Line 49  sub start_imageresponse { Line 50  sub start_imageresponse {
        'polygon','conceptgroup'));         'polygon','conceptgroup'));
     push (@Apache::lonxml::namespace,'imageresponse');      push (@Apache::lonxml::namespace,'imageresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
       undef(%Apache::response::foilnames);
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('imageresponse');   $result=&Apache::response::meta_package_write('imageresponse');
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
Line 65  sub end_imageresponse { Line 67  sub end_imageresponse {
     &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));      &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
     my $result;      my $result;
     if ($target eq 'edit') { $result=&Apache::edit::end_table(); }      if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
       undef(%Apache::response::foilnames);
     return $result;      return $result;
 }  }
   
Line 72  sub end_imageresponse { Line 75  sub end_imageresponse {
 sub start_foilgroup {  sub start_foilgroup {
     %Apache::response::foilgroup=();      %Apache::response::foilgroup=();
     $Apache::imageresponse::conceptgroup=0;      $Apache::imageresponse::conceptgroup=0;
     &Apache::response::setrandomnumber();      &Apache::response::pushrandomnumber();
     return '';      return '';
 }  }
   
Line 82  sub getfoilcounts { Line 85  sub getfoilcounts {
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');      my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     # +1 since instructors will count from 1      # +1 since instructors will count from 1
     my $count = $#{ $Apache::response::foilgroup{'names'} }+1;      my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
     if (&Apache::response::showallfoils()) { $max=$count; }      #if (&Apache::response::showallfoils()) { $max=$count; }
     return ($count,$max);      return ($count,$max);
 }  }
   
Line 94  sub whichfoils { Line 97  sub whichfoils {
     while ((($#whichopt+1) < $max) && ($#names > -1)) {      while ((($#whichopt+1) < $max) && ($#names > -1)) {
  &Apache::lonxml::debug("Have $#whichopt max is $max");   &Apache::lonxml::debug("Have $#whichopt max is $max");
  my $aopt;   my $aopt;
  if (&Apache::response::showallfoils()) {  # if (&Apache::response::showallfoils()) {
     $aopt=0;  #    $aopt=0;
  } else {  # } else {
     $aopt=int(&Math::Random::random_uniform() * ($#names+1));      $aopt=int(&Math::Random::random_uniform() * ($#names+1));
  }  # }
  &Apache::lonxml::debug("From $#names elms, picking $aopt");   &Apache::lonxml::debug("From $#names elms, picking $aopt");
  $aopt=splice(@names,$aopt,1);   $aopt=splice(@names,$aopt,1);
  &Apache::lonxml::debug("Picked $aopt");   &Apache::lonxml::debug("Picked $aopt");
Line 112  sub prep_image { Line 115  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/ && !&Apache::response::show_answer()) {
  $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 129  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 152  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;
     }      }
  }   }
     }      }
Line 208  sub displayfoils { Line 218  sub displayfoils {
 sub clean_up_image {  sub clean_up_image {
     my ($image)=@_;      my ($image)=@_;
     if ($image =~ /\s*<img\s*/) {      if ($image =~ /\s*<img\s*/) {
  ($image) = ($image =~ /src\s*=\s*\"([^\"]+)\"/i);   ($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
  if ($image !~ /^http:/) {   if ($image !~ /^http:/) {
     $image=&Apache::lonnet::hreflocation('',$image);      $image=&Apache::lonnet::hreflocation('',$image);
  }   }
Line 260  sub gradefoils { Line 270  sub gradefoils {
     $temp++;      $temp++;
  }   }
     }      }
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";      my $responsestr="$x:$y";
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;      my $part=$Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];
       my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
       if ($result 
    && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
       &Apache::response::handle_previous(\%previous,$result);
       $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;
       $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
     return '';      return '';
 }  }
   
Line 286  sub end_foilgroup { Line 303  sub end_foilgroup {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
       &Apache::response::poprandomnumber();
     return $result;      return $result;
 }  }
   
Line 328  sub start_foil { Line 346  sub start_foil {
  $target eq 'analyze') {   $target eq 'analyze') {
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  if ($name eq '') { $name=$Apache::lonxml::curdepth; }   if ($name eq '') { $name=$Apache::lonxml::curdepth; }
    if (defined($Apache::response::foilnames{$name})) {
       &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
    }
    $Apache::response::foilnames{$name}++;
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      && !&Apache::response::showallfoils()) {       #&& !&Apache::response::showallfoils()
        ) {
     push(@{ $Apache::response::conceptgroup{'names'} }, $name);      push(@{ $Apache::response::conceptgroup{'names'} }, $name);
  } else {   } else {
     push(@{ $Apache::response::foilgroup{'names'} }, $name);      push(@{ $Apache::response::foilgroup{'names'} }, $name);
Line 370  sub end_text { Line 393  sub end_text {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  my $name = $Apache::imageresponse::curname;   my $name = $Apache::imageresponse::curname;
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      && !&Apache::response::showallfoils() ) {       #&& !&Apache::response::showallfoils()
        ) {
     $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;      $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
  } else {   } else {
     $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;      $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
Line 410  sub end_image { Line 434  sub end_image {
  my $image = &Apache::lonxml::endredirection;   my $image = &Apache::lonxml::endredirection;
  &Apache::lonxml::debug("original image is $image");   &Apache::lonxml::debug("original image is $image");
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      && !&Apache::response::showallfoils()) {       #&& !&Apache::response::showallfoils()
        ) {
     $Apache::response::conceptgroup{"$name.image"} = $image;      $Apache::response::conceptgroup{"$name.image"} = $image;
  } else {   } else {
     $Apache::response::foilgroup{"$name.image"} = $image;      $Apache::response::foilgroup{"$name.image"} = $image;
Line 418  sub end_image { Line 443  sub end_image {
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $image = &Apache::lonxml::endredirection;   my $image = &Apache::lonxml::endredirection;
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      && !&Apache::response::showallfoils()) {       #&& !&Apache::response::showallfoils()
        ) {
     $Apache::response::conceptgroup{"$name.image"} = $image;      $Apache::response::conceptgroup{"$name.image"} = $image;
  } else {   } else {
     $Apache::response::foilgroup{"$name.image"} = $image;      $Apache::response::foilgroup{"$name.image"} = $image;
Line 485  sub end_image { Line 511  sub end_image {
  } elsif ($width ne '') {   } elsif ($width ne '') {
     $width_param = $width*$scaling;            $width_param = $width*$scaling;      
  }   }
    $width_param=&Apache::randomlabel::adjust_textwidth($width_param);
  #where can we find the picture?   #where can we find the picture?
  if (-e $newsrc) {   if (-e $newsrc) {
     if ($path) {      if ($path) {
Line 537  sub end_rectangle { Line 564  sub end_rectangle {
  $target eq 'analyze') {   $target eq 'analyze') {
  my $name = $Apache::imageresponse::curname;   my $name = $Apache::imageresponse::curname;
  my $area = &Apache::lonxml::endredirection;   my $area = &Apache::lonxml::endredirection;
    $area=~s/\s//g;
  &Apache::lonxml::debug("out is $area for $name");   &Apache::lonxml::debug("out is $area for $name");
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      && !&Apache::response::showallfoils()) {       #&& !&Apache::response::showallfoils()
        ) {
     push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";      push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
  } else {   } else {
     push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";      push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
Line 619  sub end_polygon { Line 648  sub end_polygon {
  $area=~s/\s*//g;   $area=~s/\s*//g;
  &Apache::lonxml::debug("out is $area for $name");   &Apache::lonxml::debug("out is $area for $name");
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      && !&Apache::response::showallfoils()) {       #&& !&Apache::response::showallfoils()
        ) {
     push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";      push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
  } else {   } else {
     push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";      push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";
Removed from v.1.48  
changed lines
  Added in v.1.58.2.1

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