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

Diff for /loncom/homework/randomlylabel.pm between versions 1.30 and 1.33

version 1.30, 2007/09/25 23:16:13 version 1.33, 2024/04/04 17:33:01
Line 201  use strict; Line 201  use strict;
 use Image::Magick;  use Image::Magick;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
   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.
   #
   # For distros which use rpm the following command will show whether Trig.pm is
   # included in the system perl: rpm -q --provides perl |grep Math::Trig
   #
   # For distros which use deb the following command will show whether Trig.pm is
   # included in the system perl: dpkg -S perl |grep Math\/Trig\.pm
   #
   
 sub get_image {  sub get_image {
     my ($imgsrc,$set_trans)=@_;      my ($imgsrc,$set_trans)=@_;
     my $image;      my $image;
     if ($imgsrc !~ m|^(/home/)|) {      if ($imgsrc !~ m|^(/home/)|) {
  if ($imgsrc !~ /^http:/) {   if ($imgsrc !~ /^https?\:/) {
     $imgsrc="http://".$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 $response=$ua->request($request,$file);          my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
           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 431  sub handler { Line 441  sub handler {
     } elsif ($font eq 'giant' || !$font) {      } elsif ($font eq 'giant' || !$font) {
  $height=GD::Font->Giant->height;   $height=GD::Font->Giant->height;
  $fontref=GD::gdGiantFont;   $fontref=GD::gdGiantFont;
     } else {      } elsif ($image->useFontConfig(1)) {
  $type='ttf';   $type='ttf';
     }      }
     if ($type eq 'normal' && $direction eq 'vertical') {      if ($type eq 'normal' && $direction eq 'vertical') {
Line 440  sub handler { Line 450  sub handler {
  $image->string($fontref,$x,$y-$height,$text,$imcolor);   $image->string($fontref,$x,$y-$height,$text,$imcolor);
     } elsif ($type eq 'ttf') {      } elsif ($type eq 'ttf') {
  my ($fontname,$ptsize)=split(/\s+/,$font);   my ($fontname,$ptsize)=split(/\s+/,$font);
  $image->stringFT($imcolor,$fontname,$ptsize,90,$x,$y,$text);                  my $angle = 0;
                   if ($direction eq 'vertical') {
                       $angle = Math::Trig::deg2rad(90);
                   } elsif ($direction eq 'horizontal') {
                       $angle = 0;
                   }
    $image->stringFT($imcolor,$fontname,$ptsize,$angle,$x,$y,$text);
     }      }
  } else {   } else {
     &Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");      &Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");
Removed from v.1.30  
changed lines
  Added in v.1.33

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