--- loncom/homework/imageresponse.pm 2003/05/05 22:36:54 1.26
+++ loncom/homework/imageresponse.pm 2003/08/01 15:50:43 1.34
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.26 2003/05/05 22:36:54 albertel Exp $
+# $Id: imageresponse.pm,v 1.34 2003/08/01 15:50:43 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,13 +25,16 @@
#
# http://www.lon-capa.org/
#
-
+# July,August 2003 H. K. Ng
+#
#FIXME LATER assumes multiple possible submissions but only one is possible
#currently
package Apache::imageresponse;
+use Apache::randomlylabel;
use strict;
use Image::Magick;
+use GD;
BEGIN {
&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
@@ -51,10 +54,13 @@ sub start_imageresponse {
}
sub end_imageresponse {
- &Apache::response::end_response;
- pop @Apache::lonxml::namespace;
- &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ &Apache::response::end_response;
+ pop @Apache::lonxml::namespace;
+ &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=();
@@ -103,8 +109,10 @@ sub displayfoils {
my $temp=1;
foreach $name (@whichopt) {
$result.=$Apache::response::foilgroup{"$name.text"};
+ &Apache::lonxml::debug("Text is $result");
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="
\n";}
my $image=$Apache::response::foilgroup{"$name.image"};
+ &Apache::lonxml::debug("image is $image");
if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
if ($target eq 'tex') {
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
@@ -134,7 +142,8 @@ sub gradefoils {
$x=$ENV{"form.HWVAL_$id:$temp.x"};
$y=$ENV{"form.HWVAL_$id:$temp.y"};
&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 $grade="INCORRECT";
foreach my $area (@areas) {
@@ -170,12 +179,11 @@ sub end_foilgroup {
if ($count>$max) { $count=$max }
&Apache::lonxml::debug("Count is $count from $max");
@whichopt = &whichfoils($max);
- } elsif ($target eq 'web' || $target eq 'tex') {
- $result=&displayfoils($target,@whichopt);
- } elsif ($target eq 'grade') {
- if ( defined $ENV{'form.submitted'}) {
- &gradefoils(@whichopt);
- }
+ if ($target eq 'web' || $target eq 'tex') {
+ $result=&displayfoils($target,@whichopt);
+ } elsif ($target eq 'grade') {
+ if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
+ }
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -213,6 +221,16 @@ sub end_conceptgroup {
return $result;
}
+sub insert_foil {
+ return '
+
+
+
+
+
+';
+}
+
$Apache::imageresponse::curname='';
sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -281,6 +299,9 @@ sub start_image {
&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
+ $Apache::edit::bgimgsrc=$bgimg;
+ $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
+
$result=&Apache::edit::tag_start($target,$token,'Clickable Image').
&Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);
$result.=&Apache::edit::browse(undef,'textnode').' ';
@@ -300,7 +321,37 @@ sub end_image {
my $name = $Apache::imageresponse::curname;
if ($target eq 'web') {
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 $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1);
+ if (! defined($currentImage)) {
+ &Apache::lonnet::logthis('Unable to create image object for '.$image);
+ return '';
+ }
+ my $red;
+ if (!($red = $currentImage->colorResolve(255,0,0))) {
+ $red = $currentImage->colorClosestHWB(255,0,0);
+ }
+ my $length = 6;
+ $currentImage->line($x-$length,$y-$length,$x+$length,$y+$length,$red);
+ $currentImage->line($x-$length,$y+$length,$x+$length,$y-$length,$red);
+
+ my ($nameWOext) = ($image =~ /^.*\/(.*)\..*$/);
+ &Apache::lonxml::debug("graph name $nameWOext");
+ my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_".
+ $nameWOext.'.png'; #needs to be more random or specific
+ my $newImageName = '/home/httpd'.$webImageName;
+
+ my $imgfh = Apache::File->new('>'.$newImageName);
+ print $imgfh $currentImage->png;
+ $image = $webImageName;
+ }
+ &Apache::lonxml::debug("out image is $image");
if ( $Apache::imageresponse::conceptgroup
&& !&Apache::response::showallfoils()) {
$Apache::response::conceptgroup{"$name.image"} = $image;
@@ -356,8 +407,8 @@ sub end_image {
$path = $1.'/';
}
my $newsrc = $src;
- $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
- $file=~s/(\.gif|\.jpg)$/\.eps/i;
+ $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);
@@ -394,6 +445,7 @@ sub start_rectangle {
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
$result=&Apache::edit::tag_start($target,$token,'Rectangle').
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
+ &Apache::edit::entercoordpair(undef,'textnode').
&Apache::edit::end_row();
} elsif ($target eq "modified") {
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);