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

Diff for /loncom/homework/randomlylabel.pm between versions 1.26 and 1.28

version 1.26, 2005/04/07 06:56:22 version 1.28, 2006/05/30 12:45:37
Line 1 Line 1
 #!/usr/bin/perl  
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image  # randomlabel.png: composite together text and images into 1 image
 #  #
Line 206  use GD; Line 205  use GD;
 use GD::Polyline();  use GD::Polyline();
 use LWP::UserAgent();  use LWP::UserAgent();
 use Apache::lonnet;  use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 sub get_image {  sub get_image {
     my ($imgsrc,$set_trans)=@_;      my ($imgsrc,$set_trans)=@_;
Line 277  sub handler { Line 279  sub handler {
  $prefix='form.';   $prefix='form.';
     }      }
     if (defined($env{$prefix."BGIMG"})) {      if (defined($env{$prefix."BGIMG"})) {
  my $bgimg=&Apache::lonnet::unescape($env{$prefix."BGIMG"});   my $bgimg=&unescape($env{$prefix."BGIMG"});
  #&Apache::lonnet::logthis("BGIMG is ".$bgimg);   #&Apache::lonnet::logthis("BGIMG is ".$bgimg);
  $image=&get_image($bgimg,0);   $image=&get_image($bgimg,0);
  if (! defined($image)) {   if (! defined($image)) {
Line 372  sub handler { Line 374  sub handler {
  } elsif ($type eq 'IMAGE') {   } elsif ($type eq 'IMAGE') {
     my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,      my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
  $srcH)=split(':',$env{$prefix."OBJ$i"});   $srcH)=split(':',$env{$prefix."OBJ$i"});
     $file=&Apache::lonnet::unescape($file);      $file=&unescape($file);
     if (!defined($transparent)) { $transparent=1; }      if (!defined($transparent)) { $transparent=1; }
     my $subimage=&get_image($file,$transparent);      my $subimage=&get_image($file,$transparent);
     if (!defined($subimage)) {      if (!defined($subimage)) {
Line 389  sub handler { Line 391  sub handler {
  } elsif ($type eq 'LABEL') {   } elsif ($type eq 'LABEL') {
     my ($x,$y,$text,$font,$color,$direction)=      my ($x,$y,$text,$font,$color,$direction)=
  split(':',$env{$prefix."OBJ$i"});   split(':',$env{$prefix."OBJ$i"});
     $text=&Apache::lonnet::unescape($text);      $text=&unescape($text);
     my $imcolor=&get_color_from_hexstring($image,$color);      my $imcolor=&get_color_from_hexstring($image,$color);
     my $type='normal';      my $type='normal';
     my ($height,$fontref);      my ($height,$fontref);
Removed from v.1.26  
changed lines
  Added in v.1.28

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