version 1.79, 2006/11/06 11:56:23
|
version 1.90, 2007/10/15 09:47:29
|
Line 1
|
Line 1
|
|
# |
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# image click response style |
# image click response style |
# |
# |
Line 60 sub start_imageresponse {
|
Line 60 sub start_imageresponse {
|
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$id"; |
my $part_id="$Apache::inputtags::part.$id"; |
push (@{ $Apache::lonhomework::analyze{"parts"} },$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; |
return $result; |
} |
} |
Line 67 sub start_imageresponse {
|
Line 79 sub start_imageresponse {
|
sub end_imageresponse { |
sub end_imageresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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); |
pop(@Apache::lonxml::namespace); |
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
|
|
Line 82 sub end_imageresponse {
|
Line 97 sub end_imageresponse {
|
|
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$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(); |
&Apache::response::end_response(); |
|
|
Line 103 sub getfoilcounts {
|
Line 123 sub getfoilcounts {
|
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
#if (&Apache::response::showallfoils()) { $max=$count; } |
if (&Apache::response::showallfoils()) { $max=$count; } |
return ($count,$max); |
return ($count,$max); |
} |
} |
|
|
sub whichfoils { |
sub whichfoils { |
my ($max)=@_; |
my ($max)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
return if (!defined(@{ $Apache::response::foilgroup{'names'} })); |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @whichopt =(); |
my @whichopt; |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
my $aopt; |
my $aopt; |
# if (&Apache::response::showallfoils()) { |
if (&Apache::response::showallfoils()) { |
# $aopt=0; |
$aopt=0; |
# } else { |
} else { |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
# } |
} |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
$aopt=splice(@names,$aopt,1); |
$aopt=splice(@names,$aopt,1); |
&Apache::lonxml::debug("Picked $aopt"); |
&Apache::lonxml::debug("Picked $aopt"); |
push (@whichopt,$aopt); |
push(@whichopt,$aopt); |
} |
} |
return @whichopt; |
return @whichopt; |
} |
} |
|
|
sub prep_image { |
sub prep_image { |
my ($image,$mode,$name)=@_; |
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 $id=&Apache::loncommon::get_cgi_id(); |
|
|
my (%x,$i); |
my (%x,$i); |
$x{"cgi.$id.BGIMG"}=&escape($image); |
$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 |
#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 |
#one in white and then one in red on top of the one in white |
|
|
if (defined($x) && $x =~/\S/ |
if (defined($x) && $x =~/\S/ |
&& defined($y) && $y =~/\S/ |
&& defined($y) && $y =~/\S/ |
&& !&Apache::response::show_answer() |
&& ($mode eq 'submission' || !&Apache::response::show_answer()) |
&& $mode ne 'answeronly') { |
&& $mode ne 'answeronly') { |
my $length = 6; |
my $length = 6; |
my $width = 1; |
my $width = 1; |
Line 170 sub prep_image {
|
Line 199 sub prep_image {
|
if ($mode eq 'answer' || $mode eq 'answeronly') { |
if ($mode eq 'answer' || $mode eq 'answeronly') { |
my $width = 1; |
my $width = 1; |
my $extrawidth = 2; |
my $extrawidth = 2; |
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
foreach my $area (@{ $areas }) { |
foreach my $area (@areas) { |
|
if ($area=~/^rectangle:/) { |
if ($area=~/^rectangle:/) { |
$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; |
$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
Line 201 sub prep_image {
|
Line 229 sub prep_image {
|
sub displayfoils { |
sub displayfoils { |
my ($target,@whichopt) = @_; |
my ($target,@whichopt) = @_; |
my $result =''; |
my $result =''; |
my $name; |
|
my $temp=1; |
my $temp=1; |
foreach $name (@whichopt) { |
my @images; |
|
foreach my $name (@whichopt) { |
$result.=$Apache::response::foilgroup{"$name.text"}; |
$result.=$Apache::response::foilgroup{"$name.text"}; |
&Apache::lonxml::debug("Text is $result"); |
&Apache::lonxml::debug("Text is $result"); |
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";} |
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";} |
Line 211 sub displayfoils {
|
Line 239 sub displayfoils {
|
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( $target eq 'web' && $image !~ /^http:/ ) { |
if ( $target eq 'web' && $image !~ /^http:/ ) { |
$image=&clean_up_image($image); |
$image=&clean_up_image($image); |
} |
} |
|
push(@images,$image); |
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 224 sub displayfoils {
|
Line 253 sub displayfoils {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; |
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; |
} else { |
} else { |
my $id=$Apache::inputtags::response['-1']; |
my $respid=$Apache::inputtags::response['-1']; |
my $token=&prep_image($image); |
my $token=&prep_image($image,'submission',$name); |
my $temp=1; |
my $input_id = "HWVAL_$respid:$temp"; |
$result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ". |
my $id = $env{'form.request.prefix'}.$input_id; |
"src=\"/adm/randomlabel.png?token=$token\" /><br />\n"; |
$result.='<img onclick="image_response_click(\''.$id.'\',event);" |
|
src="/adm/randomlabel.png?token='.$token.'" |
|
id="'.$id.'_imageresponse" |
|
/>'. |
|
'<br />'. |
|
'<input type="hidden" name="'.$input_id.'_token" value="'.$token.'" />'. |
|
'<input type="hidden" name="'.$input_id.'" value="'. |
|
join(':',&get_submission($name)).'" />'; |
} |
} |
} |
} |
$temp++; |
$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 .= |
|
'<img class="LC_prior_image" |
|
src="/adm/randomlabel.png?token='.$token.'" /><br />'; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
sub display_answers { |
sub display_answers { |
my ($target,$whichopt)=@_; |
my ($target,$whichopt)=@_; |
|
|
my $result; |
my $result=&Apache::response::answer_header('imageresponse'); |
foreach my $name (@$whichopt) { |
foreach my $name (@$whichopt) { |
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
Line 248 sub display_answers {
|
Line 307 sub display_answers {
|
} |
} |
my $token=&prep_image($image,'answeronly',$name); |
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_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; |
return $result; |
} |
} |
|
|
Line 286 sub gradefoils {
|
Line 344 sub gradefoils {
|
return; |
return; |
} |
} |
|
|
my $x; |
my @results; |
my $y; |
|
my $result; |
|
my $temp=1; |
my $temp=1; |
|
my %response; |
foreach my $name (@whichopt) { |
foreach my $name (@whichopt) { |
$x=$env{"form.HWVAL_$id:$temp.x"}; |
my ($x,$y) = split(':',$env{"form.HWVAL_$id:$temp"}); |
$y=$env{"form.HWVAL_$id:$temp.y"}; |
$response{$name} = $env{"form.HWVAL_$id:$temp"}; |
&Apache::lonxml::debug("Got a x of $x and a y of $y for $name"); |
&Apache::lonxml::debug("Got a x of $x and a y of $y for $name"); |
if (defined($x) && defined($y) && |
if (defined($x) && defined($y) && |
defined(@{ $Apache::response::foilgroup{"$name.area"} })) { |
defined(@{ $Apache::response::foilgroup{"$name.area"} })) { |
Line 313 sub gradefoils {
|
Line 370 sub gradefoils {
|
if ($grade eq 'APPROX_ANS') { last; } |
if ($grade eq 'APPROX_ANS') { last; } |
} |
} |
&Apache::lonxml::debug("Foil was $grade"); |
&Apache::lonxml::debug("Foil was $grade"); |
if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; } |
push(@results, $grade) |
if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; } |
} else { |
&Apache::lonxml::debug("Question is $result"); |
push(@results, 'MISSING_ANSWER') |
$temp++; |
|
} |
} |
|
$temp++; |
} |
} |
my $responsestr="$x:$y"; |
my ($result) = &Apache::inputtags::finalizeawards(\@results,[]); |
|
&Apache::lonxml::debug("Question is $result"); |
|
|
my $part=$Apache::inputtags::part; |
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 |
if ($result |
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; } |
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; } |
&Apache::response::handle_previous(\%previous,$result); |
&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; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result; |
return; |
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 { |
sub end_foilgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
Line 346 sub end_foilgroup {
|
Line 433 sub end_foilgroup {
|
|
|
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayfoils($target,@whichopt); |
$result=&displayfoils($target,@whichopt); |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); } |
if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); } |
} elsif ( $target eq 'analyze') { |
} elsif ( $target eq 'analyze') { |
Line 411 sub start_foil {
|
Line 499 sub start_foil {
|
} |
} |
$Apache::response::foilnames{$name}++; |
$Apache::response::foilnames{$name}++; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
#&& !&Apache::response::showallfoils() |
&& !&Apache::response::showallfoils() |
) { |
) { |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
} else { |
} else { |
Line 464 sub end_text {
|
Line 552 sub end_text {
|
|| $target eq 'answer') { |
|| $target eq 'answer') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
#&& !&Apache::response::showallfoils() |
&& !&Apache::response::showallfoils() |
) { |
) { |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
} else { |
} else { |
Line 479 sub end_text {
|
Line 567 sub end_text {
|
sub start_image { |
sub start_image { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
|
my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' |
|| $target eq 'answer') { |
|| $target eq 'answer') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
Line 489 sub start_image {
|
Line 578 sub start_image {
|
|
|
$result=&Apache::edit::tag_start($target,$token,'Clickable Image'). |
$result=&Apache::edit::tag_start($target,$token,'Clickable Image'). |
&Apache::edit::editline($token->[1],$bgimg,'Image Source File',40); |
&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'). |
$result.=&Apache::edit::search(undef,'textnode'). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
Line 506 sub end_image {
|
Line 595 sub end_image {
|
my $image = &Apache::lonxml::endredirection(); |
my $image = &Apache::lonxml::endredirection(); |
&Apache::lonxml::debug("original image is $image"); |
&Apache::lonxml::debug("original image is $image"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
#&& !&Apache::response::showallfoils() |
&& !&Apache::response::showallfoils() |
) { |
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
Line 515 sub end_image {
|
Line 604 sub end_image {
|
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $image = &Apache::lonxml::endredirection(); |
my $image = &Apache::lonxml::endredirection(); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
#&& !&Apache::response::showallfoils() |
&& !&Apache::response::showallfoils() |
) { |
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
Line 544 sub end_image {
|
Line 633 sub end_image {
|
$graphinclude =~ s/^$commentline//; |
$graphinclude =~ s/^$commentline//; |
} else { |
} else { |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
$file =~ s/\ /\_/g; |
|
my ($height_param,$width_param)= |
my ($height_param,$width_param)= |
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval); |
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval); |
$graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}'; |
$graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}'; |
Line 596 sub end_rectangle {
|
Line 684 sub end_rectangle {
|
$area=~s/\s//g; |
$area=~s/\s//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
#&& !&Apache::response::showallfoils() |
&& !&Apache::response::showallfoils() |
) { |
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
} else { |
} else { |
Line 677 sub end_polygon {
|
Line 765 sub end_polygon {
|
$area=~s/\s*//g; |
$area=~s/\s*//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
#&& !&Apache::response::showallfoils() |
&& !&Apache::response::showallfoils() |
) { |
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area"; |
} else { |
} else { |