version 1.47, 2004/02/11 21:59:34
|
version 1.62, 2005/02/10 23:00:10
|
Line 31
|
Line 31
|
|
|
package Apache::imageresponse; |
package Apache::imageresponse; |
use strict; |
use strict; |
use Image::Magick; |
use Image::Magick(); |
use Apache::randomlylabel; |
use Apache::randomlylabel(); |
use Apache::londefdef; |
use Apache::londefdef(); |
use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
|
use Apache::lonlocal; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::imageresponse',('imageresponse')); |
&Apache::lonxml::register('Apache::imageresponse',('imageresponse')); |
Line 49 sub start_imageresponse {
|
Line 50 sub start_imageresponse {
|
'polygon','conceptgroup')); |
'polygon','conceptgroup')); |
push (@Apache::lonxml::namespace,'imageresponse'); |
push (@Apache::lonxml::namespace,'imageresponse'); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
undef(%Apache::response::foilnames); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('imageresponse'); |
$result=&Apache::response::meta_package_write('imageresponse'); |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
Line 65 sub end_imageresponse {
|
Line 67 sub end_imageresponse {
|
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
my $result; |
my $result; |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
|
undef(%Apache::response::foilnames); |
return $result; |
return $result; |
} |
} |
|
|
Line 72 sub end_imageresponse {
|
Line 75 sub end_imageresponse {
|
sub start_foilgroup { |
sub start_foilgroup { |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::imageresponse::conceptgroup=0; |
$Apache::imageresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
return ''; |
return ''; |
} |
} |
|
|
Line 82 sub getfoilcounts {
|
Line 85 sub getfoilcounts {
|
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
if (&Apache::response::showallfoils()) { $max=$count; } |
#if (&Apache::response::showallfoils()) { $max=$count; } |
return ($count,$max); |
return ($count,$max); |
} |
} |
|
|
Line 94 sub whichfoils {
|
Line 97 sub whichfoils {
|
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
my $aopt; |
my $aopt; |
if (&Apache::response::showallfoils()) { |
# if (&Apache::response::showallfoils()) { |
$aopt=0; |
# $aopt=0; |
} else { |
# } else { |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
} |
# } |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
$aopt=splice(@names,$aopt,1); |
$aopt=splice(@names,$aopt,1); |
&Apache::lonxml::debug("Picked $aopt"); |
&Apache::lonxml::debug("Picked $aopt"); |
Line 112 sub prep_image {
|
Line 115 sub prep_image {
|
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $respid=$Apache::inputtags::response['-1']; |
my $respid=$Apache::inputtags::response['-1']; |
my $id=&Apache::loncommon::get_cgi_id(); |
my $id=&Apache::loncommon::get_cgi_id(); |
my %x; |
my (%x,$i); |
$x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image); |
$x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image); |
my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"}); |
my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"}); |
#draws 2 xs on the image at the clicked location |
#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 |
#one in white and then one in red on top of the one in white |
if (defined($x) && defined($y)) { |
if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/ && !&Apache::response::show_answer()) { |
$x{"cgi.$id.LINECOUNT"}=4; |
|
my $length = 6; |
my $length = 6; |
my $width = 1; |
my $width = 1; |
my $extrawidth = 2; |
my $extrawidth = 2; |
$x{"cgi.$id.LINE0"}= |
my $xmin=($x-$length); |
join(':',(($x-$length),($y-$length),($x+$length),($y+$length), |
my $xmax=($x+$length); |
"FFFFFF",($width+$extrawidth))); |
my $ymin=($y-$length); |
$x{"cgi.$id.LINE1"}= |
my $ymax=($y+$length); |
join(':',(($x-$length),($y+$length),($x+$length),($y-$length), |
|
"FFFFFF",($width+$extrawidth))); |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$x{"cgi.$id.LINE2"}= |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
join(':',(($x-$length),($y-$length),($x+$length),($y+$length), |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax), |
"FF0000",($width))); |
"FFFFFF",($width+$extrawidth))); |
$x{"cgi.$id.LINE3"}= |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
join(':',(($x-$length),($y+$length),($x+$length),($y-$length), |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
"FF0000",($width))); |
$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') { |
if ($mode eq 'answer') { |
my $width = 1; |
my $width = 1; |
Line 141 sub prep_image {
|
Line 152 sub prep_image {
|
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
foreach my $area (@areas) { |
foreach my $area (@areas) { |
if ($area=~/^rectangle:/) { |
if ($area=~/^rectangle:/) { |
|
$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; |
|
$i=$x{"cgi.$id.OBJCOUNT"}++; |
my ($x1,$y1,$x2,$y2)= |
my ($x1,$y1,$x2,$y2)= |
($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/); |
($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/); |
my $i=$x{"cgi.$id.BOXCOUNT"}++; |
$x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF", |
$x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF", |
|
($width+$extrawidth))); |
($width+$extrawidth))); |
$i=$x{"cgi.$id.BOXCOUNT"}++; |
$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:'; |
$x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width)); |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
|
$x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width)); |
} elsif ($area=~/^polygon:(.*)/) { |
} elsif ($area=~/^polygon:(.*)/) { |
my $i=$x{"cgi.$id.POLYCOUNT"}++; |
$x{"cgi.$id.OBJTYPE"}.='POLYGON:'; |
$x{"cgi.$id.POLYOPT$i"}=join(':',("FFFFFF",($width+$extrawidth))); |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$x{"cgi.$id.POLY$i"}=$1; |
$x{"cgi.$id.OBJ$i"}=join(':',("FFFFFF",($width+$extrawidth))); |
$i=$x{"cgi.$id.POLYCOUNT"}++; |
$x{"cgi.$id.OBJEXTRA$i"}=$1; |
$x{"cgi.$id.POLYOPT$i"}=join(':',("00FF00",$width)); |
$x{"cgi.$id.OBJTYPE"}.='POLYGON:'; |
$x{"cgi.$id.POLY$i"}=$1; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
|
$x{"cgi.$id.OBJ$i"}=join(':',("00FF00",$width)); |
|
$x{"cgi.$id.OBJEXTRA$i"}=$1; |
} |
} |
} |
} |
} |
} |
Line 203 sub displayfoils {
|
Line 218 sub displayfoils {
|
sub clean_up_image { |
sub clean_up_image { |
my ($image)=@_; |
my ($image)=@_; |
if ($image =~ /\s*<img\s*/) { |
if ($image =~ /\s*<img\s*/) { |
($image) = ($image =~ /src\s*=\s*\"([^\"]+)\"/i); |
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i); |
if ($image !~ /^http:/) { |
if ($image !~ /^http:/) { |
$image=&Apache::lonnet::hreflocation('',$image); |
$image=&Apache::lonnet::hreflocation('',$image); |
} |
} |
Line 255 sub gradefoils {
|
Line 270 sub gradefoils {
|
$temp++; |
$temp++; |
} |
} |
} |
} |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y"; |
my $responsestr="$x:$y"; |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result; |
my $part=$Apache::inputtags::part; |
|
my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); |
|
if ($result |
|
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; } |
|
&Apache::response::handle_previous(\%previous,$result); |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr; |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result; |
return ''; |
return ''; |
} |
} |
|
|
Line 281 sub end_foilgroup {
|
Line 302 sub end_foilgroup {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
Line 322 sub start_foil {
|
Line 344 sub start_foil {
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
$target eq 'analyze') { |
$target eq 'analyze') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if ($name eq '') { $name=$Apache::lonxml::curdepth; } |
if (!$name) { |
|
&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); |
|
$name=$Apache::lonxml::curdepth; |
|
} |
|
if (defined($Apache::response::foilnames{$name})) { |
|
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
|
} |
|
$Apache::response::foilnames{$name}++; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
} else { |
} else { |
push(@{ $Apache::response::foilgroup{'names'} }, $name); |
push(@{ $Apache::response::foilgroup{'names'} }, $name); |
Line 365 sub end_text {
|
Line 395 sub end_text {
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
Line 402 sub end_image {
|
Line 433 sub end_image {
|
my $result; |
my $result; |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection(); |
&Apache::lonxml::debug("original image is $image"); |
&Apache::lonxml::debug("original image is $image"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
} |
} |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection(); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
Line 421 sub end_image {
|
Line 454 sub end_image {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $src = &Apache::lonxml::endredirection; |
my $src = &Apache::lonxml::endredirection(); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
my $width_param = ''; |
my ($height_param,$width_param)= |
my $height_param = ''; |
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval); |
my $scaling = .3; |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
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|\.jpeg)$/\.eps/i; |
|
$file=~s/(\.gif|\.jpg|\.jpeg)$/\.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 { |
|
#care about eps dynamical generation |
|
$Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param); |
|
} |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 532 sub end_rectangle {
|
Line 502 sub end_rectangle {
|
$target eq 'analyze') { |
$target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
my $area = &Apache::lonxml::endredirection; |
my $area = &Apache::lonxml::endredirection; |
|
$area=~s/\s//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
Line 611 sub end_polygon {
|
Line 583 sub end_polygon {
|
$target eq 'analyze') { |
$target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
my $area = &Apache::lonxml::endredirection; |
my $area = &Apache::lonxml::endredirection; |
|
$area=~s/\s*//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area"; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area"; |
push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area"; |