--- loncom/homework/randomlylabel.pm 2007/09/25 22:56:48 1.29
+++ loncom/homework/randomlylabel.pm 2024/04/09 18:47:23 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# randomlabel.png: composite together text and images into 1 image
#
-# $Id: randomlylabel.pm,v 1.29 2007/09/25 22:56:48 albertel Exp $
+# $Id: randomlylabel.pm,v 1.37 2024/04/09 18:47:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -94,7 +94,7 @@ The argumants for the possible object ty
x1:y1:x2:y2:color:thickness
-=item RECTANGLE
+=item RECTANGLE
x1:y1:x2:y2:color:thickness:filled
@@ -120,7 +120,7 @@ x:y:file:transparent:srcX:srcY:destW:des
=over 4
-=item srcX,srcY,srcW,srcH
+=item srcX,srcY,srcW,srcH
the start and extant of the region in file to copy to x,y with width/height
destW destH
@@ -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,13 +146,19 @@ 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
color:width:open:filled
-=over 4
+=over 4
=item open
@@ -171,7 +177,7 @@ The possible values for this for the dif
=over 4
-=item POLYGON
+=item POLYGON
a list of coords in the form
@@ -201,26 +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;
@@ -267,10 +283,25 @@ 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;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
@@ -280,6 +311,22 @@ sub handler {
} else {
$prefix="cgi.$env{'form.token'}.";
}
+ my $epsfile;
+ if (defined($env{$prefix."EPSFILE"})) {
+ my $user = $env{'user.name'}.'_'.$env{'user.domain'};
+ if ($env{$prefix."EPSFILE"} =~ /^\Q$user\E_\d+_\d+_\d+_drawimage\.eps$/) {
+ $epsfile = $Apache::lonnet::perlvar{'lonPrtDir'}.'/'.$env{$prefix."EPSFILE"};
+ } else {
+ &Apache::lonnet::logthis('Unable to create eps file for image object for -'.
+ $env{'form.token'}.'- for '.$user.' as EPSFILE has '.
+ 'unexpected value');
+ return OK;
+ }
+ }
+ unless ($epsfile) {
+ $r->content_type('image/png');
+ $r->send_http_header;
+ }
my $image;
if (defined($env{$prefix."BGIMG"})) {
@@ -345,7 +392,6 @@ sub handler {
$polygon->addPt($x,$y);
$added++;
}
-
$image->setThickness($width);
if ($added) {
if ($open && lc($open) ne 'no') {
@@ -393,7 +439,7 @@ 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=&unescape($text);
my $imcolor=&get_color_from_hexstring($image,$color);
@@ -414,7 +460,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') {
@@ -423,14 +469,32 @@ 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);
+ if ($epsfile) {
+ if (open(my $pipe, "| convert png:- $epsfile")) {
+ print $pipe $image->png;
+ close($pipe);
+ } else {
+ &Apache::lonnet::logthis("randomlylabel unable to open pipe to convert png to eps");
+ }
+ } else {
+ $r->print($image->png);
+ }
return OK;
}