--- loncom/homework/randomlylabel.pm 2005/11/15 20:46:27 1.27
+++ loncom/homework/randomlylabel.pm 2024/04/05 02:43:25 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# randomlabel.png: composite together text and images into 1 image
#
-# $Id: randomlylabel.pm,v 1.27 2005/11/15 20:46:27 albertel Exp $
+# $Id: randomlylabel.pm,v 1.35 2024/04/05 02:43:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -129,7 +129,7 @@ the start and extant of the region in fi
=item LABEL
-x:y:text:font:color:direction
+x:y:text:font:color:direction:rotation
=over 4
@@ -146,6 +146,12 @@ installed TTF font and point size
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
=item POLYGON
@@ -201,23 +207,36 @@ use strict;
use Image::Magick;
use Apache::Constants qw(:common);
use Apache::loncommon();
+use Math::Trig();
use GD;
use GD::Polyline();
-use LWP::UserAgent();
use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+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 {
my ($imgsrc,$set_trans)=@_;
my $image;
if ($imgsrc !~ m|^(/home/)|) {
- if ($imgsrc !~ /^http:/) {
- $imgsrc="http://".$ENV{'HTTP_HOST'}.$imgsrc;
+ if ($imgsrc !~ /^https?\:/) {
+ $imgsrc=&Apache::lonnet::absolute_url($ENV{'HTTP_HOST'}).$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);
+ my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+ my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,$file,'','','',1);
if ($response->is_success) {
if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
my $conv_image = Image::Magick->new;
@@ -264,24 +283,45 @@ sub get_color_from_hexstring {
return $imcolor;
}
+sub add_click {
+ my ($image) = @_;
+
+ my $length=6;
+ my $bgcolor=&get_color_from_hexstring($image,'FFFFFF');
+ my $fgcolor=&get_color_from_hexstring($image,'009999');
+
+ my ($x,$y) = split(':',$env{'form.clickdata'});
+
+ $image->setThickness(3);
+ $image->line($x-$length,$y, $x+$length,$y, $bgcolor);
+ $image->line($x, $y-$length,$x, $y+$length,$bgcolor);
+ $image->setThickness(1);
+ $image->line($x-$length,$y, $x+$length,$y, $fgcolor);
+ $image->line($x, $y-$length,$x, $y+$length,$fgcolor);
+}
+
sub handler {
my $r = shift;
$r->content_type('image/png');
$r->send_http_header;
- my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
- my $image;
- my $prefix="cgi.$id.";
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+
+ my $prefix;
if ($ENV{'QUERY_STRING'}=~/OBJCOUNT\=/) {
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
$prefix='form.';
+ } else {
+ $prefix="cgi.$env{'form.token'}.";
}
+
+ my $image;
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);
$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{$prefix."SIZE"})) {
@@ -298,7 +338,7 @@ 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);
@@ -371,7 +411,7 @@ sub handler {
} elsif ($type eq 'IMAGE') {
my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
$srcH)=split(':',$env{$prefix."OBJ$i"});
- $file=&Apache::lonnet::unescape($file);
+ $file=&unescape($file);
if (!defined($transparent)) { $transparent=1; }
my $subimage=&get_image($file,$transparent);
if (!defined($subimage)) {
@@ -386,9 +426,9 @@ sub handler {
$image->copyResized($subimage,$x,$y,$srcX,$srcY,$destW,$destH,
$srcW,$srcH);
} elsif ($type eq 'LABEL') {
- my ($x,$y,$text,$font,$color,$direction)=
+ my ($x,$y,$text,$font,$color,$direction,$rotation)=
split(':',$env{$prefix."OBJ$i"});
- $text=&Apache::lonnet::unescape($text);
+ $text=&unescape($text);
my $imcolor=&get_color_from_hexstring($image,$color);
my $type='normal';
my ($height,$fontref);
@@ -407,7 +447,7 @@ sub handler {
} elsif ($font eq 'giant' || !$font) {
$height=GD::Font->Giant->height;
$fontref=GD::gdGiantFont;
- } else {
+ } elsif ($image->useFontConfig(1)) {
$type='ttf';
}
if ($type eq 'normal' && $direction eq 'vertical') {
@@ -416,12 +456,21 @@ sub handler {
$image->string($fontref,$x,$y-$height,$text,$imcolor);
} elsif ($type eq 'ttf') {
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 {
&Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");
}
}
+ if (exists($env{'form.clickdata'})) { &add_click($image); }
$image->setThickness(1);
$r->print($image->png);
return OK;