--- loncom/homework/imageresponse.pm 2001/08/06 20:33:23 1.12 +++ loncom/homework/imageresponse.pm 2003/01/16 02:55:05 1.23 @@ -1,33 +1,64 @@ # The LearningOnline Network with CAPA -# iimage click response style +# image click response style +# +# $Id: imageresponse.pm,v 1.23 2003/01/16 02:55:05 albertel 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/ +# #FIXME assumes multiple possbile submissions but only one is possible currently package Apache::imageresponse; use strict; +use Image::Magick; -sub BEGIN { +BEGIN { &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); - return ''; + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('imageresponse'); + } + return $result; } sub end_imageresponse { &Apache::response::end_response; pop @Apache::lonxml::namespace; + &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); return ''; } -%Apache::response::foilgroup={}; +%Apache::response::foilgroup=(); sub start_foilgroup { - %Apache::response::foilgroup={}; + %Apache::response::foilgroup=(); $Apache::imageresponse::conceptgroup=0; &Apache::response::setrandomnumber(); return ''; @@ -39,6 +70,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; } return ($count,$max); } @@ -49,7 +81,12 @@ sub whichfoils { my @whichopt =(); while ((($#whichopt+1) < $max) && ($#names > -1)) { &Apache::lonxml::debug("Have $#whichopt max is $max"); - my $aopt=int(rand($#names+1)); + 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"); @@ -78,7 +115,6 @@ sub displayfoils { sub gradefoils { my (@whichopt) = @_; - my $result=''; my $x; my $y; my $result; @@ -138,7 +174,7 @@ sub end_foilgroup { sub start_conceptgroup { $Apache::imageresponse::conceptgroup=1; - %Apache::response::conceptgroup={}; + %Apache::response::conceptgroup=(); return ''; } @@ -148,7 +184,7 @@ sub end_conceptgroup { 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 $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; @@ -170,7 +206,8 @@ sub start_foil { 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 ) { + if ( $Apache::imageresponse::conceptgroup + && !&Apache::response::showallfoils()) { push(@{ $Apache::response::conceptgroup{'names'} }, $name); } else { push(@{ $Apache::response::foilgroup{'names'} }, $name); @@ -195,7 +232,8 @@ sub end_text { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; if ($target eq 'web') { my $name = $Apache::imageresponse::curname; - if ( $Apache::imageresponse::conceptgroup ) { + if ( $Apache::imageresponse::conceptgroup + && !&Apache::response::showallfoils() ) { $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; } else { $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; @@ -206,23 +244,97 @@ sub end_text { sub start_image { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - if ($target eq 'web') { &Apache::lonxml::startredirection; } + if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; } return ''; } sub end_image { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + 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 ) { + if ( $Apache::imageresponse::conceptgroup + && !&Apache::response::showallfoils()) { $Apache::response::conceptgroup{"$name.image"} = $image; } else { $Apache::response::foilgroup{"$name.image"} = $image; } - } - return ''; + } 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)$/\.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.'}}\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/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; + } + } + return $currentstring; } sub start_rectangle { @@ -242,7 +354,9 @@ sub grade_rectangle { &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'; } } } } + if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) { + return 'APPROX_ANS'; + } return 'INCORRECT'; } @@ -252,7 +366,8 @@ sub end_rectangle { my $name = $Apache::imageresponse::curname; my $area = &Apache::lonxml::endredirection; &Apache::lonxml::debug("out is $area for $name"); - if ( $Apache::imageresponse::conceptgroup ) { + if ( $Apache::imageresponse::conceptgroup + && !&Apache::response::showallfoils()) { push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; } else { push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";