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

Diff for /loncom/homework/imageresponse.pm between versions 1.54 and 1.58

version 1.54, 2004/07/02 08:11:10 version 1.58, 2004/12/08 01:00:41
Line 85  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 97  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 120  sub prep_image { Line 120  sub prep_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()) {
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
Line 270  sub gradefoils { Line 270  sub gradefoils {
     $temp++;      $temp++;
  }   }
     }      }
       if ($result 
    && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
     return '';      return '';
Line 344  sub start_foil { Line 346  sub start_foil {
  }   }
  $Apache::response::foilnames{$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 385  sub end_text { Line 388  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 425  sub end_image { Line 429  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 433  sub end_image { Line 438  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 500  sub end_image { Line 506  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 555  sub end_rectangle { Line 562  sub end_rectangle {
  $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"} },"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 635  sub end_polygon { Line 643  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.54  
changed lines
  Added in v.1.58

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