--- loncom/homework/imageresponse.pm 2003/09/24 19:20:58 1.36 +++ loncom/homework/imageresponse.pm 2004/03/15 22:09:52 1.52 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.36 2003/09/24 19:20:58 albertel Exp $ +# $Id: imageresponse.pm,v 1.52 2004/03/15 22:09:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,16 +26,16 @@ # # http://www.lon-capa.org/ # -# July,August 2003 H. K. Ng -# #FIXME LATER assumes multiple possible submissions but only one is possible #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; BEGIN { &Apache::lonxml::register('Apache::imageresponse',('imageresponse')); @@ -44,11 +45,17 @@ 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') { + my $part_id="$Apache::inputtags::part.$id"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; } @@ -60,6 +67,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; } @@ -102,6 +110,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/) { + 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 =''; @@ -113,17 +188,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++; @@ -131,6 +215,25 @@ 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 +289,10 @@ sub end_foilgroup { $result=&displayfoils($target,@whichopt); } 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 'edit') { $result=&Apache::edit::end_table(); } @@ -200,21 +309,12 @@ 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"); - } - } + 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(); } @@ -234,9 +334,14 @@ 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') { + 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 (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); @@ -260,7 +365,7 @@ sub end_foil { sub start_text { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { my $descr=&Apache::lonxml::get_all_text('/text',$parser); @@ -268,9 +373,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; } @@ -278,7 +381,7 @@ sub start_text { sub end_text { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { my $name = $Apache::imageresponse::curname; if ( $Apache::imageresponse::conceptgroup && !&Apache::response::showallfoils() ) { @@ -295,7 +398,7 @@ sub end_text { sub start_image { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); @@ -308,9 +411,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; } @@ -322,36 +423,14 @@ sub end_image { if ($target eq 'web') { 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; + if ( $Apache::imageresponse::conceptgroup + && !&Apache::response::showallfoils()) { + $Apache::response::conceptgroup{"$name.image"} = $image; + } else { + $Apache::response::foilgroup{"$name.image"} = $image; } - &Apache::lonxml::debug("out image is $image"); + } elsif ($target eq 'analyze') { + my $image = &Apache::lonxml::endredirection; if ( $Apache::imageresponse::conceptgroup && !&Apache::response::showallfoils()) { $Apache::response::conceptgroup{"$name.image"} = $image; @@ -426,11 +505,8 @@ sub end_image { $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; } } 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.'} '; + #care about eps dynamical generation + $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param); } } return $result; @@ -439,18 +515,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; } @@ -458,11 +534,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; } @@ -475,7 +547,8 @@ 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; &Apache::lonxml::debug("out is $area for $name"); @@ -487,6 +560,86 @@ sub end_rectangle { } } 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