--- loncom/homework/randomlylabel.pm 2004/02/23 23:24:50 1.17 +++ 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.17 2004/02/23 23:24:50 albertel Exp $ +# $Id: randomlylabel.pm,v 1.21 2004/09/09 07:24:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,26 +41,20 @@ use LWP::UserAgent(); 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; 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; @@ -73,7 +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); - &Apache::lonnet::logthis("Read said $current_figure"); + $conv_image->Set('type'=>'TrueColor'); $conv_image->Set('magick'=>'png'); my @blobs=$conv_image->ImageToBlob(); undef $conv_image; @@ -81,11 +75,6 @@ sub get_image { } 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 +103,7 @@ sub handler { 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,15 +131,14 @@ sub handler { 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"}); 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"}); @@ -166,18 +154,26 @@ 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]+)\)/); $polygon->addPt($x,$y); + $added++; } + $image->setThickness($width); - if ($open) { - $image->polydraw($polygon,$imcolor); - } else { - $image->polygon($polygon,$imcolor); + if ($added) { + 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); + } } } elsif ($type eq 'ARC') { my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)= @@ -199,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); @@ -208,13 +205,47 @@ 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)=split(':',$ENV{"cgi.$id.OBJ$i"}); + 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 $height=GD::Font->Giant->height; - $image->string(GD::gdGiantFont,$x,$y-$height,$text,$imcolor); + 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' || !$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);