--- loncom/homework/imageresponse.pm 2002/01/17 12:23:31 1.16
+++ loncom/homework/imageresponse.pm 2003/02/25 16:09:01 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.16 2002/01/17 12:23:31 harris41 Exp $
+# $Id: imageresponse.pm,v 1.24 2003/02/25 16:09:01 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@
package Apache::imageresponse;
use strict;
+use Image::Magick;
BEGIN {
&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
@@ -55,9 +56,9 @@ sub end_imageresponse {
return '';
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
- %Apache::response::foilgroup={};
+ %Apache::response::foilgroup=();
$Apache::imageresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
return '';
@@ -69,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);
}
@@ -79,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");
@@ -89,17 +96,26 @@ sub whichfoils {
}
sub displayfoils {
- my (@whichopt) = @_;
+ my ($target,@whichopt) = @_;
my $result ='';
my $name;
my $temp=1;
foreach $name (@whichopt) {
- $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
+ $result.=$Apache::response::foilgroup{"$name.text"};
+ if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<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";
+ if ($target eq 'tex') {
+ $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
+ } else {
+ $result.="<img src=\"$image\"/> <br />\n";
+ }
} else {
- $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
+ if ($target eq 'tex') {
+ $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
+ } else {
+ $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
+ }
}
$temp++;
}
@@ -108,7 +124,6 @@ sub displayfoils {
sub gradefoils {
my (@whichopt) = @_;
- my $result='';
my $x;
my $y;
my $result;
@@ -149,14 +164,14 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my @whichopt;
- if ($target eq 'web' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
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 'web' || $target eq 'tex') {
+ $result=&displayfoils($target,@whichopt);
}
if ($target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
@@ -168,17 +183,17 @@ sub end_foilgroup {
sub start_conceptgroup {
$Apache::imageresponse::conceptgroup=1;
- %Apache::response::conceptgroup={};
+ %Apache::response::conceptgroup=();
return '';
}
sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::imageresponse::conceptgroup=0;
- if ($target eq 'web' || $target eq 'grade') {
+ 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(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;
@@ -197,10 +212,11 @@ sub end_conceptgroup {
$Apache::imageresponse::curname='';
sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
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);
@@ -217,15 +233,16 @@ sub end_foil {
sub start_text {
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_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
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;
@@ -236,28 +253,101 @@ 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 $name = $Apache::imageresponse::curname;
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;
}
- }
+ } 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) {
+ $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.'} ';
+ }
+ }
return '';
}
sub start_rectangle {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { &Apache::lonxml::startredirection; }
return '';
}
@@ -272,17 +362,20 @@ 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';
}
sub end_rectangle {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
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";