--- loncom/homework/randomlabel.pm 2004/11/13 19:39:45 1.62
+++ loncom/homework/randomlabel.pm 2005/05/16 21:58:19 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.62 2004/11/13 19:39:45 albertel Exp $
+# $Id: randomlabel.pm,v 1.73 2005/05/16 21:58:19 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,9 +25,6 @@
#
# http://www.lon-capa.org/
#
-# 7/20/2001 Isaac Tsai, initial syntax
-# 8/10/2001 Isaac Tsai,
-# 8/30/2001 Isaac Tsai,
# SYNTAX:
# <randomlabel bgimg="URL" width="12" height="45" texwidth="50">
# <labelgroup name="GroupOne" type="image">
@@ -62,9 +59,12 @@ use strict;
use Apache::edit;
use Apache::File();
use Apache::Constants qw(:common :http);
+use Image::Magick;
+use Apache::lonplot;
my %args;
my $cgi_id;
+my $scale_factor; # image scale factor.
BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
@@ -82,14 +82,16 @@ sub check_int {
return $num;
}
+my ($height_param,$width_param);
sub start_randomlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
push (@Apache::lonxml::namespace,'randomlabel');
+ ($height_param,$width_param)=(0,0);
my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
- if (&Apache::lonnet::repcopy($bgimg) ne OK) {
+ if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {
$bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
}
}
@@ -98,12 +100,8 @@ sub start_randomlabel {
$cgi_id=&Apache::loncommon::get_cgi_id();
%args=();
$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
- } elsif ($target eq 'tex') {
- my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
- my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
- my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
- if (!$texwidth) { $texwidth=90; }
- $result.=&make_eps_image($bgimg,$texwidth,$h,$w);
+ } elsif ($target eq 'tex' && defined($bgimg)) {
+ $result.=&make_eps_image($bgimg,$parstack,$safeeval);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$Apache::edit::bgimgsrc=
@@ -140,13 +138,7 @@ sub end_randomlabel {
&Apache::lonnet::appenv(%args);
} elsif ($target eq 'tex') {
$result='\end{picture}\\\\';
- my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
- my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
- my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
- if (!$texwidth) { $texwidth=90; }
- # what if width is undefined?
- my $howtoskipback = $texwidth*$height/$width;
- $result.= ' \vskip -'.$howtoskipback.' mm } \\\\ ';
+ $result.= ' \vskip -'.$height_param.' mm } \\\\ ';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -157,7 +149,7 @@ sub start_bgimg {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::startredirection;
+ &Apache::lonxml::startredirection();
}
return $result;
}
@@ -166,65 +158,67 @@ sub end_bgimg {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
- my $bgimg=&Apache::lonxml::endredirection;
+ my $bgimg=&Apache::lonxml::endredirection();
if ($target eq 'web') {
$bgimg=&Apache::imageresponse::clean_up_image($bgimg);
$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
} elsif ($target eq 'tex') {
- my $w=&check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval,-2));
- my $h=&check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval,-2));
- my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,-2));
- if (!$texwidth) { $texwidth=90; }
- $result.=&make_eps_image($bgimg,$texwidth,$h,$w);
+ # Some bg images can create latex for us... e.g. gnuplot.
+ # If it looks like we have some latex use that,
+ # otherwise, assume this is a resource name that must
+ # be converted into the latex to create an eps insertion.
+ #
+ my $src = $bgimg;
+ $src =~ s/\s+$//s;
+ $src =~ s/^\s+//s;
+
+
+ if ($src =~ /^\\graphicspath/) {
+ $height_param = $Apache::lonplot::plot{'height'}*0.3;
+ $width_param = $Apache::lonplot::plot{'width'}*0.3;
+ &Apache::lonxml::debug("height $height_param");
+ &Apache::lonxml::debug("Width $width_param");
+ $scale_factor=1.0;
+ my $dirty_width = $width_param + 5;
+ $result .= '\parbox{'.$dirty_width.'mm}{';
+ $result .= $src;
+ $result .= '\begin{picture}('."$height_param,$width_param)";
+ $result .= "(0,-$height_param)";
+ } else {
+
+
+ $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
+ }
}
}
return $result;
}
-
sub make_eps_image {
- my ($bgimg,$texwidth,$h,$w)=@_;
- my $newbgimg = $bgimg;
- $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
- $bgimg= &Apache::lonnet::filelocation($bgimg);
- $bgimg=~s|http:/[^/]*|/home/httpd/html|;
- $bgimg=~s|/$||;
- #if no eps file try to replicate it
- if (not-e $bgimg) {
- if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
- #if replication failed try to find ps file
- $bgimg=~s/\.eps$/\.ps/;
- #if no ps file try to replicate it
- if (not -e $bgimg &&
- &Apache::lonnet::repcopy($bgimg) ne OK) {
- #if replication failed try to produce eps file dynamically
- $bgimg=~s/\.ps$/\.eps/;
- my $temp_file;
- my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
- $temp_file = Apache::File->new('>>'.$filename);
- $newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|;
- print $temp_file "$newbgimg\n";
- $bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;
- $bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
- }
- }
- }
- $bgimg=~s|/$||;
- my $dirtywidth=$texwidth+5;
- my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.
- ' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.$bgimg.
- '}\setlength{\unitlength}{1mm} \begin{picture}('.
- $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
+ my ($bgimg,$parstack,$safeeval,$depth)=@_;
+ &Apache::lonxml::debug("image prior to get_eps_image: $bgimg");
+ my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg);
+ &Apache::lonxml::debug("image after: $bgimg");
+ ($height_param,$width_param)=
+ &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
+ $depth,1);
+
+ &Apache::lonxml::debug("Image size: $height_param x $width_param");
+
+ my $dirtywidth=$width_param+5;
+ my $result ="\n".'\vspace*{2mm}\noindent'."\n".
+ '\parbox{'.$dirtywidth.
+ ' mm}{ \noindent \epsfxsize='.$width_param.
+ ' mm \epsffile{'.$path.$file.
+ '}\setlength{\unitlength}{1mm}'."\n".' \begin{picture}('.
+ $width_param.','.$height_param.')(0,-'.$height_param.')'."\n";
+ my $magick = Image::Magick->new;
+ $magick->Read($bgimg);
+ my $initial_width = $magick->Get('width');
+ &Apache::lonxml::debug("ImageMagick thinks width is; $initial_width");
+ $scale_factor = $width_param / $initial_width;
return $result;
}
-sub adjust_textwidth {
- my $texwidth=shift;
- my $pagewidth=$ENV{'form.textwidth'};
- $pagewidth=~s/\s*mm\s*$//;
- if ($texwidth>$pagewidth) {$texwidth=$pagewidth;}
- return $texwidth;
-}
-
sub start_labelgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -242,15 +236,25 @@ sub start_labelgroup {
@Apache::randomlabel::ycoord = ();
@Apache::randomlabel::value = ();
@Apache::randomlabel::label_arr = ();
- @Apache::randomlabel::decription = ();
+ @Apache::randomlabel::description = ();
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token).
- &Apache::edit::select_arg('Type:','type',['text','image'],$token).
- &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ &Apache::edit::select_arg('Type:','type',['text','image'],$token);
+ if (!defined($token->[2]{'TeXsize'})) {
+ $token->[2]{'TeXsize'}='\normalsize';
+ }
+ $result.=&Apache::edit::select_arg('TeX font size:','TeXsize',
+ ['\tiny','\scriptsize',
+ '\footnotesize','\small',
+ '\normalsize','\large','\Large',
+ '\LARGE','\huge','\Huge'],
+ $token);
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'name','type');
+ $safeeval,'name','type',
+ 'TeXsize');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
@@ -259,6 +263,24 @@ sub start_labelgroup {
return $result;
}
+#
+# Utility sub to compute the width of a label.
+#
+sub get_label_width {
+ my $label = shift;
+ &Apache::lonxml::debug("image label = $label");
+ if (-e $label) {
+ &Apache::lonxml::debug("$label exists");
+ } else {
+ &Apache::lonxml::debug("$label does not exist");
+ }
+ my $magick = Image::Magick->new;
+ $magick->Read($label);
+ my $pixel_width = $magick->Get('width');
+ return $pixel_width * $scale_factor;
+
+
+}
sub add_vars {
my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
if (!defined($name) || $name eq '') { return; }
@@ -315,9 +337,8 @@ sub end_labelgroup {
my $WY1=0; # Web y-coord. of (ULC)
my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
- my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
- if (!$texwidth) { $texwidth=90; }
- my $texheight=$texwidth*($wheight/$wwidth);
+ my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
+ if (!defined($TeXsize)) { $TeXsize='\\normalsize'; }
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
&Apache::structuretags::shuffle(\@idx_arr);
@@ -330,16 +351,23 @@ sub end_labelgroup {
my $y = $Apache::randomlabel::ycoord[$i]-3.5;
my $value = $Apache::randomlabel::value[$i];
#x latex coordinate
- my $tcX=($x)*($texwidth/$wwidth);
+ my $tcX=($x)*($width_param/$wwidth);
#y latex coordinate
# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
- my $tcY=$texheight-$y*($texheight/$wheight);
+ my $tcY=$height_param-$y*($height_param/$wheight);
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
- $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
+ $result .= '\put('.$tcX.','.$tcY.'){';
if( $type eq 'text') {
+ $result.= $TeXsize.' \bf '.$label."}\n";
&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
} elsif ( $type eq 'image') {
+ my ($path,$file) = &Apache::londefdef::get_eps_image($label);
+ my $image_name = $path.$file;
+ my $label_width = get_label_width($label);
+
+ $result .= '\includegraphics[width='.$label_width.'mm]{'
+ .$image_name."}}\n";
&add_vars($gname,$i,
$Apache::randomlabel::description[$idx_arr[$i]],
$idx_arr[$i],$value,$label,$safeeval);
@@ -437,6 +465,15 @@ sub end_label {
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
my $ltext=&Apache::lonxml::endredirection;
if ($type eq 'image') {
+ if ($target eq 'tex') {
+ # For tex targets, our image url has been potentially corrupted
+ # by prepending \'s in front of special latex symbols.
+ # For now we only worry about the _ case (most common?)
+ # There's a whole host of theim in lonxml::latex_special_symbols
+ # that could potentially have to be re-done.
+
+ $ltext =~ s/\\_/_/g;
+ }
&Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
$ltext=&Apache::imageresponse::clean_up_image($ltext);
# $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],