--- loncom/homework/imageresponse.pm 2003/06/09 22:42:49 1.31 +++ loncom/homework/imageresponse.pm 2007/04/18 01:06:22 1.82 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.31 2003/06/09 22:42:49 albertel Exp $ +# $Id: imageresponse.pm,v 1.82 2007/04/18 01:06:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,197 +26,389 @@ # # http://www.lon-capa.org/ # - #FIXME LATER assumes multiple possible submissions but only one is possible #currently package Apache::imageresponse; use strict; -use Image::Magick; +use Image::Magick(); +use Apache::randomlylabel(); +use Apache::londefdef(); +use Apache::Constants qw(:common :http); +use Apache::lonlocal; +use Apache::lonnet; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + BEGIN { - &Apache::lonxml::register('Apache::imageresponse',('imageresponse')); + &Apache::lonxml::register('Apache::imageresponse',('imageresponse')); } sub start_imageresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; - #when in a radiobutton response use these - &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); - push (@Apache::lonxml::namespace,'imageresponse'); - my $id = &Apache::response::start_response($parstack,$safeeval); - if ($target eq 'meta') { - $result=&Apache::response::meta_package_write('imageresponse'); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + #when in a radiobutton response use these + &Apache::lonxml::register('Apache::imageresponse', + ('foilgroup','foil','text','image','rectangle', + 'polygon','conceptgroup')); + push (@Apache::lonxml::namespace,'imageresponse'); + my $id = &Apache::response::start_response($parstack,$safeeval); + undef(%Apache::response::foilnames); + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('imageresponse'); + } elsif ($target eq 'analyze') { + my $part_id="$Apache::inputtags::part.$id"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + } + return $result; } sub end_imageresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - &Apache::response::end_response; - pop @Apache::lonxml::namespace; + + pop(@Apache::lonxml::namespace); &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); + my $result; - if ($target eq 'edit') { $result=&Apache::edit::end_table(); } + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } elsif ($target eq 'tex' + && $Apache::lonhomework::type eq 'exam') { + $result=&Apache::inputtags::exam_score_line($target); + } + + undef(%Apache::response::foilnames); + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition()); + } + &Apache::response::end_response(); + return $result; } %Apache::response::foilgroup=(); sub start_foilgroup { - %Apache::response::foilgroup=(); - $Apache::imageresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); - return ''; + %Apache::response::foilgroup=(); + $Apache::imageresponse::conceptgroup=0; + &Apache::response::pushrandomnumber(); + return ''; } sub getfoilcounts { - my ($parstack,$safeeval)=@_; + my ($parstack,$safeeval)=@_; - 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; } - return ($count,$max); + 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; } + return ($count,$max); } sub whichfoils { - my ($max)=@_; - if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } - my @names = @{ $Apache::response::foilgroup{'names'} }; - 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 { - $aopt=int(&Math::Random::random_uniform() * ($#names+1)); + my ($max)=@_; + if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } + my @names = @{ $Apache::response::foilgroup{'names'} }; + 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 { + $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); + } + return @whichopt; +} + +sub prep_image { + my ($image,$mode,$name)=@_; + my $part=$Apache::inputtags::part; + my $respid=$Apache::inputtags::response['-1']; + my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"}); + &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); + + #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/ + && ($mode eq 'submission' || !&Apache::response::show_answer()) + && $mode ne 'answeronly') { + my $length = 6; + my $width = 1; + my $extrawidth = 2; + my $xmin=($x-$length); + my $xmax=($x+$length); + my $ymin=($y-$length); + my $ymax=($y+$length); + + $x{"cgi.$id.OBJTYPE"}.='LINE:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax), + "FFFFFF",($width+$extrawidth))); + $x{"cgi.$id.OBJTYPE"}.='LINE:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin), + "FFFFFF",($width+$extrawidth))); + $x{"cgi.$id.OBJTYPE"}.='LINE:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax), + "FF0000",($width))); + $x{"cgi.$id.OBJTYPE"}.='LINE:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin), + "FF0000",($width))); + } + if ($mode eq 'answer' || $mode eq 'answeronly') { + my $width = 1; + my $extrawidth = 2; + foreach my $area (@{ $areas }) { + if ($area=~/^rectangle:/) { + $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + my ($x1,$y1,$x2,$y2)= + ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/); + $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF", + ($width+$extrawidth))); + $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width)); + } elsif ($area=~/^polygon:(.*)/) { + $x{"cgi.$id.OBJTYPE"}.='POLYGON:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',("FFFFFF",($width+$extrawidth))); + $x{"cgi.$id.OBJEXTRA$i"}=$1; + $x{"cgi.$id.OBJTYPE"}.='POLYGON:'; + $i=$x{"cgi.$id.OBJCOUNT"}++; + $x{"cgi.$id.OBJ$i"}=join(':',("00FF00",$width)); + $x{"cgi.$id.OBJEXTRA$i"}=$1; + } + } } - &Apache::lonxml::debug("From $#names elms, picking $aopt"); - $aopt=splice(@names,$aopt,1); - &Apache::lonxml::debug("Picked $aopt"); - push (@whichopt,$aopt); - } - return @whichopt; + &Apache::lonnet::appenv(%x); + return $id; } sub displayfoils { - my ($target,@whichopt) = @_; - my $result =''; - my $name; - my $temp=1; - foreach $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";} - my $image=$Apache::response::foilgroup{"$name.image"}; - &Apache::lonxml::debug("image is $image"); - if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { - if ($target eq 'tex') { - $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; - } else { - $result.="
\n"; - } + my ($target,@whichopt) = @_; + my $result =''; + my $name; + my $temp=1; + my @images; + foreach $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";} + my $image=$Apache::response::foilgroup{"$name.image"}; + &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') { + $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; + } else { + my $token=&prep_image($image,'answer',$name); + $result.="
\n"; + } + } else { + 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"; + } + } + $temp++; + } + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_response, + [\@images]); + } + return $result; +} + +sub format_prior_response { + my ($mode,$answer,$other_data) = @_; + my ($x,$y)=split(/:/,$answer); + my $images = $other_data->[0]; + + my $token = &draw_image('submission',$images->[0],$x,$y); + + return ""; + +} + +sub display_answers { + my ($target,$whichopt)=@_; + + my $result; + foreach my $name (@$whichopt) { + my $image=$Apache::response::foilgroup{"$name.image"}; + &Apache::lonxml::debug("image is $image"); + if ( $target eq 'web' && $image !~ /^http:/ ) { + $image = &clean_up_image($image); + } + 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'); + } + return $result; +} + +sub clean_up_image { + my ($image)=@_; + if ($image =~ /\s*
\n"; - } - } - $temp++; - } - return $result; + $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image); + &Apache::lonxml::debug("repcopying: $image"); + if (&Apache::lonnet::repcopy($image) ne 'ok') { + $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; + } + } + return $image; } sub gradefoils { - my (@whichopt) = @_; - my $x; - my $y; - my $result; - my $id=$Apache::inputtags::response['-1']; - my $temp=1; - foreach my $name (@whichopt) { - $x=$ENV{"form.HWVAL_$id:$temp.x"}; - $y=$ENV{"form.HWVAL_$id:$temp.y"}; - &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"} })) { - my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; - my $grade="INCORRECT"; - foreach my $area (@areas) { - &Apache::lonxml::debug("Area is $area for $name"); - $area =~ m/([a-z]*):/; - &Apache::lonxml::debug("Area of type $1"); - if ($1 eq 'rectangle') { - $grade=&grade_rectangle($area,$x,$y); - } else { - &Apache::lonxml::error("Unknown area style $area"); + my (@whichopt) = @_; + + my $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + + if ($Apache::lonhomework::type eq 'exam') { + &Apache::response::scored_response($partid,$id); + return; + } + + my $x; + my $y; + my $result; + my $temp=1; + foreach my $name (@whichopt) { + $x=$env{"form.HWVAL_$id:$temp.x"}; + $y=$env{"form.HWVAL_$id:$temp.y"}; + &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"} })) { + my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; + my $grade="INCORRECT"; + foreach my $area (@areas) { + &Apache::lonxml::debug("Area is $area for $name"); + $area =~ m/([a-z]*):/; + &Apache::lonxml::debug("Area of type $1"); + if ($1 eq 'rectangle') { + $grade=&grade_rectangle($area,$x,$y); + } elsif ($1 eq 'polygon') { + $grade=&grade_polygon($area,$x,$y); + } else { + &Apache::lonxml::error("Unknown area style $area"); + } + &Apache::lonxml::debug("Area said $grade"); + 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++; } - &Apache::lonxml::debug("Area said $grade"); - 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++; - } - } - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y"; - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result; - return ''; + } + my $responsestr="$x:$y"; + my $part=$Apache::inputtags::part; + my %previous=&Apache::response::check_for_previous($responsestr,$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.awarddetail"}=$result; + return; } sub end_foilgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - my @whichopt; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { - my ($count,$max) = &getfoilcounts($parstack,$safeeval); - if ($count>$max) { $count=$max } - &Apache::lonxml::debug("Count is $count from $max"); - @whichopt = &whichfoils($max); - if ($target eq 'web' || $target eq 'tex') { - $result=&displayfoils($target,@whichopt); - } elsif ($target eq 'grade') { - if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); } - } - } elsif ($target eq 'edit') { - $result=&Apache::edit::end_table(); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my @whichopt; + + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze' || $target eq 'answer') { + + my ($count,$max) = &getfoilcounts($parstack,$safeeval); + if ($count>$max) { $count=$max } + &Apache::lonxml::debug("Count is $count from $max"); + + @whichopt = &whichfoils($max); + + 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') { + &Apache::response::analyze_store_foilgroup(\@whichopt, + ['text','image','area']); + } elsif ($target eq 'answer' + && $env{'form.answer_output_mode'} ne 'tex') { + $result=&display_answers($target,\@whichopt); + } + + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + &Apache::response::poprandomnumber(); + return $result; } sub start_conceptgroup { - $Apache::imageresponse::conceptgroup=1; - %Apache::response::conceptgroup=(); - return ''; + $Apache::imageresponse::conceptgroup=1; + %Apache::response::conceptgroup=(); + return ''; } sub end_conceptgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - $Apache::imageresponse::conceptgroup=0; - my $result; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { - if (defined(@{ $Apache::response::conceptgroup{'names'} })) { - my @names = @{ $Apache::response::conceptgroup{'names'} }; - my $pick=int(&Math::Random::random_uniform() * ($#names+1)); - my $name=$names[$pick]; - if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) { - push @{ $Apache::response::foilgroup{'names'} }, $name; - $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; - $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"}; - push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} }); - my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); - $Apache::response::foilgroup{"$name.concept"} = $concept; - &Apache::lonxml::debug("Selecting $name in $concept"); - } - } - } elsif ($target eq 'edit') { - $result=&Apache::edit::end_table(); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + $Apache::imageresponse::conceptgroup=0; + my $result; + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze') { + &Apache::response::pick_foil_for_concept($target, + ['area','text','image'], + \%Apache::hint::image, + $parstack,$safeeval); + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; } sub insert_foil { @@ -230,19 +423,38 @@ sub insert_foil { $Apache::imageresponse::curname=''; sub start_foil { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { - my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { $name=$Apache::lonxml::curdepth; } - if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils()) { - push(@{ $Apache::response::conceptgroup{'names'} }, $name); - } else { - push(@{ $Apache::response::foilgroup{'names'} }, $name); - } - $Apache::imageresponse::curname=$name; - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $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."); + $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::response::foilnames{$name}++; + if ( $Apache::imageresponse::conceptgroup + #&& !&Apache::response::showallfoils() + ) { + push(@{ $Apache::response::conceptgroup{'names'} }, $name); + } else { + push(@{ $Apache::response::foilgroup{'names'} }, $name); + } + $Apache::imageresponse::curname=$name; + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + $result .= &Apache::edit::text_arg('Name:','name',$token); + $result .= &Apache::edit::end_row(). + &Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'name'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result;; } sub end_foil { @@ -255,207 +467,251 @@ sub end_foil { } sub start_text { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - if ($target eq 'web' || $target eq 'tex') { - &Apache::lonxml::startredirection; - } elsif ($target eq 'edit') { - my $descr=&Apache::lonxml::get_all_text('/text',$parser); - $result=&Apache::edit::tag_start($target,$token,'Task Description'). - &Apache::edit::editfield($token->[1],$descr,'Text',60,2). - &Apache::edit::end_row(); - } elsif ($target eq "modified") { - my $descr=&Apache::lonxml::get_all_text('/text',$parser); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' + || $target eq 'answer') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style); + $result=&Apache::edit::tag_start($target,$token,'Task Description'). + &Apache::edit::editfield($token->[1],$descr,'Text',60,2). + &Apache::edit::end_row(); + } elsif ($target eq "modified") { + $result=$token->[4].&Apache::edit::modifiedfield('/text',$parser); + } + return $result; } sub end_text { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; - if ($target eq 'web' || $target eq 'tex') { - my $name = $Apache::imageresponse::curname; - if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils() ) { - $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; - } else { - $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' + || $target eq 'answer') { + my $name = $Apache::imageresponse::curname; + if ( $Apache::imageresponse::conceptgroup + #&& !&Apache::response::showallfoils() + ) { + $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; + } else { + $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); } - } elsif ($target eq 'edit') { - $result=&Apache::edit::end_table(); - } - return $result; + return $result; } sub start_image { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - if ($target eq 'web' || $target eq 'tex') { - &Apache::lonxml::startredirection; - } elsif ($target eq 'edit') { - my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); - $Apache::edit::bgimgsrc=$bgimg; - $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth; - - $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::search(undef,'textnode'). - &Apache::edit::end_row(); - } elsif ($target eq "modified") { - my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' + || $target eq 'answer') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style); + $Apache::edit::bgimgsrc=$bgimg; + $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth; + + $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::search(undef,'textnode'). + &Apache::edit::end_row(); + } elsif ($target eq "modified") { + $result=$token->[4].&Apache::edit::modifiedfield('/image',$parser); + } + return $result; } sub end_image { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; - my $name = $Apache::imageresponse::curname; - if ($target eq 'web') { - my $image = &Apache::lonxml::endredirection; - &Apache::lonxml::debug("out is $image"); - if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils()) { - $Apache::response::conceptgroup{"$name.image"} = $image; - } else { - $Apache::response::foilgroup{"$name.image"} = $image; - } - } elsif ($target eq 'edit') { - $result=&Apache::edit::end_table(); - } elsif ($target eq 'tex') { - my $src = &Apache::lonxml::endredirection; - $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); - my $width_param = ''; - my $height_param = ''; - my $scaling = .3; - my $image = Image::Magick->new; - my $current_figure = $image->Read($src); - $width_param = $image->Get('width') * $scaling;; - $height_param = $image->Get('height') * $scaling;; - undef $image; - my $epssrc = $src; - $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i; - if (not -e $epssrc) { - my $localfile = $epssrc; - $localfile =~ s/.*(\/res)/$1/; - my $file; - my $path; - if ($localfile =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.'/'; - } - my $signal_eps = 0; - my @content_directory = &Apache::lonnet::dirlist($path); - for (my $iy=0;$iy<=$#content_directory;$iy++) { - my @tempo_array = split(/&/,$content_directory[$iy]); - $content_directory[$iy] = $tempo_array[0]; - if ($file eq $tempo_array[0]) { - $signal_eps = 1; - last; - } + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + my $name = $Apache::imageresponse::curname; + if ($target eq 'web' || $target eq 'answer') { + my $image = &Apache::lonxml::endredirection(); + &Apache::lonxml::debug("original image is $image"); + if ( $Apache::imageresponse::conceptgroup + #&& !&Apache::response::showallfoils() + ) { + $Apache::response::conceptgroup{"$name.image"} = $image; + } else { + $Apache::response::foilgroup{"$name.image"} = $image; } - if ($signal_eps) { - my $eps_file = &Apache::lonnet::getfile($localfile); + } elsif ($target eq 'analyze') { + my $image = &Apache::lonxml::endredirection(); + if ( $Apache::imageresponse::conceptgroup + #&& !&Apache::response::showallfoils() + ) { + $Apache::response::conceptgroup{"$name.image"} = $image; } else { - $localfile = $src; - $localfile =~ s/.*(\/res)/$1/; - my $as = &Apache::lonnet::getfile($src); - } - } - my $file; - my $path; - if ($src =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.'/'; - } - my $newsrc = $src; - $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; - $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; - #do we have any specified size of the picture? - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); - my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); - my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval); - if ($TeXwidth ne '') { - $width_param = $TeXwidth; - } elsif ($TeXheight ne '') { - $width_param = $TeXheight/$height_param*$width_param; - } elsif ($width ne '') { - $width_param = $width*$scaling; - } - #where can we find the picture? - if (-e $newsrc) { - if ($path) { - $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; + $Apache::response::foilgroup{"$name.image"} = $image; } - } else { - my $temp_file; - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; - $temp_file = Apache::File->new('>>'.$filename); - print $temp_file "$src\n"; -$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; - } - } - return $result; + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } elsif ($target eq 'tex') { + my $src = &Apache::lonxml::endredirection(); + + # There may be all sorts of whitespace on fore and aft: + + $src =~ s/\s+$//s; + $src =~ s/^\s+//s; + + # + # Gnuplot e.g. just generates the latex to put inplace. + # + my $graphinclude; + if ($src =~ /^%DYNAMICIMAGE/) { + # This is needed because the newline is not always passed -> tex. + # At present we don't care about the sizing info. + + my ($commentline, $restofstuff) = split(/\n/, $src); + $graphinclude = $src; + $graphinclude =~ s/^$commentline//; + } else { + 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.'}'; + } + $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude; + } + return $result; } sub start_rectangle { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { - &Apache::lonxml::startredirection; - } elsif ($target eq 'edit') { - my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); - $result=&Apache::edit::tag_start($target,$token,'Rectangle'). - &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). - &Apache::edit::entercoordpair(undef,'textnode'). - &Apache::edit::end_row(); - } elsif ($target eq "modified") { - my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze' || $target eq 'answer') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style); + $result=&Apache::edit::tag_start($target,$token,'Rectangle'). + &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). + &Apache::edit::entercoord(undef,'textnode',undef,undef,'box'). + &Apache::edit::end_row(); + } elsif ($target eq "modified") { + &Apache::edit::deletecoorddata(); + $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser); + } + return $result; } sub grade_rectangle { - my ($spec,$x,$y) = @_; - &Apache::lonxml::debug("Spec is $spec"); - $spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/; - my $x1=$1; - my $y1=$2; - my $x2=$3; - my $y2=$4; - &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2"); - if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; } - if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; } - if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) { - return 'APPROX_ANS'; - } - return 'INCORRECT'; + my ($spec,$x,$y) = @_; + &Apache::lonxml::debug("Spec is $spec"); + my ($x1,$y1,$x2,$y2)=($spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/); + &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2"); + if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; } + if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; } + if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) { + return 'APPROX_ANS'; + } + return 'INCORRECT'; } sub end_rectangle { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { - my $name = $Apache::imageresponse::curname; - my $area = &Apache::lonxml::endredirection; - &Apache::lonxml::debug("out is $area for $name"); - if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils()) { - push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze' || $target eq 'answer') { + my $name = $Apache::imageresponse::curname; + my $area = &Apache::lonxml::endredirection; + $area=~s/\s//g; + &Apache::lonxml::debug("out is $area for $name"); + if ( $Apache::imageresponse::conceptgroup + #&& !&Apache::response::showallfoils() + ) { + push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; + } else { + push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + +sub start_polygon { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze' || $target eq 'answer') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style); + $result=&Apache::edit::tag_start($target,$token,'Polygon'). + &Apache::edit::editline($token->[1],$coords,'Coordinate list',40). + &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon'). + &Apache::edit::end_row(); + } elsif ($target eq "modified") { + $result=$token->[4].&Apache::edit::modifiedfield('/polygon',$parser); + } + return $result; +} + +sub grade_polygon { + my ($spec,$x,$y) = @_; + &Apache::lonxml::debug("Spec is $spec"); + $spec=~s/^polygon://; + my @polygon; + foreach my $coord (split('-',$spec)) { + my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/); + &Apache::lonxml::debug("x $x y $y"); + push @polygon, {'x'=>$x,'y'=>$y}; + } + #make end point start point + push @polygon, $polygon[0]; + # cribbed from + # http://geometryalgorithms.com/Archive/algorithm_0103/algorithm_0103.htm + my $crossing = 0; # the crossing number counter + + # loop through all edges of the polygon + for (my $i=0; $i<$#polygon; $i++) { # edge from V[i] to V[i+1] + if ((($polygon[$i]->{'y'} <= $y) + && ($polygon[$i+1]->{'y'} > $y)) # an upward crossing + || + (($polygon[$i]->{'y'} > $y) + && ($polygon[$i+1]->{'y'} <= $y))) { # a downward crossing + # compute the actual edge-ray intersect x-coordinate + my $vt = ($y - $polygon[$i]->{'y'}) + / ($polygon[$i+1]->{'y'} - $polygon[$i]->{'y'}); + if ($x < $polygon[$i]->{'x'} + $vt * + ($polygon[$i+1]->{'x'} - $polygon[$i]->{'x'})) { # x