[LON-CAPA-cvs] cvs: loncom /homework imageresponse.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 09 Mar 2006 01:34:00 -0000
albertel Wed Mar 8 20:34:00 2006 EDT
Modified files:
/loncom/homework imageresponse.pm
Log:
- answer mode works for image response
Index: loncom/homework/imageresponse.pm
diff -u loncom/homework/imageresponse.pm:1.74 loncom/homework/imageresponse.pm:1.75
--- loncom/homework/imageresponse.pm:1.74 Wed Mar 8 20:11:12 2006
+++ loncom/homework/imageresponse.pm Wed Mar 8 20:33:57 2006
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.74 2006/03/09 01:11:12 albertel Exp $
+# $Id: imageresponse.pm,v 1.75 2006/03/09 01:33:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -134,7 +134,10 @@
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/ && !&Apache::response::show_answer()) {
+ if (defined($x) && $x =~/\S/
+ && defined($y) && $y =~/\S/
+ && !&Apache::response::show_answer()
+ && $mode ne 'answeronly') {
my $length = 6;
my $width = 1;
my $extrawidth = 2;
@@ -160,7 +163,7 @@
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
"FF0000",($width)));
}
- if ($mode eq 'answer') {
+ if ($mode eq 'answer' || $mode eq 'answeronly') {
my $width = 1;
my $extrawidth = 2;
my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
@@ -229,6 +232,25 @@
return $result;
}
+sub display_answers {
+ my ($target,$whichopt)=@_;
+
+ my $result;
+ foreach my $name (@$whichopt) {
+ my $image=$Apache::response::foilgroup{"$name.image"};
+ &Apache::lonxml::debug("image is $image");
+ if ( $target eq 'web' && $image !~ /^http:/ ) {
+ $image = &clean_up_image($image);
+ }
+ my $token=&prep_image($image,'answeronly',$name);
+
+ $result.=&Apache::response::answer_header('imageresponse');
+ $result.=&Apache::response::answer_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
+ $result.=&Apache::response::answer_footer('imageresponse');
+ }
+ return $result;
+}
+
sub clean_up_image {
my ($image)=@_;
if ($image =~ /\s*<img\s*/) {
@@ -308,12 +330,16 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my @whichopt;
+
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
+
my ($count,$max) = &getfoilcounts($parstack,$safeeval);
if ($count>$max) { $count=$max }
&Apache::lonxml::debug("Count is $count from $max");
+
@whichopt = &whichfoils($max);
+
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,@whichopt);
} elsif ($target eq 'grade') {
@@ -321,7 +347,10 @@
} elsif ( $target eq 'analyze') {
&Apache::response::analyze_store_foilgroup(\@whichopt,
['text','image','area']);
+ } elsif ($target eq 'answer') {
+ $result=&display_answers($target,\@whichopt);
}
+
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -366,7 +395,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq "") {
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
@@ -409,7 +438,8 @@
sub start_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
+ || $target eq 'answer') {
&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);
@@ -425,7 +455,8 @@
sub end_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
+ || $target eq 'answer') {
my $name = $Apache::imageresponse::curname;
if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()
@@ -443,7 +474,8 @@
sub start_image {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
+ || $target eq 'answer') {
&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);
@@ -465,7 +497,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
my $name = $Apache::imageresponse::curname;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'answer') {
my $image = &Apache::lonxml::endredirection();
&Apache::lonxml::debug("original image is $image");
if ( $Apache::imageresponse::conceptgroup
@@ -520,7 +552,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);
@@ -552,7 +584,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
my $name = $Apache::imageresponse::curname;
my $area = &Apache::lonxml::endredirection;
$area=~s/\s//g;
@@ -574,7 +606,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
@@ -633,7 +665,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
my $name = $Apache::imageresponse::curname;
my $area = &Apache::lonxml::endredirection;
$area=~s/\s*//g;