--- loncom/homework/randomlylabel.pm 2024/04/05 04:05:08 1.36 +++ loncom/homework/randomlylabel.pm 2024/07/04 17:55:04 1.37.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # randomlabel.png: composite together text and images into 1 image # -# $Id: randomlylabel.pm,v 1.36 2024/04/05 04:05:08 raeburn Exp $ +# $Id: randomlylabel.pm,v 1.37.2.1 2024/07/04 17:55:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -94,7 +94,7 @@ The argumants for the possible object ty x1:y1:x2:y2:color:thickness -=item RECTANGLE +=item RECTANGLE x1:y1:x2:y2:color:thickness:filled @@ -120,7 +120,7 @@ x:y:file:transparent:srcX:srcY:destW:des =over 4 -=item srcX,srcY,srcW,srcH +=item srcX,srcY,srcW,srcH the start and extant of the region in file to copy to x,y with width/height destW destH @@ -158,7 +158,7 @@ and in that case, if set to a valid valu color:width:open:filled -=over 4 +=over 4 =item open @@ -177,7 +177,7 @@ The possible values for this for the dif =over 4 -=item POLYGON +=item POLYGON a list of coords in the form @@ -210,10 +210,10 @@ use Apache::loncommon(); use Math::Trig(); use GD; use GD::Polyline(); +use LWP::UserAgent(); use Apache::lonnet; use lib '/home/httpd/lib/perl/'; use LONCAPA; -use LONCAPA::LWPReq; # # Note: Math::Trig is included in the standard perl package for many distros. @@ -232,11 +232,11 @@ sub get_image { if ($imgsrc !~ /^https?\:/) { $imgsrc=&Apache::lonnet::absolute_url($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 $lonhost = $Apache::lonnet::perlvar{'lonHostID'}; - my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,$file,'','','',1); + 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; @@ -392,7 +392,6 @@ sub handler { $polygon->addPt($x,$y); $added++; } - $image->setThickness($width); if ($added) { if ($open && lc($open) ne 'no') {