--- loncom/homework/imageresponse.pm 2003/10/27 19:27:09 1.37 +++ loncom/homework/imageresponse.pm 2005/06/22 12:03:23 1.72 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.37 2003/10/27 19:27:09 albertel Exp $ +# $Id: imageresponse.pm,v 1.72 2005/06/22 12:03:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,10 +30,13 @@ #currently package Apache::imageresponse; -use Apache::randomlylabel; use strict; -use Image::Magick; -use GD; +use Image::Magick(); +use Apache::randomlylabel(); +use Apache::londefdef(); +use Apache::Constants qw(:common :http); +use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::imageresponse',('imageresponse')); @@ -42,9 +46,12 @@ 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')); + &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') { @@ -61,6 +68,7 @@ sub end_imageresponse { &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } + undef(%Apache::response::foilnames); return $result; } @@ -68,7 +76,7 @@ sub end_imageresponse { sub start_foilgroup { %Apache::response::foilgroup=(); $Apache::imageresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); return ''; } @@ -78,7 +86,7 @@ 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); } @@ -90,11 +98,11 @@ sub whichfoils { 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"); @@ -103,6 +111,73 @@ sub whichfoils { return @whichopt; } +sub prep_image { + my ($image,$mode,$name)=@_; + my $part=$Apache::inputtags::part; + my $respid=$Apache::inputtags::response['-1']; + my $id=&Apache::loncommon::get_cgi_id(); + my (%x,$i); + $x{"cgi.$id.BGIMG"}=&Apache::lonnet::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()) { + 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') { + my $width = 1; + my $extrawidth = 2; + my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; + 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::lonnet::appenv(%x); + return $id; +} + sub displayfoils { my ($target,@whichopt) = @_; my $result =''; @@ -114,17 +189,26 @@ sub displayfoils { 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); + } + &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 { - $result.="
\n"; + 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 { - $result.="
\n"; + my $id=$Apache::inputtags::response['-1']; + my $token=&prep_image($image); + my $temp=1; + $result.="
\n"; } } $temp++; @@ -132,6 +216,26 @@ sub displayfoils { return $result; } +sub clean_up_image { + my ($image)=@_; + if ($image =~ /\s*$max) { $count=$max } &Apache::lonxml::debug("Count is $count from $max"); @@ -183,7 +296,7 @@ sub end_foilgroup { if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,@whichopt); } elsif ($target eq 'grade') { - if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); } + if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); } } elsif ( $target eq 'analyze') { &Apache::response::analyze_store_foilgroup(\@whichopt, ['text','image','area']); @@ -191,6 +304,7 @@ sub end_foilgroup { } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } + &Apache::response::poprandomnumber(); return $result; } @@ -229,19 +343,37 @@ sub insert_foil { $Apache::imageresponse::curname=''; sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || $target eq 'analyze') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { $name=$Apache::lonxml::curdepth; } + 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()) { + #&& !&Apache::response::showallfoils() + ) { push(@{ $Apache::response::conceptgroup{'names'} }, $name); } else { push(@{ $Apache::response::foilgroup{'names'} }, $name); } $Apache::imageresponse::curname=$name; - } - return ''; + } 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 { @@ -264,9 +396,7 @@ sub start_text { &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); + $result=$token->[4].&Apache::edit::modifiedfield('/text',$parser); } return $result; } @@ -277,7 +407,8 @@ sub end_text { if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { my $name = $Apache::imageresponse::curname; if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils() ) { + #&& !&Apache::response::showallfoils() + ) { $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; } else { $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; @@ -304,9 +435,7 @@ sub start_image { $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); + $result=$token->[4].&Apache::edit::modifiedfield('/image',$parser); } return $result; } @@ -316,48 +445,20 @@ sub end_image { my $result; my $name = $Apache::imageresponse::curname; if ($target eq 'web') { - my $image = &Apache::lonxml::endredirection; + my $image = &Apache::lonxml::endredirection(); &Apache::lonxml::debug("original image is $image"); - my $id=$Apache::inputtags::response['-1']; - my $temp=1; - my $x=$ENV{"form.HWVAL_$id:$temp.x"}; - my $y=$ENV{"form.HWVAL_$id:$temp.y"}; - if (defined ($x) && defined ($y)) { - &Apache::lonxml::debug("x and y defined as $x,$y"); - my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1); - if (! defined($currentImage)) { - &Apache::lonnet::logthis('Unable to create image object for '.$image); - return ''; - } - my $red; - if (!($red = $currentImage->colorResolve(255,0,0))) { - $red = $currentImage->colorClosestHWB(255,0,0); - } - my $length = 6; - $currentImage->line($x-$length,$y-$length,$x+$length,$y+$length,$red); - $currentImage->line($x-$length,$y+$length,$x+$length,$y-$length,$red); - - my ($nameWOext) = ($image =~ /^.*\/(.*)\..*$/); - &Apache::lonxml::debug("graph name $nameWOext"); - my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_". - $nameWOext.'.png'; #needs to be more random or specific - my $newImageName = '/home/httpd'.$webImageName; - - my $imgfh = Apache::File->new('>'.$newImageName); - print $imgfh $currentImage->png; - $image = $webImageName; - } - &Apache::lonxml::debug("out image is $image"); if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils()) { + #&& !&Apache::response::showallfoils() + ) { $Apache::response::conceptgroup{"$name.image"} = $image; } else { $Apache::response::foilgroup{"$name.image"} = $image; } } elsif ($target eq 'analyze') { - my $image = &Apache::lonxml::endredirection; + my $image = &Apache::lonxml::endredirection(); if ( $Apache::imageresponse::conceptgroup - && !&Apache::response::showallfoils()) { + #&& !&Apache::response::showallfoils() + ) { $Apache::response::conceptgroup{"$name.image"} = $image; } else { $Apache::response::foilgroup{"$name.image"} = $image; @@ -365,77 +466,31 @@ sub end_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; - } - } - if ($signal_eps) { - my $eps_file = &Apache::lonnet::getfile($localfile); - } 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.'} '; - } + 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 $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.'} '; + 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; } @@ -443,18 +498,18 @@ sub end_image { sub start_rectangle { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze') { &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::entercoord(undef,'textnode',undef,undef,'box'). &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); + &Apache::edit::deletecoorddata(); + $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser); } return $result; } @@ -462,11 +517,7 @@ sub start_rectangle { 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; + 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; } @@ -479,18 +530,102 @@ sub grade_rectangle { sub end_rectangle { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || + $target eq 'analyze') { 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()) { + #&& !&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') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + my $coords=&Apache::lonxml::get_all_text('/polygon',$parser); + $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