Diff for /loncom/homework/randomlylabel.pm between versions 1.9 and 1.15

version 1.9, 2003/05/13 19:08:31 version 1.15, 2004/02/11 21:51:15
Line 34  use strict; Line 34  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 GD;  use GD();
   use GD::Polyline();
   use LWP::UserAgent();
   
 sub get_image {  sub get_image {
     my ($imgsrc,$set_trans)=@_;      my ($imgsrc,$set_trans)=@_;
     my $image;      my $image;
     if ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {      &Apache::lonnet::logthis("imagesrc1 is $imgsrc");
       if ($imgsrc !~ m|^(/home/)|) {
    &Apache::lonnet::logthis("imagesrc2 is $imgsrc");
    if ($imgsrc !~ /^http:/) {
       $imgsrc="http://".$ENV{'HTTP_HOST'}.$imgsrc;
    }
    &Apache::lonnet::logthis("imagesrc3 is $imgsrc");
    &Apache::lonnet::logthis("LWP fetching image $imgsrc");
    my $ua=new LWP::UserAgent;
    my $request=new HTTP::Request('GET',"$imgsrc");
    $request->header(Cookie => $ENV{'HTTP_COOKIE'});
    my $file="/tmp/imagetmp".$$;
    my $response=$ua->request($request,$file);
    &Apache::lonnet::logthis("contetn is ".$response->content_type);
    &Apache::lonnet::logthis($response->is_success);
    &Apache::lonnet::logthis($response->status_line);
    if ($response->is_success) {
       if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
    my $conv_image = Image::Magick->new;
    my $current_figure = $conv_image->Read('filename'=>$file);
    $conv_image->Set('magick'=>'png');
    my @blobs=$conv_image->ImageToBlob();
    undef $conv_image;
    $image = GD::Image->new($blobs[0]);
       } else {
    GD::Image->trueColor(1);
    $image = GD::Image->new($file);
       }
    }
       } elsif ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
  my $conv_image = Image::Magick->new;   my $conv_image = Image::Magick->new;
  my $current_figure = $conv_image->Read('filename'=>$imgsrc);   my $current_figure = $conv_image->Read('filename'=>$imgsrc);
  $conv_image->Set('magick'=>'png');   $conv_image->Set('magick'=>'png');
Line 60  sub get_image { Line 91  sub get_image {
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     $r->content_type('image/png');      $r->content_type('image/png');
     my (undef,$token) = split(/=/,$ENV{'QUERY_STRING'});      $r->send_http_header;
     &Apache::loncommon::get_unprocessed_cgi(      my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
                &Apache::lonnet::unescape($ENV{'imagerequest.'.$token}));      &Apache::lonnet::logthis("BGIMG is ".$ENV{"cgi.$id.BGIMG"});
     my $image=&get_image($ENV{"form.BGIMG"},0);      my $image=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"}),0);
     if (! defined($image)) {      if (! defined($image)) {
         &Apache::lonnet::logthis('Unable to create image object for '.          &Apache::lonnet::logthis('Unable to create image object for -'.$id.'-'.
  $ENV{"form.BGIMG"});   $ENV{"cgi.$id.BGIMG"});
         return OK;          return OK;
     }      }
     #binmode(STDOUT);      #binmode(STDOUT);
Line 74  sub handler { Line 105  sub handler {
     if (!($black=$image->colorResolve(0,0,0))) {      if (!($black=$image->colorResolve(0,0,0))) {
  $black = $image->colorClosestHWB(0,0,0);   $black = $image->colorClosestHWB(0,0,0);
     }      }
     for(my $i=0;$i<$ENV{"form.ICOUNT"};$i++) {      for(my $i=0;$i<$ENV{"cgi.$id.ICOUNT"};$i++) {
  my $subimage=&get_image($ENV{"form.IMG$i"},1);   my $subimage=&get_image(&Apache::lonnet::unescape($ENV{"cgi.$id.IMG$i"}),1);
  if (!defined($subimage)) {   if (!defined($subimage)) {
             &Apache::lonnet::logthis('Unable to create image object for '.              &Apache::lonnet::logthis('Unable to create image object for '.
                                  $ENV{"form.BGIMG"});                                   $ENV{"cgi.$id.BGIMG"});
             next;              next;
         }          }
  $image->copy($subimage,$ENV{"form.IX$i"},$ENV{"form.IY$i"},   $image->copy($subimage,$ENV{"cgi.$id.IX$i"},$ENV{"cgi.$id.IY$i"},
      0,0,$subimage->getBounds());       0,0,$subimage->getBounds());
     }      }
     my $height=GD::Font->Giant->height;      my $height=GD::Font->Giant->height;
     for(my $i=0;$i<$ENV{"form.COUNT"};$i++) {      for(my $i=0;$i<$ENV{"cgi.$id.COUNT"};$i++) {
  $image->string(gdGiantFont,$ENV{"form.X$i"},$ENV{"form.Y$i"}-$height,   $image->string(GD::gdGiantFont,$ENV{"cgi.$id.X$i"},
        $ENV{"form.LB$i"},$black);         $ENV{"cgi.$id.Y$i"}-$height,
          &Apache::lonnet::unescape($ENV{"cgi.$id.LB$i"}),$black);
       }
       for(my $i=0;$i<$ENV{"cgi.$id.LINECOUNT"};$i++) {
    my ($x1,$y1,$x2,$y2,$color,$width)=split(':',$ENV{"cgi.$id.LINE$i"});
    my (undef,$red,undef,$green,undef,$blue)=split(/(..)/,$color);
    $red=hex($red);$green=hex($green);$blue=hex($blue);
    my $imcolor;
    if (!($imcolor = $image->colorResolve($red,$green,$blue))) {
       $imcolor = $image->colorClosestHWB($red,$green,$blue);
    }
    $image->setThickness($width);
           $image->line($x1,$y1,$x2,$y2,$imcolor);
       }
       for(my $i=0;$i<$ENV{"cgi.$id.BOXCOUNT"};$i++) {
    my ($x1,$y1,$x2,$y2,$color,$width)=split(':',$ENV{"cgi.$id.BOX$i"});
    if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
    if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
    my (undef,$red,undef,$green,undef,$blue)=split(/(..)/,$color);
    $red=hex($red);$green=hex($green);$blue=hex($blue);
    my $imcolor;
    if (!($imcolor = $image->colorResolve($red,$green,$blue))) {
       $imcolor = $image->colorClosestHWB($red,$green,$blue);
    }
    $image->setThickness($width);
           $image->rectangle($x1,$y1,$x2,$y2,$imcolor);
       }
       for(my $i=0;$i<$ENV{"cgi.$id.POLYCOUNT"};$i++) {
    my ($color,$width,$open)=split(':',$ENV{"cgi.$id.POLYOPT$i"});
    my (undef,$red,undef,$green,undef,$blue)=split(/(..)/,$color);
    $red=hex($red);$green=hex($green);$blue=hex($blue);
    my $imcolor;
    if (!($imcolor = $image->colorResolve($red,$green,$blue))) {
       $imcolor = $image->colorClosestHWB($red,$green,$blue);
    }
    my $polygon;
    if ($open) {
       $polygon = new GD::Polyline;
    } else {
       $polygon = new GD::Polygon;
    }
    foreach my $coord (split('-',$ENV{"cgi.$id.POLY$i"})) {
       my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
       $polygon->addPt($x,$y);
    }
    $image->setThickness($width);
    if ($open) {
       $image->polydraw($polygon,$imcolor);
    } else {
       $image->polygon($polygon,$imcolor);
    }
     }      }
       $image->setThickness(1);
     $r->print($image->png);      $r->print($image->png);
     return OK;      return OK;
 }  }

Removed from v.1.9  
changed lines
  Added in v.1.15


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