--- loncom/homework/randomlylabel.pm	2002/11/17 09:43:40	1.3
+++ loncom/homework/randomlylabel.pm	2003/11/11 00:25:24	1.11
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.3 2002/11/17 09:43:40 albertel Exp $
+# $Id: randomlylabel.pm,v 1.11 2003/11/11 00:25:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,7 +39,7 @@ use GD;
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
     my $image;
-    if ($imgsrc !~ /\.(png|jpg|jpeg)$/) {
+    if ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
 	my $conv_image = Image::Magick->new;
 	my $current_figure = $conv_image->Read('filename'=>$imgsrc);
 	$conv_image->Set('magick'=>'png');
@@ -47,9 +47,10 @@ sub get_image {
 	undef $conv_image;
 	$image = GD::Image->new($blobs[0]);
     } else {
+	GD::Image->trueColor(1);
 	$image = GD::Image->new($imgsrc);
     }
-    if ($set_trans) {
+    if ($set_trans && defined($image)) {
 	my $white=$image->colorExact(255,255,255);
 	if ($white != -1) { $image->transparent($white); }
     }
@@ -59,23 +60,46 @@ sub get_image {
 sub handler {
     my $r = shift;
     $r->content_type('image/png');
-    my (undef,$token) = split(/=/,$ENV{'QUERY_STRING'});
-    &Apache::loncommon::get_unprocessed_cgi(
-               &Apache::lonnet::unescape($ENV{'imagerequest.'.$token}));
-    &Apache::lonnet::delenv('imagerequest\.'.$token);
-    my $image=&get_image($ENV{"form.BGIMG"},0);
+    my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
+    my $image=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"}),0);
+    if (! defined($image)) {
+        &Apache::lonnet::logthis('Unable to create image object for -'.$id.'-'.
+				 $ENV{"cgi.$id.BGIMG"});
+        return OK;
+    }
     #binmode(STDOUT);
-    my $black = $image->colorAllocate(0,0,0);
-    for(my $i=0;$i<$ENV{"form.ICOUNT"};$i++) {
-	my $subimage=&get_image($ENV{"form.IMG$i"},1);
-	$image->copy($subimage,$ENV{"form.X$i"},$ENV{"form.Y$i"},
+    my $black;
+    if (!($black=$image->colorResolve(0,0,0))) {
+	$black = $image->colorClosestHWB(0,0,0);
+    }
+    for(my $i=0;$i<$ENV{"cgi.$id.ICOUNT"};$i++) {
+	my $subimage=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.IMG$i"}),1);
+	if (!defined($subimage)) {
+            &Apache::lonnet::logthis('Unable to create image object for '.
+                                 $ENV{"cgi.$id.BGIMG"});
+            next;
+        }
+	$image->copy($subimage,$ENV{"cgi.$id.IX$i"},$ENV{"cgi.$id.IY$i"},
 		     0,0,$subimage->getBounds());
     }
     my $height=GD::Font->Giant->height;
-    for(my $i=0;$i<$ENV{"form.COUNT"};$i++) {
-	$image->string(gdGiantFont,$ENV{"form.X$i"},$ENV{"form.Y$i"}-$height,
-		       $ENV{"form.LB$i"},$black);
+    for(my $i=0;$i<$ENV{"cgi.$id.COUNT"};$i++) {
+	$image->string(gdGiantFont,$ENV{"cgi.$id.X$i"},
+		       $ENV{"cgi.$id.Y$i"}-$height,
+		       &Apache::lonnet::unescape($ENV{"cgi.$id.LB$i"}),$black);
+    }
+    for(my $i=0;$i<$ENV{"cgi.$id.LINECOUNT"};$i++) {
+	my ($x1,$y1,$x2,$y2,$color,$width)=split(':',$ENV{"cgi.$id.LINE$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;
 }