--- loncom/homework/imageresponse.pm 2007/09/25 23:58:32 1.88
+++ loncom/homework/imageresponse.pm 2008/11/18 19:14:28 1.96
@@ -1,8 +1,8 @@
-
+#
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.88 2007/09/25 23:58:32 albertel Exp $
+# $Id: imageresponse.pm,v 1.96 2008/11/18 19:14:28 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,87 @@
#FIXME LATER assumes multiple possible submissions but only one is possible
#currently
+
+=head1 NAME
+
+Apache::imageresponse
+
+=head1 SYNOPSIS
+
+Coordinates the response to clicking an image.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item start_imageresponse()
+
+=item end_imageresponse()
+
+=item start_foilgroup()
+
+=item getfoilcounts()
+
+=item whichfoils()
+
+=item prep_image()
+
+=item draw_image()
+
+=item displayfoils()
+
+=item format_prior_response()
+
+=item display_answers()
+
+=item clean_up_image()
+
+=item gradefoils()
+
+=item stringify_submission()
+
+=item get_submission()
+
+=item end_foilgroup()
+
+=item start_conceptgroup()
+
+=item end_conceptgroup()
+
+=item insert_foil()
+
+=item start_foil()
+
+=item end_foil()
+
+=item start_text()
+
+=item end_text()
+
+=item start_image()
+
+=item end_image()
+
+=item start_rectangle()
+
+=item grade_rectangle()
+
+=item end_rectangle()
+
+=item start_polygon()
+
+=item grade_polygon()
+
+=item end_polygon()
+
+=back
+
+=cut
+
+
package Apache::imageresponse;
use strict;
use Image::Magick();
@@ -59,6 +140,7 @@ sub start_imageresponse {
$result=&Apache::response::meta_package_write('imageresponse');
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'imageresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
1);
@@ -79,6 +161,9 @@ sub start_imageresponse {
sub end_imageresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $part_id = $Apache::inputtags::part;
+ my $response_id = $Apache::inputtags::response[-1];
+
pop(@Apache::lonxml::namespace);
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
@@ -94,7 +179,12 @@ sub end_imageresponse {
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::increment_counter(&Apache::response::repetition());
+ &Apache::lonxml::increment_counter(&Apache::response::repetition(),
+ "$part_id.$response_id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
+
}
&Apache::response::end_response();
@@ -214,7 +304,7 @@ sub draw_image {
}
}
}
- &Apache::lonnet::appenv(%x);
+ &Apache::lonnet::appenv(\%x);
return $id;
}
@@ -229,7 +319,8 @@ sub displayfoils {
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="
\n";}
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
- if ( $target eq 'web' && $image !~ /^http:/ ) {
+ if ( ($target eq 'web' || $target eq 'answer')
+ && $image !~ /^http:/ ) {
$image=&clean_up_image($image);
}
push(@images,$image);
@@ -294,7 +385,8 @@ sub display_answers {
foreach my $name (@$whichopt) {
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
- if ( $target eq 'web' && $image !~ /^http:/ ) {
+ if ( ($target eq 'web' || $target eq 'answer')
+ && $image !~ /^http:/ ) {
$image = &clean_up_image($image);
}
my $token=&prep_image($image,'answeronly',$name);
@@ -356,7 +448,7 @@ sub gradefoils {
} elsif ($1 eq 'polygon') {
$grade=&grade_polygon($area,$x,$y);
} else {
- &Apache::lonxml::error("Unknown area style $area");
+ &Apache::lonxml::error(&mt('Unknown area style [_1]',$area));
}
&Apache::lonxml::debug("Area said $grade");
if ($grade eq 'APPROX_ANS') { last; }
@@ -483,11 +575,12 @@ sub start_foil {
$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.");
+ &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
$name=$Apache::lonxml::curdepth;
}
if (defined($Apache::response::foilnames{$name})) {
- &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name));
+ &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique."
+ ,''.$name.''));
}
$Apache::response::foilnames{$name}++;
if ( $Apache::imageresponse::conceptgroup