--- loncom/homework/imageresponse.pm 2001/08/06 17:37:12 1.10
+++ loncom/homework/imageresponse.pm 2002/07/23 14:41:06 1.19
@@ -1,313 +1,380 @@
-# The LON-CAPA image response handler
-#
-# Image click response style
+# The LearningOnline Network with CAPA
+# image click response style
+#
+# $Id: imageresponse.pm,v 1.19 2002/07/23 14:41:06 sakharuk Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
#
-# YEAR=2001
-# 2/7,2/9,2/22,3/1,5/4,5/15,5/31,6/2,6/26 Guy Albertelli
-# 8/6 Scott Harrison
-#FIXME assumes multiple possible submissions but only one is possible currently
+#FIXME assumes multiple possbile submissions but only one is possible currently
package Apache::imageresponse;
use strict;
-# ======================================================================= BEGIN
-sub BEGIN {
- &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
+BEGIN {
+ &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
}
-# ======================================================== Start image response
sub start_imageresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- #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);
- return '';
+ 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;
}
-# ========================================================== End image response
sub end_imageresponse {
- &Apache::response::end_response;
- pop @Apache::lonxml::namespace;
- return '';
+ &Apache::response::end_response;
+ pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
+ return '';
}
-%Apache::response::foilgroup = {};
-# ============================================================ Start foil group
+%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::setrandomnumber();
+ return '';
}
-# =================================== Get foil counts (returns 2 element array)
sub getfoilcounts {
- 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;
- return ($count,$max);
+ 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);
}
-# ============================================== Which foils (returns an array)
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 = int(rand($#names+1));
- &Apache::lonxml::debug("From $#names elms, picking $aopt");
- $aopt = splice(@names,$aopt,1);
- &Apache::lonxml::debug("Picked $aopt");
- push (@whichopt,$aopt);
+ 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(rand($#names+1));
}
- return @whichopt;
+ &Apache::lonxml::debug("From $#names elms, picking $aopt");
+ $aopt=splice(@names,$aopt,1);
+ &Apache::lonxml::debug("Picked $aopt");
+ push (@whichopt,$aopt);
+ }
+ return @whichopt;
}
-# ======================================= Display foils (returns scalar string)
sub displayfoils {
- my (@whichopt) = @_;
- my $result ='';
- my $name;
- my $temp = 1;
- foreach $name (@whichopt) {
- $result .= $Apache::response::foilgroup{"$name.text"}."<br />\n";
- my $image = $Apache::response::foilgroup{"$name.image"};
- if ($Apache::lonhomework::history{'resource.'.
- $Apache::inputtags::part.
- '.solved'} =~ /^correct/) {
- $result .= "<img src=\"$image\"/> <br />\n";
- } else {
- $result .= "<input type=\"image\" name=\"HWVAL_".
- $Apache::inputtags::response['-1'].
- ":$temp\" src=\"$image\"/> <br />\n";
- }
- $temp++;
+ my (@whichopt) = @_;
+ my $result ='';
+ my $name;
+ my $temp=1;
+ foreach $name (@whichopt) {
+ $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
+ my $image=$Apache::response::foilgroup{"$name.image"};
+ if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+ $result.="<img src=\"$image\"/> <br />\n";
+ } else {
+ $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
}
- return $result;
+ $temp++;
+ }
+ return $result;
}
-# ================================================================= Grade foils
sub gradefoils {
- my (@whichopt) = @_;
- my $result = '';
- 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(@{ $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");
- }
- &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++;
+ my (@whichopt) = @_;
+ my $result='';
+ 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(@{ $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");
}
+ &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 '';
+ }
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
+ return '';
}
-# ======================================= End foil group (return scalar string)
sub end_foilgroup {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- my $result = '';
- my @whichopt;
- if ($target eq 'web' || $target eq 'grade') {
- 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') {
- $result = &displayfoils(@whichopt);
- }
- if ($target eq 'grade') {
- if ( defined $ENV{'form.submitted'}) {
- &gradefoils(@whichopt);
- }
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ my @whichopt;
+ if ($target eq 'web' || $target eq 'grade') {
+ 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') {
+ $result=&displayfoils(@whichopt);
+ }
+ if ($target eq 'grade') {
+ if ( defined $ENV{'form.submitted'}) {
+ &gradefoils(@whichopt);
}
- return $result;
+ }
+ return $result;
}
-# ========================================================= Start concept group
sub start_conceptgroup {
- $Apache::imageresponse::conceptgroup = 1;
- %Apache::response::conceptgroup = {};
- return '';
+ $Apache::imageresponse::conceptgroup=1;
+ %Apache::response::conceptgroup={};
+ return '';
}
-# =========================================================== End concept group
sub end_conceptgroup {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- $Apache::imageresponse::conceptgroup = 0;
- if ($target eq 'web' || $target eq 'grade') {
- if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick = int(rand($#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");
- }
- }
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::imageresponse::conceptgroup=0;
+ if ($target eq 'web' || $target eq 'grade') {
+ if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+ my @names = @{ $Apache::response::conceptgroup{'names'} };
+ my $pick=int(rand($#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");
+ }
}
- return '';
+ }
+ return '';
}
-$Apache::imageresponse::curname = '';
-# ================================================================== Start foil
+$Apache::imageresponse::curname='';
sub start_foil {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') {
- my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') { $name=$Apache::lonxml::curdepth; }
- if ( $Apache::imageresponse::conceptgroup ) {
- push(@{ $Apache::response::conceptgroup{'names'} }, $name);
- } else {
- push(@{ $Apache::response::foilgroup{'names'} }, $name);
- }
- $Apache::imageresponse::curname=$name;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target eq 'web' || $target eq 'grade') {
+ 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);
}
- return '';
+ $Apache::imageresponse::curname=$name;
+ }
+ return '';
}
-# ==================================================================== End foil
sub end_foil {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ return '';
}
-# ================================================================== Start text
sub start_text {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- if ($target eq 'web') { &Apache::lonxml::startredirection; }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target eq 'web') { &Apache::lonxml::startredirection; }
+ return '';
}
-# ==================================================================== End text
sub end_text {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- if ($target eq 'web') {
- my $name = $Apache::imageresponse::curname;
- if ( $Apache::imageresponse::conceptgroup ) {
- $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)=@_;
+ if ($target eq 'web') {
+ 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;
}
- return '';
+ }
+ return '';
}
-# ================================================================= Start image
sub start_image {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- if ($target eq 'web') { &Apache::lonxml::startredirection; }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; }
+ return '';
}
-# =================================================================== End image
sub end_image {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- if ($target eq 'web') {
- my $name = $Apache::imageresponse::curname;
- my $image = &Apache::lonxml::endredirection;
- &Apache::lonxml::debug("out is $image");
- if ( $Apache::imageresponse::conceptgroup ) {
- $Apache::response::conceptgroup{"$name.image"} = $image;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ my $name = $Apache::imageresponse::curname;
+ 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 '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 {
- $Apache::response::foilgroup{"$name.image"} = $image;
+ $localfile = $src;
+ $localfile =~ s/.*(\/res)/$1/;
+ my $as = &Apache::lonnet::getfile($src);
}
}
- return '';
+ my $file;
+ my $path;
+ if ($src =~ m!(.*)/([^/]*)$!) {
+ $file = $2;
+ $path = $1.'/';
+ }
+ my $newsrc = $src;
+ $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+ $file=~s/(\.gif|\.jpg)$/\.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) {
+ $currentstring .= '\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\fbox{\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";
+ $currentstring .= '\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+ }
+ }
+ return $currentstring;
}
-# ============================================================= Start rectangle
sub start_rectangle {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- if ($target eq 'web' || $target eq 'grade') {
- &Apache::lonxml::startredirection;
- }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
+ return '';
}
-# ============================================================= Grade 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;
- &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) { if ($x <= $x2) { if ($y => $y1) {
- if ($y <= $y2) { return 'APPROX_ANS'; } } } }
- return 'INCORRECT';
+ 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';
}
-# =============================================================== End rectangle
sub end_rectangle {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
if ($target eq 'web' || $target eq 'grade') {
my $name = $Apache::imageresponse::curname;
my $area = &Apache::lonxml::endredirection;
&Apache::lonxml::debug("out is $area for $name");
- if ( $Apache::imageresponse::conceptgroup ) {
- push @{ $Apache::response::conceptgroup{"$name.area"} },
- "rectangle:$area";
+ if ( $Apache::imageresponse::conceptgroup
+ && !&Apache::response::showallfoils()) {
+ push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
} else {
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
}
}
return '';
}
-
1;
-
__END__