Diff for /loncom/homework/imageresponse.pm between versions 1.2 and 1.3

version 1.2, 2001/02/09 03:42:59 version 1.3, 2001/02/22 01:13:43
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # iimage click response style  # iimage click response style
   
   #FIXME assumes multiple possbile submissions but only one is possible currently
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
   
Line 63  sub whichfoils { Line 65  sub whichfoils {
 sub displayfoils {  sub displayfoils {
   my (@whichopt) = @_;    my (@whichopt) = @_;
   my $result ='';    my $result ='';
   #<input type=image name=timg0 src=/~walt/kap18/picts/ch1map.gif>  
   my $name;    my $name;
   my $temp=1;    my $temp=1;
   foreach $name (@whichopt) {    foreach $name (@whichopt) {
     $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";      $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
     my $image=$Apache::response::foilgroup{"$name.image"};      my $image=$Apache::response::foilgroup{"$name.image"};
     $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";      if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
         $result.="<img src=\"$image\"/> <br />\n";
       } else {
         $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
       }
     $temp++;      $temp++;
   }    }
   return $result;    return $result;
 }  }
   
   sub gradefoils {
     my (@whichopt) = @_;
     my $result='';
     my $x;
     my $y;
     my $result;
     my $id=$Apache::inputtags::response['-1'];
     my $temp=1;
     foreach my $name (@whichopt) {
       $x=$ENV{"form.HWVAL_$id:$temp.x"};
       $y=$ENV{"form.HWVAL_$id:$temp.y"};
       &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
       my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
       my $grade="INCORRECT";
       foreach my $area (@areas) {
         &Apache::lonxml::debug("Area is $area for $name");
         $area =~ m/([a-z]*):/;
         &Apache::lonxml::debug("Area of type $1");
         if ($1 eq 'rectangle') {
    $grade=&grade_rectangle($area,$x,$y);
         } else {
    &Apache::lonxml::error("Unknown area style $area");
         }
         &Apache::lonxml::debug("Area said $grade");
         if ($grade eq 'APPROX_ANS') { last; }
       }
       &Apache::lonxml::debug("Foil was $grade");
       if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }
       if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }
       &Apache::lonxml::debug("Question is $result");
       $temp++;
     }
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
     return '';
   }
   
 sub end_foilgroup {  sub end_foilgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
     my @whichopt;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     &setrandomnumber();      &setrandomnumber();
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);      my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max }      if ($count>$max) { $count=$max }
     &Apache::lonxml::debug("Count is $count from $max");      &Apache::lonxml::debug("Count is $count from $max");
     my @whichopt = &whichfoils($max);      @whichopt = &whichfoils($max);
   }    }
   if ($target eq 'web') {    if ($target eq 'web') {
     $result=&displayfoils(@whichopt);      $result=&displayfoils(@whichopt);
   }    }
   if ($target eq 'grade') {    if ($target eq 'grade') {
     &gradefoils(@whichopt);      if ( defined $ENV{'form.submitted'}) {
         &gradefoils(@whichopt);
       }
   }    }
   return $result;    return $result;
 }  }
Line 107  sub start_foil { Line 152  sub start_foil {
     my $args ='';      my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);      my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
     push @{ $Apache::response::foilgroup{'names'} }, $name;      if ($name eq '') { $name=$Apache::lonxml::curdepth; }
       push(@{ $Apache::response::foilgroup{'names'} }, $name);
     $Apache::imageresponse::curname=$name;      $Apache::imageresponse::curname=$name;
   }    }
   return '';    return '';
Line 120  sub end_foil { Line 166  sub end_foil {
   
 sub start_text {  sub start_text {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {     if ($target eq 'web') { &Apache::lonxml::startredirection; }
     $Apache::lonxml::redirection--;   
   }  
   return '';    return '';
 }  }
   
Line 130  sub end_text { Line 174  sub end_text {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack;      $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
     if ($target eq 'web' ) {  
       $Apache::lonxml::redirection++;  
       if ($Apache::lonxml::redirection == 1) {   
  $Apache::lonxml::outputstack='';   
       }  
     }  
   }    }
   return '';    return '';
 }  }
   
 sub start_image {  sub start_image {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') { $Apache::lonxml::redirection--; }    if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';    return '';
 }  }
   
Line 151  sub end_image { Line 189  sub end_image {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     $Apache::response::foilgroup{"$name.image"} = $Apache::lonxml::outputstack;      my $image = &Apache::lonxml::endredirection;
     if ($target eq 'web' ) {      &Apache::lonxml::debug("out is $image");
       $Apache::lonxml::redirection++;      $Apache::response::foilgroup{"$name.image"} = $image;
       if ($Apache::lonxml::redirection == 1) {$Apache::lonxml::outputstack='';}  
     }  
   }    }
   return '';    return '';
 }  }
   
 sub start_rectangle {  sub start_rectangle {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') { $Apache::lonxml::redirection--; }    if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
   return '';    return '';
 }  }
   
   sub grade_rectangle {
     my ($spec,$x,$y) = @_;
     &Apache::lonxml::debug("Spec is $spec");
     $spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;
     my $x1=$1;
     my $y1=$2;
     my $x2=$3;
     my $y2=$4;
     &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
     if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
     if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
     if ($x => $x1) { if ($x <= $x2) { if ($y => $y1) { if ($y <= $y2) { return 'APPROX_ANS'; } } } }
     return 'INCORRECT';
   }
   
 sub end_rectangle {  sub end_rectangle {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {    if ($target eq 'web' || $target eq 'grade') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     push ${ $Apache::response::foilgroup{"$name.area"}},"rectangle:$Apache::lonxml::outputstack";      my $area = &Apache::lonxml::endredirection;
     if ($target eq 'web' ) {      &Apache::lonxml::debug("out is $area for $name");
       $Apache::lonxml::redirection++;      push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
       if ($Apache::lonxml::redirection == 1) {$Apache::lonxml::outputstack='';}  
     }  
   }    }
     return '';
 }  }
 1;  1;
 __END__  __END__

Removed from v.1.2  
changed lines
  Added in v.1.3


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