--- loncom/homework/imageresponse.pm 2008/08/08 16:37:13 1.94
+++ loncom/homework/imageresponse.pm 2011/09/16 22:23:54 1.102
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.94 2008/08/08 16:37:13 bisitz Exp $
+# $Id: imageresponse.pm,v 1.102 2011/09/16 22:23:54 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();
@@ -106,15 +187,15 @@ sub end_imageresponse {
}
&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 '';
}
@@ -239,7 +320,7 @@ sub displayfoils {
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
if ( ($target eq 'web' || $target eq 'answer')
- && $image !~ /^http:/ ) {
+ && $image !~ /^https?\:/ ) {
$image=&clean_up_image($image);
}
push(@images,$image);
@@ -272,12 +353,49 @@ sub displayfoils {
$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) = @_;
@@ -305,7 +423,7 @@ sub display_answers {
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
if ( ($target eq 'web' || $target eq 'answer')
- && $image !~ /^http:/ ) {
+ && $image !~ /^https?\:/ ) {
$image = &clean_up_image($image);
}
my $token=&prep_image($image,'answeronly',$name);
@@ -320,7 +438,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) {
@@ -379,6 +497,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");
@@ -386,8 +507,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);
@@ -398,8 +529,6 @@ sub gradefoils {
sub stringify_submission {
my ($response) = @_;
return &Apache::lonnet::hash2str(%{ $response });
-
-
}
sub get_submission {
@@ -436,6 +565,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); }
@@ -635,11 +769,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;
}