--- loncom/homework/imageresponse.pm	2001/02/09 03:42:59	1.2
+++ loncom/homework/imageresponse.pm	2001/02/22 01:13:43	1.3
@@ -1,6 +1,8 @@
 # The LearningOnline Network with CAPA
 # iimage click response style
 
+#FIXME assumes multiple possbile submissions but only one is possible currently
+
 package Apache::imageresponse;
 use strict;
 
@@ -63,33 +65,76 @@ sub whichfoils {
 sub displayfoils {
   my (@whichopt) = @_;
   my $result ='';
-  #<input type=image name=timg0 src=/~walt/kap18/picts/ch1map.gif>
   my $name;
   my $temp=1;
   foreach $name (@whichopt) {
     $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
     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++;
   }
   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 {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
+  my @whichopt;
   if ($target eq 'web' || $target eq 'grade') {
     &setrandomnumber();
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max }
     &Apache::lonxml::debug("Count is $count from $max");
-    my @whichopt = &whichfoils($max);
+    @whichopt = &whichfoils($max);
   }
   if ($target eq 'web') {
     $result=&displayfoils(@whichopt);
   }
   if ($target eq 'grade') {
-    &gradefoils(@whichopt);
+    if ( defined $ENV{'form.submitted'}) {
+      &gradefoils(@whichopt);
+    }
   }
   return $result;
 }
@@ -107,7 +152,8 @@ sub start_foil {
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     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;
   }
   return '';
@@ -120,9 +166,7 @@ sub end_foil {
 
 sub start_text {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { 
-    $Apache::lonxml::redirection--; 
-  }
+  if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';
 }
 
@@ -130,20 +174,14 @@ sub end_text {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;
-    $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack;
-    if ($target eq 'web' ) {
-      $Apache::lonxml::redirection++;
-      if ($Apache::lonxml::redirection == 1) { 
-	$Apache::lonxml::outputstack=''; 
-      }
-    }
+    $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
   }
   return '';
 }
 
 sub start_image {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { $Apache::lonxml::redirection--; }
+  if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';
 }
 
@@ -151,31 +189,43 @@ sub end_image {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;
-    $Apache::response::foilgroup{"$name.image"} = $Apache::lonxml::outputstack;
-    if ($target eq 'web' ) {
-      $Apache::lonxml::redirection++;
-      if ($Apache::lonxml::redirection == 1) {$Apache::lonxml::outputstack='';}
-    }
+    my $image = &Apache::lonxml::endredirection;
+    &Apache::lonxml::debug("out is $image");
+    $Apache::response::foilgroup{"$name.image"} = $image;
   }
   return '';
 }
 
 sub start_rectangle {
   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 '';
 }
 
+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 {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'grade') {
     my $name = $Apache::imageresponse::curname;
-    push ${ $Apache::response::foilgroup{"$name.area"}},"rectangle:$Apache::lonxml::outputstack";
-    if ($target eq 'web' ) {
-      $Apache::lonxml::redirection++;
-      if ($Apache::lonxml::redirection == 1) {$Apache::lonxml::outputstack='';}
-    }
+    my $area = &Apache::lonxml::endredirection;
+    &Apache::lonxml::debug("out is $area for $name");
+    push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
   }
+  return '';
 }
 1;
 __END__