--- loncom/homework/imageresponse.pm 2007/09/25 23:45:33 1.86
+++ loncom/homework/imageresponse.pm 2011/11/14 03:08:01 1.103
@@ -1,8 +1,8 @@
-
+#
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.86 2007/09/25 23:45:33 albertel Exp $
+# $Id: imageresponse.pm,v 1.103 2011/11/14 03:08:01 raeburn 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,9 +140,20 @@ 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);
+ } elsif ( $target eq 'edit' ) {
+ $result .= &Apache::edit::tag_start($target,$token).
+ &Apache::edit::text_arg('Max Number Of Shown Foils:',
+ 'max',$token,'4').
+ &Apache::edit::end_row().
+ &Apache::edit::start_spanning_row();
+ } elsif ( $target eq 'modified' ) {
+ my $constructtag=
+ &Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
}
@@ -69,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'));
@@ -84,18 +179,24 @@ 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());
+ my $repetition = &Apache::response::repetition();
+ &Apache::lonxml::increment_counter($repetition,
+ "$part_id.$response_id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
+
}
&Apache::response::end_response();
-
return $result;
}
%Apache::response::foilgroup=();
sub start_foilgroup {
+ my ($target) = @_;
%Apache::response::foilgroup=();
$Apache::imageresponse::conceptgroup=0;
- &Apache::response::pushrandomnumber();
+ &Apache::response::pushrandomnumber(undef,$target);
return '';
}
@@ -105,27 +206,27 @@ sub getfoilcounts {
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
# +1 since instructors will count from 1
my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
- #if (&Apache::response::showallfoils()) { $max=$count; }
+ if (&Apache::response::showallfoils()) { $max=$count; }
return ($count,$max);
}
sub whichfoils {
my ($max)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
+ return if (!defined(@{ $Apache::response::foilgroup{'names'} }));
my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt =();
+ my @whichopt;
while ((($#whichopt+1) < $max) && ($#names > -1)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");
my $aopt;
-# if (&Apache::response::showallfoils()) {
-# $aopt=0;
-# } else {
+ if (&Apache::response::showallfoils()) {
+ $aopt=0;
+ } else {
$aopt=int(&Math::Random::random_uniform() * ($#names+1));
-# }
+ }
&Apache::lonxml::debug("From $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);
&Apache::lonxml::debug("Picked $aopt");
- push (@whichopt,$aopt);
+ push(@whichopt,$aopt);
}
return @whichopt;
}
@@ -204,7 +305,7 @@ sub draw_image {
}
}
}
- &Apache::lonnet::appenv(%x);
+ &Apache::lonnet::appenv(\%x);
return $id;
}
@@ -219,7 +320,8 @@ sub displayfoils {
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\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 !~ /^https?\:/ ) {
$image=&clean_up_image($image);
}
push(@images,$image);
@@ -237,26 +339,64 @@ sub displayfoils {
} else {
my $respid=$Apache::inputtags::response['-1'];
my $token=&prep_image($image,'submission',$name);
- my $id = "HWVAL_$respid:$temp";
+ my $input_id = "HWVAL_$respid:$temp";
+ my $id = $env{'form.request.prefix'}.$input_id;
$result.='<img onclick="image_response_click(\''.$id.'\',event);"
src="/adm/randomlabel.png?token='.$token.'"
- id="imageresponse_'.$id.'"
+ id="'.$id.'_imageresponse"
/>'.
'<br />'.
- '<input type="hidden" name="token_'.$id.'" value="'.$token.'" />'.
- '<input type="hidden" name="'.$id.'" value="'.
+ '<input type="hidden" name="'.$input_id.'_token" value="'.$token.'" />'.
+ '<input type="hidden" name="'.$input_id.'" value="'.
join(':',&get_submission($name)).'" />';
}
}
$temp++;
}
if ($target eq 'web') {
- &Apache::response::setup_prior_tries_hash(\&format_prior_response,
- [\@images,\@whichopt]);
+ &get_prior_options(\@images,\@whichopt);
}
return $result;
}
+sub get_prior_options {
+ my ($currimages,$curropt) = @_;
+ return unless((ref($curropt) eq 'ARRAY') &&
+ (ref($currimages) eq 'ARRAY'));
+ my $part = $Apache::inputtags::part;
+ my $respid = $Apache::inputtags::response[-1];
+ foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+ my $partprefix = "$i:resource.$part";
+ my $sub_key = "$partprefix.$respid.submission";
+ next if (!exists($Apache::lonhomework::history{$sub_key}));
+ my $type_key = "$partprefix.type";
+ my @whichopt = ();
+ my @images = ();
+ if ($Apache::lonhomework::history{$type_key} eq 'randomizetry') {
+ my $order_key = "$partprefix.$respid.foilorder";
+ @whichopt = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
+ if (@whichopt > 0) {
+ foreach my $name (@whichopt) {
+ my $image=$Apache::response::foilgroup{"$name.image"};
+ if ($image !~ /^https?\:/ ) {
+ $image=&clean_up_image($image);
+ }
+ push(@images,$image);
+ }
+ }
+ } else {
+ @whichopt = @{$curropt};
+ @images = @{$currimages};
+ }
+ my $submission = $Apache::lonhomework::history{$sub_key};
+ my $output = &format_prior_response('grade',$submission,
+ [\@images,\@whichopt]);
+ if (defined($output)) {
+ $Apache::inputtags::submission_display{$sub_key} = $output;
+ }
+ }
+}
+
sub format_prior_response {
my ($mode,$answer,$other_data) = @_;
@@ -279,19 +419,19 @@ sub format_prior_response {
sub display_answers {
my ($target,$whichopt)=@_;
- my $result;
+ my $result=&Apache::response::answer_header('imageresponse');
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 !~ /^https?\:/ ) {
$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');
}
+ $result.=&Apache::response::answer_footer('imageresponse');
return $result;
}
@@ -299,7 +439,7 @@ sub clean_up_image {
my ($image)=@_;
if ($image =~ /\s*<img\s*/) {
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
- if ($image !~ /^http:/) {
+ if ($image !~ /^https?\:/) {
$image=&Apache::lonnet::hreflocation('',$image);
}
if (!$image) {
@@ -346,7 +486,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; }
@@ -358,6 +498,9 @@ sub gradefoils {
}
$temp++;
}
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ $Apache::lonhomework::results{"resource.$partid.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
+ }
my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
&Apache::lonxml::debug("Question is $result");
@@ -365,8 +508,18 @@ sub gradefoils {
my %previous=
&Apache::response::check_for_previous(&stringify_submission(\%response),
$part,$id);
- if ($result
- && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
+ if ($result) {
+ if ($Apache::lonhomework::type eq 'survey') {
+ $result='SUBMITTED';
+ } elsif ($Apache::lonhomework::type eq 'surveycred') {
+ $result='SUBMITTED_CREDIT';
+ } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+ $result='ANONYMOUS';
+ } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+ $result='ANONYMOUS_CREDIT';
+ }
+ }
+
&Apache::response::handle_previous(\%previous,$result);
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
&stringify_submission(\%response);
@@ -377,8 +530,6 @@ sub gradefoils {
sub stringify_submission {
my ($response) = @_;
return &Apache::lonnet::hash2str(%{ $response });
-
-
}
sub get_submission {
@@ -415,6 +566,11 @@ sub end_foilgroup {
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,@whichopt);
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ if ($target eq 'web') {
+ &get_prior_options($target,@whichopt);
+ }
+ }
$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'grade') {
if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
@@ -473,15 +629,16 @@ 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 <b><tt>[_1]</tt></b> 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."
+ ,'<b><tt>'.$name.'</tt></b>'));
}
$Apache::response::foilnames{$name}++;
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
push(@{ $Apache::response::conceptgroup{'names'} }, $name);
} else {
@@ -534,7 +691,7 @@ sub end_text {
|| $target eq 'answer') {
my $name = $Apache::imageresponse::curname;
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
} else {
@@ -577,7 +734,7 @@ sub end_image {
my $image = &Apache::lonxml::endredirection();
&Apache::lonxml::debug("original image is $image");
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
$Apache::response::conceptgroup{"$name.image"} = $image;
} else {
@@ -586,7 +743,7 @@ sub end_image {
} elsif ($target eq 'analyze') {
my $image = &Apache::lonxml::endredirection();
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
$Apache::response::conceptgroup{"$name.image"} = $image;
} else {
@@ -613,11 +770,13 @@ sub end_image {
my ($commentline, $restofstuff) = split(/\n/, $src);
$graphinclude = $src;
$graphinclude =~ s/^$commentline//;
- } else {
+ } elsif (!($src =~ /\\/)) {
my ($path,$file) = &Apache::londefdef::get_eps_image($src);
my ($height_param,$width_param)=
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
$graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
+ } else {
+ $graphinclude = $src; # Already fully formed.
}
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
}
@@ -666,7 +825,7 @@ sub end_rectangle {
$area=~s/\s//g;
&Apache::lonxml::debug("out is $area for $name");
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
} else {
@@ -747,7 +906,7 @@ sub end_polygon {
$area=~s/\s*//g;
&Apache::lonxml::debug("out is $area for $name");
if ( $Apache::imageresponse::conceptgroup
- #&& !&Apache::response::showallfoils()
+ && !&Apache::response::showallfoils()
) {
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
} else {