version 1.28, 2003/05/06 15:48:55
|
version 1.32, 2003/07/31 20:38:12
|
Line 51 sub start_imageresponse {
|
Line 51 sub start_imageresponse {
|
} |
} |
|
|
sub end_imageresponse { |
sub end_imageresponse { |
&Apache::response::end_response; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
pop @Apache::lonxml::namespace; |
&Apache::response::end_response; |
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
pop @Apache::lonxml::namespace; |
return ''; |
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
|
my $result; |
|
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
|
return $result; |
} |
} |
|
|
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
Line 136 sub gradefoils {
|
Line 139 sub gradefoils {
|
$x=$ENV{"form.HWVAL_$id:$temp.x"}; |
$x=$ENV{"form.HWVAL_$id:$temp.x"}; |
$y=$ENV{"form.HWVAL_$id:$temp.y"}; |
$y=$ENV{"form.HWVAL_$id:$temp.y"}; |
&Apache::lonxml::debug("Got a x of $x and a y of $y for $name"); |
&Apache::lonxml::debug("Got a x of $x and a y of $y for $name"); |
if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) { |
if (defined($x) && defined($y) && |
|
defined(@{ $Apache::response::foilgroup{"$name.area"} })) { |
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
my $grade="INCORRECT"; |
my $grade="INCORRECT"; |
foreach my $area (@areas) { |
foreach my $area (@areas) { |
Line 214 sub end_conceptgroup {
|
Line 218 sub end_conceptgroup {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub insert_foil { |
|
return ' |
|
<foil> |
|
<image></image> |
|
<text></text> |
|
<rectangle></rectangle> |
|
</foil> |
|
'; |
|
} |
|
|
$Apache::imageresponse::curname=''; |
$Apache::imageresponse::curname=''; |
sub start_foil { |
sub start_foil { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
Line 304 sub end_image {
|
Line 318 sub end_image {
|
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("out is $image"); |
&Apache::lonxml::debug("original image is $image"); |
|
my $id=$Apache::inputtags::response['-1']; |
|
my $temp=1; |
|
my $x=$ENV{"form.HWVAL_$id:$temp.x"}; |
|
my $y=$ENV{"form.HWVAL_$id:$temp.y"}; |
|
if (defined ($x) && defined ($y)) { |
|
&Apache::lonxml::debug("x and y defined as $x,$y"); |
|
my $magickImage = Image::Magick->new; |
|
my $currentImage = $magickImage->Read('/home/httpd/html'.$image); |
|
my $length = 6; |
|
$currentImage = $magickImage->Draw(primitive=>'line', |
|
stroke=>'red', |
|
points=>($x-$length).','.($y-$length).' '. |
|
($x+$length).','.($y+$length)); |
|
$currentImage = $magickImage->Draw(primitive=>'line', |
|
stroke=>'red', |
|
points=>($x-$length).','.($y+$length).' '. |
|
($x+$length).','.($y-$length)); |
|
binmode STDOUT; |
|
my ($graphExt) = ($image =~ /.*\.(.*)$/); |
|
&Apache::lonxml::debug("graph mime type $graphExt"); |
|
my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_".(time).'.'.$graphExt; #needs to be more random |
|
my $newImageName = '/home/httpd'.$webImageName; |
|
|
|
$currentImage = $magickImage->Write($graphExt.':'.$newImageName); |
|
undef $magickImage; |
|
$image = $webImageName; |
|
} |
|
&Apache::lonxml::debug("out 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; |