--- loncom/homework/imageresponse.pm 2003/11/10 23:29:27 1.40 +++ loncom/homework/imageresponse.pm 2004/01/15 19:51:30 1.45 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.40 2003/11/10 23:29:27 albertel Exp $ +# $Id: imageresponse.pm,v 1.45 2004/01/15 19:51:30 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,7 +43,9 @@ 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); if ($target eq 'meta') { @@ -104,41 +107,58 @@ sub whichfoils { } sub prep_image { - my ($image)=@_; + my ($image,$mode,$name)=@_; my $part=$Apache::inputtags::part; - my $id=$Apache::inputtags::response['-1']; - my $token=$Apache::lonxml::curdepth.'_'.$$; - my $args="BGIMG=".$image; - &Apache::lonxml::debug("args is $args image is $image"); - my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$id.submission"}); + my $respid=$Apache::inputtags::response['-1']; + my $id=&Apache::loncommon::get_cgi_id(); + my %x; + $x{"cgi.$id.BGIMG"}=$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) && defined($y)) { - $args.="&LINECOUNT=4"; + $x{"cgi.$id.LINECOUNT"}=4; my $length = 6; my $width = 1; my $extrawidth = 2; - $args.="&LINEW0=".($width+$extrawidth); - $args.="&LINEC0=FFFFFF"; - $args.="&LINEX10=".($x-$length)."&LINEY10=".($y-$length); - $args.="&LINEX20=".($x+$length)."&LINEY20=".($y+$length); - $args.="&LINEW1=".($width+$extrawidth); - $args.="&LINEC1=FFFFFF"; - $args.="&LINEX11=".($x-$length)."&LINEY11=".($y+$length); - $args.="&LINEX21=".($x+$length)."&LINEY21=".($y-$length); - $args.="&LINEW2=$width"; - $args.="&LINEC2=FF0000"; - $args.="&LINEX12=".($x-$length)."&LINEY12=".($y-$length); - $args.="&LINEX22=".($x+$length)."&LINEY22=".($y+$length); - $args.="&LINEW3=$width"; - $args.="&LINEC3=FF0000"; - $args.="&LINEX13=".($x-$length)."&LINEY13=".($y+$length); - $args.="&LINEX23=".($x+$length)."&LINEY23=".($y-$length); - } - &Apache::lonxml::debug("args is $args image is $image"); - &Apache::lonnet::appenv(("imagerequest.$token"=> - &Apache::lonnet::escape($args))); - return $token; + $x{"cgi.$id.LINE0"}= + join(':',(($x-$length),($y-$length),($x+$length),($y+$length), + "FFFFFF",($width+$extrawidth))); + $x{"cgi.$id.LINE1"}= + join(':',(($x-$length),($y+$length),($x+$length),($y-$length), + "FFFFFF",($width+$extrawidth))); + $x{"cgi.$id.LINE2"}= + join(':',(($x-$length),($y-$length),($x+$length),($y+$length), + "FF0000",($width))); + $x{"cgi.$id.LINE3"}= + join(':',(($x-$length),($y+$length),($x+$length),($y-$length), + "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:/) { + my ($x1,$y1,$x2,$y2)= + ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/); + my $i=$x{"cgi.$id.BOXCOUNT"}++; + $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF", + ($width+$extrawidth))); + $i=$x{"cgi.$id.BOXCOUNT"}++; + $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width)); + } elsif ($area=~/^polygon:(.*)/) { + my $i=$x{"cgi.$id.POLYCOUNT"}++; + $x{"cgi.$id.POLYOPT$i"}=join(':',("FFFFFF",($width+$extrawidth))); + $x{"cgi.$id.POLY$i"}=$1; + $i=$x{"cgi.$id.POLYCOUNT"}++; + $x{"cgi.$id.POLYOPT$i"}=join(':',("00FF00",$width)); + $x{"cgi.$id.POLY$i"}=$1; + } + } + } + &Apache::lonnet::appenv(%x); + return $id; } sub displayfoils { @@ -163,7 +183,7 @@ sub displayfoils { if ($target eq 'tex') { $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; } else { - my $token=&prep_image($image); + my $token=&prep_image($image,'answer',$name); $result.="
\n"; } } else { @@ -203,6 +223,8 @@ sub gradefoils { &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"); } @@ -451,7 +473,11 @@ sub end_image { 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.'} '; + $newsrc=~s/\/home\/httpd\/html\/res//; + $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//; + $newsrc=~s/\/\.\//\//; + $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; + $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; } } return $result; @@ -467,9 +493,10 @@ sub start_rectangle { 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") { + &Apache::edit::deletecoorddata(); $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser); } return $result; @@ -478,11 +505,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; } @@ -508,6 +531,85 @@ 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