version 1.43, 2004/01/09 23:22:19
|
version 1.61, 2005/01/31 23:09:55
|
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::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 48 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 64 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 71 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 81 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 93 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 111 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"}=$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 140 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 173 sub displayfoils {
|
Line 189 sub displayfoils {
|
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( $target eq 'web' && $image !~ /^http:/ ) { |
if ( $target eq 'web' && $image !~ /^http:/ ) { |
$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image); |
$image=&clean_up_image($image); |
if (&Apache::lonnet::repcopy($image) ne OK) { |
} |
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} |
|
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 202 sub displayfoils {
|
Line 215 sub displayfoils {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub clean_up_image { |
|
my ($image)=@_; |
|
if ($image =~ /\s*<img\s*/) { |
|
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i); |
|
if ($image !~ /^http:/) { |
|
$image=&Apache::lonnet::hreflocation('',$image); |
|
} |
|
if (!$image) { |
|
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} else { |
|
$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image); |
|
if (&Apache::lonnet::repcopy($image) ne OK) { |
|
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} |
|
return $image; |
|
} |
|
|
sub gradefoils { |
sub gradefoils { |
my (@whichopt) = @_; |
my (@whichopt) = @_; |
my $x; |
my $x; |
Line 238 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 264 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 305 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 348 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 388 sub end_image {
|
Line 436 sub end_image {
|
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; |
Line 396 sub end_image {
|
Line 445 sub end_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 463 sub end_image {
|
Line 513 sub end_image {
|
} elsif ($width ne '') { |
} elsif ($width ne '') { |
$width_param = $width*$scaling; |
$width_param = $width*$scaling; |
} |
} |
|
$width_param=&Apache::randomlabel::adjust_textwidth($width_param); |
#where can we find the picture? |
#where can we find the picture? |
if (-e $newsrc) { |
if (-e $newsrc) { |
if ($path) { |
if ($path) { |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
} |
} |
} else { |
} else { |
my $temp_file; |
#care about eps dynamical generation |
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; |
$Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param); |
$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 $result; |
return $result; |
Line 489 sub start_rectangle {
|
Line 537 sub start_rectangle {
|
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
$result=&Apache::edit::tag_start($target,$token,'Rectangle'). |
$result=&Apache::edit::tag_start($target,$token,'Rectangle'). |
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). |
&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(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
|
&Apache::edit::deletecoorddata(); |
$result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser); |
} |
} |
return $result; |
return $result; |
Line 517 sub end_rectangle {
|
Line 566 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 540 sub start_polygon {
|
Line 591 sub start_polygon {
|
my $coords=&Apache::lonxml::get_all_text('/polygon',$parser); |
my $coords=&Apache::lonxml::get_all_text('/polygon',$parser); |
$result=&Apache::edit::tag_start($target,$token,'Polygon'). |
$result=&Apache::edit::tag_start($target,$token,'Polygon'). |
&Apache::edit::editline($token->[1],$coords,'Coordinate list',40). |
&Apache::edit::editline($token->[1],$coords,'Coordinate list',40). |
&Apache::edit::entercoordpolygon(undef,'textnode'). |
&Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon'). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
$result=$token->[4].&Apache::edit::modifiedfield('/polygon',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/polygon',$parser); |
Line 596 sub end_polygon {
|
Line 647 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"; |