--- loncom/homework/randomlylabel.pm	2004/03/16 23:08:23	1.19
+++ loncom/homework/randomlylabel.pm	2004/09/09 07:24:56	1.21
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.19 2004/03/16 23:08:23 albertel Exp $
+# $Id: randomlylabel.pm,v 1.21 2004/09/09 07:24:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,6 +54,7 @@ sub get_image {
 	    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('type'=>'TrueColor');
 		$conv_image->Set('magick'=>'png');
 		my @blobs=$conv_image->ImageToBlob();
 		undef $conv_image;
@@ -66,6 +67,7 @@ sub get_image {
     } elsif ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
 	my $conv_image = Image::Magick->new;
 	my $current_figure = $conv_image->Read('filename'=>$imgsrc);
+	$conv_image->Set('type'=>'TrueColor');
 	$conv_image->Set('magick'=>'png');
 	my @blobs=$conv_image->ImageToBlob();
 	undef $conv_image;
@@ -135,8 +137,8 @@ sub handler {
 	    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);
+#	    $image->setAntiAliased($imcolor);
+	    $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"});
@@ -152,9 +154,10 @@ sub handler {
 		$image->rectangle($x1,$y1,$x2,$y2,$imcolor);
 	    }
 	} elsif ($type eq 'POLYGON') {
-	    my ($color,$width,$open)=split(':',$ENV{"cgi.$id.OBJ$i"});
+	    my ($color,$width,$open,$filled)=split(':',$ENV{"cgi.$id.OBJ$i"});
 	    my $imcolor=&get_color_from_hexstring($image,$color);
-	    my $polygon = (($open) ? (new GD::Polyline) : (new GD::Polygon));
+	    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"})) {
 		my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
@@ -164,8 +167,10 @@ sub handler {
 	    
 	    $image->setThickness($width);
 	    if ($added) {
-		if ($open) {
+		if ($open && lc($open) ne 'no') {
 		    $image->polydraw($polygon,$imcolor);
+		} elsif ($filled && lc($filled) ne 'no') {
+		    $image->filledPolygon($polygon,$imcolor);
 		} else {
 		    $image->polygon($polygon,$imcolor);
 		}
@@ -190,7 +195,8 @@ sub handler {
 	    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"});
+	    my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
+		$srcH)=split(':',$ENV{"cgi.$id.OBJ$i"});
 	    $file=&Apache::lonnet::unescape($file);
 	    if (!defined($transparent)) { $transparent=1; }
 	    my $subimage=&get_image($file,$transparent);
@@ -199,7 +205,12 @@ sub handler {
 					 $file);
 		next;
 	    }
-	    $image->copy($subimage,$x,$y,0,0,$subimage->getBounds());
+	    if (!defined($srcW) or !$srcW) {$srcW=($subimage->getBounds())[0];}
+	    if (!defined($srcH) or !$srcH) {$srcH=($subimage->getBounds())[1];}
+	    if (!defined($destW) or !$destW) { $destW=$srcW; }
+	    if (!defined($destH) or !$destH) { $destH=$srcH; }
+	    $image->copyResized($subimage,$x,$y,$srcX,$srcY,$destW,$destH,
+				$srcW,$srcH);
 	} elsif ($type eq 'LABEL') {
 	    my ($x,$y,$text,$font,$color,$direction)=
 		split(':',$ENV{"cgi.$id.OBJ$i"});
@@ -219,7 +230,7 @@ sub handler {
 	    } elsif ($font eq 'large') {
 		$height=GD::Font->Large->height;
 		$fontref=GD::gdLargeFont;
-	    } elsif ($font eq 'giant' || !defined($font)) {
+	    } elsif ($font eq 'giant' || !$font) {
 		$height=GD::Font->Giant->height;
 		$fontref=GD::gdGiantFont;
 	    } else {