--- loncom/homework/randomlylabel.pm	2005/02/23 15:51:48	1.23
+++ loncom/homework/randomlylabel.pm	2005/02/23 16:11:42	1.24
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.23 2005/02/23 15:51:48 albertel Exp $
+# $Id: randomlylabel.pm,v 1.24 2005/02/23 16:11:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,8 @@
 
 =head1 Syntax of randomlylabel commands
 
+Required items are, one of BGIMG or SIZE and OBJCOUNT
+
 =over 4
 
 =item BGIMG
@@ -38,6 +40,19 @@
 /home/... file or href (href must contain http://...)
 Expected to be HTTP escaped
 
+=item SIZE
+
+width:height
+
+Creates a blank canvas of size width,height.
+
+=item BGCOLOR
+
+either I<transparent> or a color hexstring
+
+Sets the background color, if SIZE is used to create a new canvas,
+I<trasparent> makes the background transparent.
+
 =item OBJCOUNT
 
 a number
@@ -253,8 +268,13 @@ sub handler {
     $r->send_http_header;
     my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
     my $image;
-    if (defined($ENV{"cgi.$id.BGIMG"})) {
-	my $bgimg=&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"});
+    my $prefix="cgi.$id.";
+    if ($ENV{'QUERY_STRING'}=~/OBJCOUNT\=/) {
+	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+	$prefix='form.';
+    }
+    if (defined($ENV{$prefix."BGIMG"})) {
+	my $bgimg=&Apache::lonnet::unescape($ENV{$prefix."BGIMG"});
 	#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
 	$image=&get_image($bgimg,0);
 	if (! defined($image)) {
@@ -262,10 +282,10 @@ sub handler {
 				     $id.'-'.$bgimg);
 	    return OK;
 	}
-    } elsif (defined($ENV{"cgi.$id.SIZE"})) {
-	my ($width,$height)=split(':',$ENV{"cgi.$id.SIZE"});
+    } elsif (defined($ENV{$prefix."SIZE"})) {
+	my ($width,$height)=split(':',$ENV{$prefix."SIZE"});
 	$image = new GD::Image($width,$height,1);
-	my ($bgcolor)=split(':',$ENV{"cgi.$id.BGCOLOR"});
+	my ($bgcolor)=split(':',$ENV{$prefix."BGCOLOR"});
 	if ($bgcolor ne 'transparent') {
 	    $bgcolor=&get_color_from_hexstring($image,$bgcolor);
 #	$image->rectangle(0,0,$width,$height,$bgcolor);
@@ -280,12 +300,12 @@ sub handler {
 	return OK;
     }
     #binmode(STDOUT);
-    my @objtypes=split(':',$ENV{"cgi.$id.OBJTYPE"});
-    foreach(my $i=0;$i<$ENV{"cgi.$id.OBJCOUNT"};$i++) {
+    my @objtypes=split(':',$ENV{$prefix."OBJTYPE"});
+    foreach(my $i=0;$i<$ENV{$prefix."OBJCOUNT"};$i++) {
 	my $type=shift(@objtypes);
 	if ($type eq 'LINE') {
 	    my ($x1,$y1,$x2,$y2,$color,$thickness)=
-		split(':',$ENV{"cgi.$id.OBJ$i"});
+		split(':',$ENV{$prefix."OBJ$i"});
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    if (!defined($thickness)) { $thickness=1; }
 	    $image->setThickness($thickness);
@@ -293,7 +313,7 @@ sub handler {
 	    $image->line($x1,$y1,$x2,$y2,$imcolor);
 	} elsif ($type eq 'RECTANGLE') {
 	    my ($x1,$y1,$x2,$y2,$color,$thickness,$filled)=
-		split(':',$ENV{"cgi.$id.OBJ$i"});
+		split(':',$ENV{$prefix."OBJ$i"});
 	    if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
 	    if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
 	    my $imcolor=&get_color_from_hexstring($image,$color);
@@ -306,12 +326,12 @@ sub handler {
 		$image->rectangle($x1,$y1,$x2,$y2,$imcolor);
 	    }
 	} elsif ($type eq 'POLYGON') {
-	    my ($color,$width,$open,$filled)=split(':',$ENV{"cgi.$id.OBJ$i"});
+	    my ($color,$width,$open,$filled)=split(':',$ENV{$prefix."OBJ$i"});
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $polygon = (($open && lc ($open ne 'no')) ?
 			   (new GD::Polyline) : (new GD::Polygon));
 	    my $added=0;
-	    foreach my $coord (split('-',$ENV{"cgi.$id.OBJEXTRA$i"})) {
+	    foreach my $coord (split('-',$ENV{$prefix."OBJEXTRA$i"})) {
 		my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
 		$polygon->addPt($x,$y);
 		$added++;
@@ -329,7 +349,7 @@ sub handler {
 	    }
 	} elsif ($type eq 'ARC') {
 	    my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=
-		split(':',$ENV{"cgi.$id.OBJ$i"});
+		split(':',$ENV{$prefix."OBJ$i"});
 	    if (!$color) { $color='000000'; }
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    if (!defined($thickness)) { $thickness=1; }
@@ -342,13 +362,13 @@ sub handler {
 		$image->arc($x,$y,$width,$height,$start,$end,$imcolor);
 	    }
 	} elsif ($type eq 'FILL') {
-	    my ($x,$y,$color)=split(':',$ENV{"cgi.$id.OBJ$i"});
+	    my ($x,$y,$color)=split(':',$ENV{$prefix."OBJ$i"});
 	    if (!$color) { $color='000000'; }
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    $image->fill($x,$y,$imcolor);
 	} elsif ($type eq 'IMAGE') {
 	    my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
-		$srcH)=split(':',$ENV{"cgi.$id.OBJ$i"});
+		$srcH)=split(':',$ENV{$prefix."OBJ$i"});
 	    $file=&Apache::lonnet::unescape($file);
 	    if (!defined($transparent)) { $transparent=1; }
 	    my $subimage=&get_image($file,$transparent);
@@ -365,7 +385,7 @@ sub handler {
 				$srcW,$srcH);
 	} elsif ($type eq 'LABEL') {
 	    my ($x,$y,$text,$font,$color,$direction)=
-		split(':',$ENV{"cgi.$id.OBJ$i"});
+		split(':',$ENV{$prefix."OBJ$i"});
 	    $text=&Apache::lonnet::unescape($text);
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $type='normal';