--- loncom/homework/randomlylabel.pm	2008/12/19 14:28:14	1.31
+++ loncom/homework/randomlylabel.pm	2024/04/05 04:05:08	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.31 2008/12/19 14:28:14 raeburn Exp $
+# $Id: randomlylabel.pm,v 1.36 2024/04/05 04:05:08 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,13 +207,23 @@ 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)=@_;
@@ -216,11 +232,11 @@ sub get_image {
 	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;
@@ -286,8 +302,6 @@ sub add_click {
 
 sub handler {
     my $r = shift;
-    $r->content_type('image/png');
-    $r->send_http_header;
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
@@ -297,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"})) {
@@ -410,7 +440,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);
@@ -431,7 +461,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') {
@@ -440,7 +470,15 @@ 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");
@@ -448,7 +486,16 @@ sub handler {
     }
     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;
 }