[LON-CAPA-cvs] cvs: loncom /homework imageresponse.pm

[albertel]

albertel		Tue Dec  7 20:00:41 2004 EDT

  Modified files:              
    /loncom/homework	imageresponse.pm 
  Log:
   - fix BUG#3589, revert back to using X to mar location, and only show location when the user is incorrect, when corect just show the green area of goodness
  
  
Index: loncom/homework/imageresponse.pm
diff -u loncom/homework/imageresponse.pm:1.57 loncom/homework/imageresponse.pm:1.58
--- loncom/homework/imageresponse.pm:1.57	Sat Nov 13 11:28:21 2004
+++ loncom/homework/imageresponse.pm	Tue Dec  7 20:00:41 2004
@@ -1,7 +1,8 @@
+
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.57 2004/11/13 16:28:21 albertel Exp $
+# $Id: imageresponse.pm,v 1.58 2004/12/08 01:00:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -119,7 +120,7 @@
     my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
     #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
-    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 $width = 1;
 	my $extrawidth = 2;
@@ -130,19 +131,19 @@
 
 	$x{"cgi.$id.OBJTYPE"}.='LINE:';
 	$i=$x{"cgi.$id.OBJCOUNT"}++;
-	$x{"cgi.$id.OBJ$i"}=join(':',(($x),($ymin),($x),($ymax),
+	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
 				      "FFFFFF",($width+$extrawidth)));
 	$x{"cgi.$id.OBJTYPE"}.='LINE:';
 	$i=$x{"cgi.$id.OBJCOUNT"}++;
-	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($y),($xmax),($y),
+	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
 				      "FFFFFF",($width+$extrawidth)));
 	$x{"cgi.$id.OBJTYPE"}.='LINE:';
 	$i=$x{"cgi.$id.OBJCOUNT"}++;
-	$x{"cgi.$id.OBJ$i"}=join(':',(($x),($ymin),($x),($ymax),
+	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
 				      "FF0000",($width)));
 	$x{"cgi.$id.OBJTYPE"}.='LINE:';
 	$i=$x{"cgi.$id.OBJCOUNT"}++;
-	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($y),($xmax),($y),
+	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
 				      "FF0000",($width)));
     }
     if ($mode eq 'answer') {