[LON-CAPA-cvs] cvs: loncom /homework randomlylabel.pm

[albertel]

albertel		Mon Feb 23 18:54:14 2004 EDT

  Modified files:              
    /loncom/homework	randomlylabel.pm 
  Log:
  - some debugging cleanup
  - no longer blowup on polygon's with no points
  
  
Index: loncom/homework/randomlylabel.pm
diff -u loncom/homework/randomlylabel.pm:1.17 loncom/homework/randomlylabel.pm:1.18
--- loncom/homework/randomlylabel.pm:1.17	Mon Feb 23 18:24:50 2004
+++ loncom/homework/randomlylabel.pm	Mon Feb 23 18:54:14 2004
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.17 2004/02/23 23:24:50 albertel Exp $
+# $Id: randomlylabel.pm,v 1.18 2004/02/23 23:54:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,22 +41,15 @@
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
     my $image;
-    &Apache::lonnet::logthis("imagesrc1 is $imgsrc");
     if ($imgsrc !~ m|^(/home/)|) {
-	&Apache::lonnet::logthis("imagesrc2 is $imgsrc");
 	if ($imgsrc !~ /^http:/) {
 	    $imgsrc="http://".$ENV{'HTTP_HOST'}.$imgsrc;
 	}
-	&Apache::lonnet::logthis("imagesrc3 is $imgsrc");
-	&Apache::lonnet::logthis("LWP fetching image $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);
-	&Apache::lonnet::logthis("content is ".$response->content_type);
-	&Apache::lonnet::logthis($response->is_success);
-	&Apache::lonnet::logthis($response->status_line);
 	if ($response->is_success) {
 	    if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
 		my $conv_image = Image::Magick->new;
@@ -73,7 +66,6 @@
     } elsif ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
 	my $conv_image = Image::Magick->new;
 	my $current_figure = $conv_image->Read('filename'=>$imgsrc);
-	&Apache::lonnet::logthis("Read said $current_figure");
 	$conv_image->Set('magick'=>'png');
 	my @blobs=$conv_image->ImageToBlob();
 	undef $conv_image;
@@ -81,11 +73,6 @@
     } else {
 	$image = GD::Image->trueColor(1);
 	$image = GD::Image->new($imgsrc);
-	if (!defined($image)) { 
-	    &Apache::lonnet::logthis("Read said bluh");
-	} else {
-	    &Apache::lonnet::logthis("looks good");
-	}
     }
     if ($set_trans && defined($image)) {
 	my $white=$image->colorExact(255,255,255);
@@ -114,7 +101,7 @@
     my $image;
     if (defined($ENV{"cgi.$id.BGIMG"})) {
 	my $bgimg=&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"});
-	&Apache::lonnet::logthis("BGIMG is ".$bgimg);
+	#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
 	$image=&get_image($bgimg,0);
 	if (! defined($image)) {
 	    &Apache::lonnet::logthis('Unable to create image object for -'.
@@ -142,7 +129,6 @@
     my @objtypes=split(':',$ENV{"cgi.$id.OBJTYPE"});
     foreach(my $i=0;$i<$ENV{"cgi.$id.OBJCOUNT"};$i++) {
 	my $type=shift(@objtypes);
-	&Apache::lonnet::logthis("type is $type");
 	if ($type eq 'LINE') {
 	    my ($x1,$y1,$x2,$y2,$color,$thickness)=
 		split(':',$ENV{"cgi.$id.OBJ$i"});
@@ -169,15 +155,20 @@
 	    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 ($open) {
-		$image->polydraw($polygon,$imcolor);
-	    } else {
-		$image->polygon($polygon,$imcolor);
+	    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)=
@@ -215,6 +206,8 @@
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $height=GD::Font->Giant->height;
 	    $image->string(GD::gdGiantFont,$x,$y-$height,$text,$imcolor);
+	} else {
+	    &Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");
 	}
     }
     $image->setThickness(1);