--- loncom/homework/imageresponse.pm 2006/11/06 23:44:42 1.80 +++ loncom/homework/imageresponse.pm 2007/09/25 23:58:32 1.88 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.80 2006/11/06 23:44:42 foxr Exp $ +# $Id: imageresponse.pm,v 1.88 2007/09/25 23:58:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,6 +60,18 @@ sub start_imageresponse { } elsif ($target eq 'analyze') { my $part_id="$Apache::inputtags::part.$id"; 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; } @@ -103,44 +115,53 @@ 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; } sub prep_image { my ($image,$mode,$name)=@_; - my $part=$Apache::inputtags::part; - my $respid=$Apache::inputtags::response['-1']; + + my ($x,$y)= &get_submission($name); + &Apache::lonxml::debug("for $name drawing click at $x and $y"); + &draw_image($mode,$image,$x,$y,$Apache::response::foilgroup{"$name.area"}); +} + +sub draw_image { + my ($mode,$image,$x,$y,$areas) = @_; + my $id=&Apache::loncommon::get_cgi_id(); + my (%x,$i); $x{"cgi.$id.BGIMG"}=&escape($image); - 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() + && ($mode eq 'submission' || !&Apache::response::show_answer()) && $mode ne 'answeronly') { my $length = 6; my $width = 1; @@ -170,8 +191,7 @@ sub prep_image { if ($mode eq 'answer' || $mode eq 'answeronly') { my $width = 1; my $extrawidth = 2; - my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; - foreach my $area (@areas) { + foreach my $area (@{ $areas }) { if ($area=~/^rectangle:/) { $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; $i=$x{"cgi.$id.OBJCOUNT"}++; @@ -201,9 +221,9 @@ sub prep_image { sub displayfoils { my ($target,@whichopt) = @_; my $result =''; - my $name; my $temp=1; - foreach $name (@whichopt) { + my @images; + foreach my $name (@whichopt) { $result.=$Apache::response::foilgroup{"$name.text"}; &Apache::lonxml::debug("Text is $result"); if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="
\n";} @@ -211,7 +231,8 @@ sub displayfoils { &Apache::lonxml::debug("image is $image"); if ( $target eq 'web' && $image !~ /^http:/ ) { $image=&clean_up_image($image); - } + } + push(@images,$image); &Apache::lonxml::debug("image is $image"); if ( &Apache::response::show_answer() ) { if ($target eq 'tex') { @@ -224,22 +245,52 @@ sub displayfoils { if ($target eq 'tex') { $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; } else { - my $id=$Apache::inputtags::response['-1']; - my $token=&prep_image($image); - my $temp=1; - $result.="
\n"; + my $respid=$Apache::inputtags::response['-1']; + my $token=&prep_image($image,'submission',$name); + my $input_id = "HWVAL_$respid:$temp"; + my $id = $env{'form.request.prefix'}.$input_id; + $result.=''. + '
'. + ''. + ''; } } $temp++; } + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_response, + [\@images,\@whichopt]); + } + return $result; +} + +sub format_prior_response { + my ($mode,$answer,$other_data) = @_; + + my $result; + + # make a copy of the data in the refs + my @images = @{ $other_data->[0] }; + my @foils = @{ $other_data->[1] }; + foreach my $name (@foils) { + my $image = pop(@images); + my ($x,$y) = &get_submission($name,$answer); + my $token = &draw_image('submission',$image,$x,$y); + $result .= + '
'; + } return $result; } 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"); @@ -248,10 +299,9 @@ sub display_answers { } my $token=&prep_image($image,'answeronly',$name); - $result.=&Apache::response::answer_header('imageresponse'); $result.=&Apache::response::answer_part('imageresponse',"
\n"); - $result.=&Apache::response::answer_footer('imageresponse'); } + $result.=&Apache::response::answer_footer('imageresponse'); return $result; } @@ -286,13 +336,12 @@ sub gradefoils { return; } - my $x; - my $y; - my $result; + my @results; my $temp=1; + my %response; foreach my $name (@whichopt) { - $x=$env{"form.HWVAL_$id:$temp.x"}; - $y=$env{"form.HWVAL_$id:$temp.y"}; + my ($x,$y) = split(':',$env{"form.HWVAL_$id:$temp"}); + $response{$name} = $env{"form.HWVAL_$id:$temp"}; &Apache::lonxml::debug("Got a x of $x and a y of $y for $name"); if (defined($x) && defined($y) && defined(@{ $Apache::response::foilgroup{"$name.area"} })) { @@ -313,23 +362,53 @@ sub gradefoils { if ($grade eq 'APPROX_ANS') { last; } } &Apache::lonxml::debug("Foil was $grade"); - if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; } - if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; } - &Apache::lonxml::debug("Question is $result"); - $temp++; + push(@results, $grade) + } else { + push(@results, 'MISSING_ANSWER') } + $temp++; } - my $responsestr="$x:$y"; + my ($result) = &Apache::inputtags::finalizeawards(\@results,[]); + &Apache::lonxml::debug("Question is $result"); + my $part=$Apache::inputtags::part; - my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); + my %previous= + &Apache::response::check_for_previous(&stringify_submission(\%response), + $part,$id); if ($result && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; } &Apache::response::handle_previous(\%previous,$result); - $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr; + $Apache::lonhomework::results{"resource.$part.$id.submission"}= + &stringify_submission(\%response); $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result; return; } +sub stringify_submission { + my ($response) = @_; + return &Apache::lonnet::hash2str(%{ $response }); + + +} + +sub get_submission { + my ($name,$string) = @_; + + if (!defined($string)) { + my $part=$Apache::inputtags::part; + my $respid=$Apache::inputtags::response['-1']; + $string = + $Apache::lonhomework::history{"resource.$part.$respid.submission"}; + } + + if ($string !~ /=/) { + return split(':',$string); + } else { + my %response = &Apache::lonnet::str2hash($string); + return split(':',$response{$name}); + } +} + sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; @@ -346,6 +425,7 @@ sub end_foilgroup { if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,@whichopt); + $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'grade') { if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); } } elsif ( $target eq 'analyze') { @@ -411,7 +491,7 @@ sub start_foil { } $Apache::response::foilnames{$name}++; if ( $Apache::imageresponse::conceptgroup - #&& !&Apache::response::showallfoils() + && !&Apache::response::showallfoils() ) { push(@{ $Apache::response::conceptgroup{'names'} }, $name); } else { @@ -464,7 +544,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 { @@ -479,6 +559,7 @@ sub end_text { sub start_image { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; + my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' || $target eq 'answer') { &Apache::lonxml::startredirection; @@ -489,7 +570,7 @@ sub start_image { $result=&Apache::edit::tag_start($target,$token,'Clickable Image'). &Apache::edit::editline($token->[1],$bgimg,'Image Source File',40); - $result.=&Apache::edit::browse(undef,'textnode').' '; + $result.=&Apache::edit::browse(undef,'textnode',undef,$only).' '; $result.=&Apache::edit::search(undef,'textnode'). &Apache::edit::end_row(); } elsif ($target eq "modified") { @@ -506,7 +587,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 { @@ -515,7 +596,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 { @@ -595,7 +676,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 { @@ -676,7 +757,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 {