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

Diff for /loncom/homework/randomlylabel.pm between versions 1.31 and 1.35

version 1.31, 2008/12/19 14:28:14 version 1.35, 2024/04/05 02:43:25
Line 129  the start and extant of the region in fi Line 129  the start and extant of the region in fi
   
 =item LABEL  =item LABEL
   
 x:y:text:font:color:direction  x:y:text:font:color:direction:rotation
   
 =over 4  =over 4
   
Line 146  installed TTF font and point size Line 146  installed TTF font and point size
   
 either B<horizontal> or B<vertical>  either B<horizontal> or B<vertical>
   
   =item rotation
   
   number of degrees to rotate the text, relative to the horizontal.
   only used if font attribute is set to a freetype font (e.g., helvetica 12),
   and in that case, if set to a valid value, overrides value set for direction.
   
 =back  =back
   
 =item  POLYGON  =item  POLYGON
Line 201  use strict; Line 207  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)=@_;
Line 216  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 $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 410  sub handler { Line 426  sub handler {
     $image->copyResized($subimage,$x,$y,$srcX,$srcY,$destW,$destH,      $image->copyResized($subimage,$x,$y,$srcX,$srcY,$destW,$destH,
  $srcW,$srcH);   $srcW,$srcH);
  } elsif ($type eq 'LABEL') {   } elsif ($type eq 'LABEL') {
     my ($x,$y,$text,$font,$color,$direction)=      my ($x,$y,$text,$font,$color,$direction,$rotation)=
  split(':',$env{$prefix."OBJ$i"});   split(':',$env{$prefix."OBJ$i"});
     $text=&unescape($text);      $text=&unescape($text);
     my $imcolor=&get_color_from_hexstring($image,$color);      my $imcolor=&get_color_from_hexstring($image,$color);
Line 431  sub handler { Line 447  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 456  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 ($rotation =~ /^(\-|\+|)\d+(|\.\d*)$/) {
                       $angle = Math::Trig::deg2rad($rotation);
                   } elsif ($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.31  
changed lines
  Added in v.1.35

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