--- loncom/homework/randomlylabel.pm	2003/11/11 00:25:24	1.11
+++ loncom/homework/randomlylabel.pm	2003/11/11 00:39:33	1.12
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.11 2003/11/11 00:25:24 albertel Exp $
+# $Id: randomlylabel.pm,v 1.12 2003/11/11 00:39:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,6 +99,19 @@ 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);
+    }
     $image->setThickness(1);
     $r->print($image->png);
     return OK;