--- loncom/homework/randomlylabel.pm	2004/02/11 21:52:56	1.12.2.1
+++ loncom/homework/randomlylabel.pm	2004/01/09 23:22:19	1.13
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.12.2.1 2004/02/11 21:52:56 albertel Exp $
+# $Id: randomlylabel.pm,v 1.13 2004/01/09 23:22:19 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,7 +61,6 @@ sub get_image {
 sub handler {
     my $r = shift;
     $r->content_type('image/png');
-    $r->send_http_header;
     my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
     my $image=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"}),0);
     if (! defined($image)) {
@@ -85,7 +85,7 @@ sub handler {
     }
     my $height=GD::Font->Giant->height;
     for(my $i=0;$i<$ENV{"cgi.$id.COUNT"};$i++) {
-	$image->string(gdGiantFont,$ENV{"cgi.$id.X$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);
     }
@@ -113,6 +113,30 @@ sub handler {
 	$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);
+	}
+	if ($open) {
+	    $image->polydraw($polygon,$imcolor);
+	} else {
+	    $image->polygon($polygon,$imcolor);
+	}
+    }
     $image->setThickness(1);
     $r->print($image->png);
     return OK;