--- loncom/homework/randomlylabel.pm 2005/02/23 15:51:48 1.23
+++ loncom/homework/randomlylabel.pm 2007/09/25 22:56:48 1.29
@@ -1,8 +1,7 @@
-#!/usr/bin/perl
# The LearningOnline Network with CAPA
# randomlabel.png: composite together text and images into 1 image
#
-# $Id: randomlylabel.pm,v 1.23 2005/02/23 15:51:48 albertel Exp $
+# $Id: randomlylabel.pm,v 1.29 2007/09/25 22:56:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,13 +30,30 @@
=head1 Syntax of randomlylabel commands
+Required items are: (one of BGIMG or SIZE) and OBJCOUNT
+
=over 4
=item BGIMG
-/home/... file or href (href must contain http://...)
+/home/... file
+/res/ ... URL
+or href (href must contain http://...)
Expected to be HTTP escaped
+=item SIZE
+
+width:height
+
+Creates a blank canvas of size width,height.
+
+=item BGCOLOR
+
+either I<transparent> or a color hexstring
+
+Sets the background color, if SIZE is used to create a new canvas,
+I<trasparent> makes the background transparent.
+
=item OBJCOUNT
a number
@@ -188,6 +204,10 @@ use Apache::loncommon();
use GD;
use GD::Polyline();
use LWP::UserAgent();
+use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
sub get_image {
my ($imgsrc,$set_trans)=@_;
@@ -251,21 +271,30 @@ sub handler {
my $r = shift;
$r->content_type('image/png');
$r->send_http_header;
- my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+
+ my $prefix;
+ if ($ENV{'QUERY_STRING'}=~/OBJCOUNT\=/) {
+ $prefix='form.';
+ } else {
+ $prefix="cgi.$env{'form.token'}.";
+ }
+
my $image;
- if (defined($ENV{"cgi.$id.BGIMG"})) {
- my $bgimg=&Apache::lonnet::unescape($ENV{"cgi.$id.BGIMG"});
+ if (defined($env{$prefix."BGIMG"})) {
+ my $bgimg=&unescape($env{$prefix."BGIMG"});
#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
$image=&get_image($bgimg,0);
if (! defined($image)) {
&Apache::lonnet::logthis('Unable to create image object for -'.
- $id.'-'.$bgimg);
+ $env{'form.token'}.'-'.$bgimg);
return OK;
}
- } elsif (defined($ENV{"cgi.$id.SIZE"})) {
- my ($width,$height)=split(':',$ENV{"cgi.$id.SIZE"});
+ } elsif (defined($env{$prefix."SIZE"})) {
+ my ($width,$height)=split(':',$env{$prefix."SIZE"});
$image = new GD::Image($width,$height,1);
- my ($bgcolor)=split(':',$ENV{"cgi.$id.BGCOLOR"});
+ my ($bgcolor)=split(':',$env{$prefix."BGCOLOR"});
if ($bgcolor ne 'transparent') {
$bgcolor=&get_color_from_hexstring($image,$bgcolor);
# $image->rectangle(0,0,$width,$height,$bgcolor);
@@ -276,16 +305,16 @@ sub handler {
$image->transparent($bgcolor);
}
} else {
- &Apache::lonnet::logthis('Unable to create image object, no info');
+ &Apache::lonnet::logthis('Unable to create image object, no info '.$prefix);
return OK;
}
#binmode(STDOUT);
- my @objtypes=split(':',$ENV{"cgi.$id.OBJTYPE"});
- foreach(my $i=0;$i<$ENV{"cgi.$id.OBJCOUNT"};$i++) {
+ my @objtypes=split(':',$env{$prefix."OBJTYPE"});
+ foreach(my $i=0;$i<$env{$prefix."OBJCOUNT"};$i++) {
my $type=shift(@objtypes);
if ($type eq 'LINE') {
my ($x1,$y1,$x2,$y2,$color,$thickness)=
- split(':',$ENV{"cgi.$id.OBJ$i"});
+ split(':',$env{$prefix."OBJ$i"});
my $imcolor=&get_color_from_hexstring($image,$color);
if (!defined($thickness)) { $thickness=1; }
$image->setThickness($thickness);
@@ -293,7 +322,7 @@ sub handler {
$image->line($x1,$y1,$x2,$y2,$imcolor);
} elsif ($type eq 'RECTANGLE') {
my ($x1,$y1,$x2,$y2,$color,$thickness,$filled)=
- split(':',$ENV{"cgi.$id.OBJ$i"});
+ split(':',$env{$prefix."OBJ$i"});
if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
my $imcolor=&get_color_from_hexstring($image,$color);
@@ -306,12 +335,12 @@ sub handler {
$image->rectangle($x1,$y1,$x2,$y2,$imcolor);
}
} elsif ($type eq 'POLYGON') {
- my ($color,$width,$open,$filled)=split(':',$ENV{"cgi.$id.OBJ$i"});
+ my ($color,$width,$open,$filled)=split(':',$env{$prefix."OBJ$i"});
my $imcolor=&get_color_from_hexstring($image,$color);
my $polygon = (($open && lc ($open ne 'no')) ?
(new GD::Polyline) : (new GD::Polygon));
my $added=0;
- foreach my $coord (split('-',$ENV{"cgi.$id.OBJEXTRA$i"})) {
+ foreach my $coord (split('-',$env{$prefix."OBJEXTRA$i"})) {
my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
$polygon->addPt($x,$y);
$added++;
@@ -329,7 +358,7 @@ sub handler {
}
} elsif ($type eq 'ARC') {
my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=
- split(':',$ENV{"cgi.$id.OBJ$i"});
+ split(':',$env{$prefix."OBJ$i"});
if (!$color) { $color='000000'; }
my $imcolor=&get_color_from_hexstring($image,$color);
if (!defined($thickness)) { $thickness=1; }
@@ -342,14 +371,14 @@ sub handler {
$image->arc($x,$y,$width,$height,$start,$end,$imcolor);
}
} elsif ($type eq 'FILL') {
- my ($x,$y,$color)=split(':',$ENV{"cgi.$id.OBJ$i"});
+ my ($x,$y,$color)=split(':',$env{$prefix."OBJ$i"});
if (!$color) { $color='000000'; }
my $imcolor=&get_color_from_hexstring($image,$color);
$image->fill($x,$y,$imcolor);
} elsif ($type eq 'IMAGE') {
my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
- $srcH)=split(':',$ENV{"cgi.$id.OBJ$i"});
- $file=&Apache::lonnet::unescape($file);
+ $srcH)=split(':',$env{$prefix."OBJ$i"});
+ $file=&unescape($file);
if (!defined($transparent)) { $transparent=1; }
my $subimage=&get_image($file,$transparent);
if (!defined($subimage)) {
@@ -365,8 +394,8 @@ sub handler {
$srcW,$srcH);
} elsif ($type eq 'LABEL') {
my ($x,$y,$text,$font,$color,$direction)=
- split(':',$ENV{"cgi.$id.OBJ$i"});
- $text=&Apache::lonnet::unescape($text);
+ split(':',$env{$prefix."OBJ$i"});
+ $text=&unescape($text);
my $imcolor=&get_color_from_hexstring($image,$color);
my $type='normal';
my ($height,$fontref);