--- loncom/homework/randomlylabel.pm	2003/02/26 18:49:58	1.6
+++ loncom/homework/randomlylabel.pm	2004/03/16 23:08:23	1.19
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.6 2003/02/26 18:49:58 albertel Exp $
+# $Id: randomlylabel.pm,v 1.19 2004/03/16 23:08:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,11 +35,35 @@ use Image::Magick;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use GD;
+use GD::Polyline();
+use LWP::UserAgent();
 
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
     my $image;
-    if ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
+    if ($imgsrc !~ m|^(/home/)|) {
+	if ($imgsrc !~ /^http:/) {
+	    $imgsrc="http://".$ENV{'HTTP_HOST'}.$imgsrc;
+	}
+	my $ua=new LWP::UserAgent;
+	my $request=new HTTP::Request('GET',"$imgsrc");
+	$request->header(Cookie => $ENV{'HTTP_COOKIE'});
+	my $file="/tmp/imagetmp".$$;
+	my $response=$ua->request($request,$file);
+	if ($response->is_success) {
+	    if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
+		my $conv_image = Image::Magick->new;
+		my $current_figure = $conv_image->Read('filename'=>$file);
+		$conv_image->Set('magick'=>'png');
+		my @blobs=$conv_image->ImageToBlob();
+		undef $conv_image;
+		$image = GD::Image->new($blobs[0]);
+	    } else {
+		GD::Image->trueColor(1);
+		$image = GD::Image->new($file);
+	    }
+	}
+    } elsif ($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,42 +71,174 @@ sub get_image {
 	undef $conv_image;
 	$image = GD::Image->new($blobs[0]);
     } else {
-	GD::Image->trueColor(1);
+	$image = 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); }
     }
     return $image;
 }
 
+sub get_color_from_hexstring {
+    my ($image,$color)=@_;
+    if (!$color) { $color='000000'; }
+    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);
+    }
+    return $imcolor;
+}
+
 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);
-    if (! defined($image)) {
-        &Apache::lonnet::logthis('Unable to create image object for '.
-				 $ENV{"form.BGIMG"});
-        return OK;
+    $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"});
+	#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
+	$image=&get_image($bgimg,0);
+	if (! defined($image)) {
+	    &Apache::lonnet::logthis('Unable to create image object for -'.
+				     $id.'-'.$bgimg);
+	    return OK;
+	}
+    } elsif (defined($ENV{"cgi.$id.SIZE"})) {
+	my ($width,$height)=split(':',$ENV{"cgi.$id.SIZE"});
+	$image = new GD::Image($width,$height,1);
+	my ($bgcolor)=split(':',$ENV{"cgi.$id.BGCOLOR"});
+	if ($bgcolor ne 'transparent') {
+	    $bgcolor=&get_color_from_hexstring($image,$bgcolor);
+#	$image->rectangle(0,0,$width,$height,$bgcolor);
+	    $image->fill(0,0,$bgcolor);
+	} else {
+	    $bgcolor=&get_color_from_hexstring($image,'FFFFFF');
+	    $image->fill(0,0,$bgcolor);
+	    $image->transparent($bgcolor);
+	}
+    } else {
+	&Apache::lonnet::logthis('Unable to create image object, no info');
+	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"},
-		     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);
+    my @objtypes=split(':',$ENV{"cgi.$id.OBJTYPE"});
+    foreach(my $i=0;$i<$ENV{"cgi.$id.OBJCOUNT"};$i++) {
+	my $type=shift(@objtypes);
+	if ($type eq 'LINE') {
+	    my ($x1,$y1,$x2,$y2,$color,$thickness)=
+		split(':',$ENV{"cgi.$id.OBJ$i"});
+	    my $imcolor=&get_color_from_hexstring($image,$color);
+	    if (!defined($thickness)) { $thickness=1; }
+	    $image->setThickness($thickness);
+	    $image->setAntiAliased($imcolor);
+	    $image->line($x1,$y1,$x2,$y2,gdAntiAliased);
+	} elsif ($type eq 'RECTANGLE') {
+	    my ($x1,$y1,$x2,$y2,$color,$thickness,$filled)=
+		split(':',$ENV{"cgi.$id.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);
+	    if (!defined($thickness)) { $thickness=1; }
+	    $image->setThickness($thickness);
+#	    $image->setAntiAliased($imcolor);
+	    if ($filled) {
+		$image->filledRectangle($x1,$y1,$x2,$y2,$imcolor);
+	    } else {
+		$image->rectangle($x1,$y1,$x2,$y2,$imcolor);
+	    }
+	} elsif ($type eq 'POLYGON') {
+	    my ($color,$width,$open)=split(':',$ENV{"cgi.$id.OBJ$i"});
+	    my $imcolor=&get_color_from_hexstring($image,$color);
+	    my $polygon = (($open) ? (new GD::Polyline) : (new GD::Polygon));
+	    my $added=0;
+	    foreach my $coord (split('-',$ENV{"cgi.$id.OBJEXTRA$i"})) {
+		my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
+		$polygon->addPt($x,$y);
+		$added++;
+	    }
+	    
+	    $image->setThickness($width);
+	    if ($added) {
+		if ($open) {
+		    $image->polydraw($polygon,$imcolor);
+		} else {
+		    $image->polygon($polygon,$imcolor);
+		}
+	    }
+	} elsif ($type eq 'ARC') {
+	    my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=
+		split(':',$ENV{"cgi.$id.OBJ$i"});
+	    if (!$color) { $color='000000'; }
+	    my $imcolor=&get_color_from_hexstring($image,$color);
+	    if (!defined($thickness)) { $thickness=1; }
+	    $image->setThickness($thickness);
+#	    $image->setAntiAliased($imcolor);
+	    if ($filled) {
+		$image->filledArc($x,$y,$width,$height,$start,$end,
+				  $imcolor);
+	    } else {
+		$image->arc($x,$y,$width,$height,$start,$end,$imcolor);
+	    }
+	} elsif ($type eq 'FILL') {
+	    my ($x,$y,$color)=split(':',$ENV{"cgi.$id.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)=split(':',$ENV{"cgi.$id.OBJ$i"});
+	    $file=&Apache::lonnet::unescape($file);
+	    if (!defined($transparent)) { $transparent=1; }
+	    my $subimage=&get_image($file,$transparent);
+	    if (!defined($subimage)) {
+		&Apache::lonnet::logthis('Unable to create image object for '.
+					 $file);
+		next;
+	    }
+	    $image->copy($subimage,$x,$y,0,0,$subimage->getBounds());
+	} elsif ($type eq 'LABEL') {
+	    my ($x,$y,$text,$font,$color,$direction)=
+		split(':',$ENV{"cgi.$id.OBJ$i"});
+	    $text=&Apache::lonnet::unescape($text);
+	    my $imcolor=&get_color_from_hexstring($image,$color);
+	    my $type='normal';
+	    my ($height,$fontref);
+	    if ($font eq 'tiny') {
+		$height=GD::Font->Tiny->height;
+		$fontref=GD::gdTinyFont;
+	    } elsif ($font eq 'small') {
+		$height=GD::Font->Small->height;
+		$fontref=GD::gdSmallFont;
+	    } elsif ($font eq 'medium') {
+		$height=GD::Font->MediumBold->height;
+		$fontref=GD::gdMediumBoldFont;
+	    } elsif ($font eq 'large') {
+		$height=GD::Font->Large->height;
+		$fontref=GD::gdLargeFont;
+	    } elsif ($font eq 'giant' || !defined($font)) {
+		$height=GD::Font->Giant->height;
+		$fontref=GD::gdGiantFont;
+	    } else {
+		$type='ttf';
+	    }
+	    if ($type eq 'normal' && $direction eq 'vertical') {
+		$image->stringUp($fontref,$x,$y-$height,$text,$imcolor);
+	    } elsif ($type eq 'normal') {
+		$image->string($fontref,$x,$y-$height,$text,$imcolor);
+	    } elsif ($type eq 'ttf') {
+		my ($fontname,$ptsize)=split(/\s+/,$font);
+		$image->stringFT($imcolor,$fontname,$ptsize,90,$x,$y,$text);
+	    }
+	} else {
+	    &Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");
+	}
     }
+    $image->setThickness(1);
     $r->print($image->png);
-    &Apache::lonnet::delenv('imagerequest\.'.$token);
     return OK;
 }