[BACK]Return to randomlylabel.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/randomlylabel.pm between versions 1.36 and 1.37.2.1

version 1.36, 2024/04/05 04:05:08 version 1.37.2.1, 2024/07/04 17:55:04
Line 94  The argumants for the possible object ty Line 94  The argumants for the possible object ty
   
 x1:y1:x2:y2:color:thickness  x1:y1:x2:y2:color:thickness
   
 =item RECTANGLE   =item RECTANGLE
   
 x1:y1:x2:y2:color:thickness:filled  x1:y1:x2:y2:color:thickness:filled
   
Line 120  x:y:file:transparent:srcX:srcY:destW:des Line 120  x:y:file:transparent:srcX:srcY:destW:des
   
 =over 4  =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  the start and extant of the region in file to copy to x,y with width/height
            destW destH             destW destH
Line 158  and in that case, if set to a valid valu Line 158  and in that case, if set to a valid valu
   
 color:width:open:filled  color:width:open:filled
   
 =over 4   =over 4
   
 =item open  =item open
   
Line 177  The possible values for this for the dif Line 177  The possible values for this for the dif
   
 =over 4  =over 4
   
 =item POLYGON   =item POLYGON
   
 a list of coords in the form  a list of coords in the form
   
Line 210  use Apache::loncommon(); Line 210  use Apache::loncommon();
 use Math::Trig();  use Math::Trig();
 use GD;  use GD;
 use GD::Polyline();  use GD::Polyline();
   use LWP::UserAgent(); 
 use Apache::lonnet;  use Apache::lonnet;
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  use LONCAPA;
 use LONCAPA::LWPReq;   
   
 #  #
 # Note: Math::Trig is included in the standard perl package for many distros.  # Note: Math::Trig is included in the standard perl package for many distros.
Line 232  sub get_image { Line 232  sub get_image {
  if ($imgsrc !~ /^https?\:/) {   if ($imgsrc !~ /^https?\:/) {
     $imgsrc=&Apache::lonnet::absolute_url($ENV{'HTTP_HOST'}).$imgsrc;      $imgsrc=&Apache::lonnet::absolute_url($ENV{'HTTP_HOST'}).$imgsrc;
  }   }
           my $ua=new LWP::UserAgent;
  my $request=new HTTP::Request('GET',"$imgsrc");   my $request=new HTTP::Request('GET',"$imgsrc");
  $request->header(Cookie => $ENV{'HTTP_COOKIE'});   $request->header(Cookie => $ENV{'HTTP_COOKIE'});
  my $file="/tmp/imagetmp".$$;   my $file="/tmp/imagetmp".$$;
         my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};          my $response=$ua->request($request,$file);
         my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,$file,'','','',1);  
  if ($response->is_success) {   if ($response->is_success) {
     if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {      if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
  my $conv_image = Image::Magick->new;   my $conv_image = Image::Magick->new;
Line 392  sub handler { Line 392  sub handler {
  $polygon->addPt($x,$y);   $polygon->addPt($x,$y);
  $added++;   $added++;
     }      }
       
     $image->setThickness($width);      $image->setThickness($width);
     if ($added) {      if ($added) {
  if ($open && lc($open) ne 'no') {   if ($open && lc($open) ne 'no') {
Removed from v.1.36  
changed lines
  Added in v.1.37.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>