[LON-CAPA-cvs] cvs: loncom /homework imageresponse.pm randomlylabel.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 10 Nov 2003 23:29:27 -0000
albertel Mon Nov 10 18:29:27 2003 EDT
Modified files:
/loncom/homework imageresponse.pm randomlylabel.pm
Log:
- generate the image on the fly using randomlylabel.pm
- put a white X 3 pixels wide under the red X
- move the code to the display section
- generate the X even after the question is correct
Index: loncom/homework/imageresponse.pm
diff -u loncom/homework/imageresponse.pm:1.39 loncom/homework/imageresponse.pm:1.40
--- loncom/homework/imageresponse.pm:1.39 Thu Oct 30 15:52:54 2003
+++ loncom/homework/imageresponse.pm Mon Nov 10 18:29:27 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.39 2003/10/30 20:52:54 albertel Exp $
+# $Id: imageresponse.pm,v 1.40 2003/11/10 23:29:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,10 +29,10 @@
#currently
package Apache::imageresponse;
-use Apache::randomlylabel;
use strict;
use Image::Magick;
-use GD;
+use Apache::randomlylabel;
+use Apache::Constants qw(:common :http);
BEGIN {
&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
@@ -103,6 +103,44 @@
return @whichopt;
}
+sub prep_image {
+ my ($image)=@_;
+ my $part=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response['-1'];
+ my $token=$Apache::lonxml::curdepth.'_'.$$;
+ my $args="BGIMG=".$image;
+ &Apache::lonxml::debug("args is $args image is $image");
+ my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$id.submission"});
+ #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
+ if (defined($x) && defined($y)) {
+ $args.="&LINECOUNT=4";
+ my $length = 6;
+ my $width = 1;
+ my $extrawidth = 2;
+ $args.="&LINEW0=".($width+$extrawidth);
+ $args.="&LINEC0=FFFFFF";
+ $args.="&LINEX10=".($x-$length)."&LINEY10=".($y-$length);
+ $args.="&LINEX20=".($x+$length)."&LINEY20=".($y+$length);
+ $args.="&LINEW1=".($width+$extrawidth);
+ $args.="&LINEC1=FFFFFF";
+ $args.="&LINEX11=".($x-$length)."&LINEY11=".($y+$length);
+ $args.="&LINEX21=".($x+$length)."&LINEY21=".($y-$length);
+ $args.="&LINEW2=$width";
+ $args.="&LINEC2=FF0000";
+ $args.="&LINEX12=".($x-$length)."&LINEY12=".($y-$length);
+ $args.="&LINEX22=".($x+$length)."&LINEY22=".($y+$length);
+ $args.="&LINEW3=$width";
+ $args.="&LINEC3=FF0000";
+ $args.="&LINEX13=".($x-$length)."&LINEY13=".($y+$length);
+ $args.="&LINEX23=".($x+$length)."&LINEY23=".($y-$length);
+ }
+ &Apache::lonxml::debug("args is $args image is $image");
+ &Apache::lonnet::appenv(("imagerequest.$token"=>
+ &Apache::lonnet::escape($args)));
+ return $token;
+}
+
sub displayfoils {
my ($target,@whichopt) = @_;
my $result ='';
@@ -114,17 +152,29 @@
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
+ if ( $target eq 'web' && $image !~ /^http:/ ) {
+ $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';
+ }
+ }
+ &Apache::lonxml::debug("image is $image");
if ( &Apache::response::show_answer() ) {
if ($target eq 'tex') {
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
} else {
- $result.="<img src=\"$image\"/> <br />\n";
+ my $token=&prep_image($image);
+ $result.="<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n";
}
} else {
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";
+ my $id=$Apache::inputtags::response['-1'];
+ my $token=&prep_image($image);
+ my $temp=1;
+ $result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ".
+ "src=\"/adm/randomlabel.png?token=$token\" /><br />\n";
}
}
$temp++;
@@ -315,36 +365,6 @@
if ($target eq 'web') {
my $image = &Apache::lonxml::endredirection;
&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;
Index: loncom/homework/randomlylabel.pm
diff -u loncom/homework/randomlylabel.pm:1.9 loncom/homework/randomlylabel.pm:1.10
--- loncom/homework/randomlylabel.pm:1.9 Tue May 13 15:08:31 2003
+++ loncom/homework/randomlylabel.pm Mon Nov 10 18:29:27 2003
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# randomlabel.png: composite together text and images into 1 image
#
-# $Id: randomlylabel.pm,v 1.9 2003/05/13 19:08:31 albertel Exp $
+# $Id: randomlylabel.pm,v 1.10 2003/11/10 23:29:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -89,6 +89,23 @@
$image->string(gdGiantFont,$ENV{"form.X$i"},$ENV{"form.Y$i"}-$height,
$ENV{"form.LB$i"},$black);
}
+ for(my $i=0;$i<$ENV{"form.LINECOUNT"};$i++) {
+ my $x1=$ENV{"form.LINEX1$i"};
+ my $y1=$ENV{"form.LINEY1$i"};
+ my $x2=$ENV{"form.LINEX2$i"};
+ my $y2=$ENV{"form.LINEY2$i"};
+ my $width=$ENV{"form.LINEW$i"};
+ my $color=$ENV{"form.LINEC$i"};
+ my (undef,$red,undef,$green,undef,$blue)=split(/(..)/,$color);
+ $red=hex($red);$green=hex($green);$blue=hex($blue);
+ my $imcolor;
+ if (!($imcolor = $image->colorResolve($red,$green,$blue))) {
+ $imcolor = $image->colorClosestHWB($red,$green,$blue);
+ }
+ $image->setThickness($width);
+ $image->line($x1,$y1,$x2,$y2,$imcolor);
+ }
+ $image->setThickness(1);
$r->print($image->png);
return OK;
}