--- loncom/homework/randomlylabel.pm	2003/11/10 23:29:27	1.10
+++ loncom/homework/randomlylabel.pm	2004/01/12 19:53:54	1.14
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.10 2003/11/10 23:29:27 albertel Exp $
+# $Id: randomlylabel.pm,v 1.14 2004/01/12 19:53:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,7 +34,8 @@ use strict;
 use Image::Magick;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
-use GD;
+use GD();
+use GD::Polyline();
 
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
@@ -60,13 +61,11 @@ 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}));
-    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 '.
-				 $ENV{"form.BGIMG"});
+        &Apache::lonnet::logthis('Unable to create image object for -'.$id.'-'.
+				 $ENV{"cgi.$id.BGIMG"});
         return OK;
     }
     #binmode(STDOUT);
@@ -74,28 +73,24 @@ sub handler {
     if (!($black=$image->colorResolve(0,0,0))) {
 	$black = $image->colorClosestHWB(0,0,0);
     }
-    for(my $i=0;$i<$ENV{"form.ICOUNT"};$i++) {
-	my $subimage=&get_image($ENV{"form.IMG$i"},1);
+    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{"form.BGIMG"});
+                                 $ENV{"cgi.$id.BGIMG"});
             next;
         }
-	$image->copy($subimage,$ENV{"form.IX$i"},$ENV{"form.IY$i"},
+	$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{"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"};
+    for(my $i=0;$i<$ENV{"cgi.$id.COUNT"};$i++) {
+	$image->string(GD::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;
@@ -105,6 +100,44 @@ sub handler {
 	$image->setThickness($width);
        	$image->line($x1,$y1,$x2,$y2,$imcolor);
     }
+    for(my $i=0;$i<$ENV{"cgi.$id.BOXCOUNT"};$i++) {
+	my ($x1,$y1,$x2,$y2,$color,$width)=split(':',$ENV{"cgi.$id.BOX$i"});
+	if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
+	if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
+	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->rectangle($x1,$y1,$x2,$y2,$imcolor);
+    }
+    for(my $i=0;$i<$ENV{"cgi.$id.POLYCOUNT"};$i++) {
+	my ($color,$width,$open)=split(':',$ENV{"cgi.$id.POLYOPT$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);
+	}
+	my $polygon;
+	if ($open) {
+	    $polygon = new GD::Polyline;
+	} else {
+	    $polygon = new GD::Polygon;
+	}
+	foreach my $coord (split('-',$ENV{"cgi.$id.POLY$i"})) {
+	    my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
+	    $polygon->addPt($x,$y);
+	}
+	$image->setThickness($width);
+	if ($open) {
+	    $image->polydraw($polygon,$imcolor);
+	} else {
+	    $image->polygon($polygon,$imcolor);
+	}
+    }
     $image->setThickness(1);
     $r->print($image->png);
     return OK;