--- loncom/homework/randomlabel.pm 2003/10/16 19:23:58 1.51
+++ loncom/homework/randomlabel.pm 2005/04/12 09:35:22 1.68
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.51 2003/10/16 19:23:58 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.68 2005/04/12 09:35:22 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">
@@ -63,8 +60,11 @@ use Apache::edit;
use Apache::File();
use Apache::Constants qw(:common :http);
+my %args;
+my $cgi_id;
+
BEGIN {
- &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
+ &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
}
sub check_int {
@@ -79,55 +79,26 @@ 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 ( $bgimg !~ /^http:/ ) {
+ 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';
}
}
- 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; }
- $Apache::randomlabel::tlabel_cnt=0;
- $Apache::randomlabel::ilabel_cnt=0;
+ $Apache::randomlabel::obj_cnt=0;
if ($target eq 'web') {
- &Apache::lonxml::startredirection();
- $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
- } elsif ($target eq 'tex') {
- 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/\/$//;
- my $dirtywidth=$texwidth+5;
- $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.')';
+ $cgi_id=&Apache::loncommon::get_cgi_id();
+ %args=();
+ $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+ } 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=
@@ -158,37 +129,57 @@ sub end_randomlabel {
my $count;
pop @Apache::lonxml::namespace;
if ($target eq 'web') {
- my $args=&Apache::lonxml::endredirection();
- $args=~s/\s*&/&/g;
- $args=~s/\s*$//;
- $count = $Apache::randomlabel::tlabel_cnt;
- if( $count != 0) { $args.= "&COUNT=$count"; }
- $count = $Apache::randomlabel::ilabel_cnt;
- if( $count != 0) { $args.= "&ICOUNT=$count"; }
- my $token=$Apache::lonxml::curdepth.'_'.$$;
- $result.='<img src="/adm/randomlabel.png?token='.$token;
- $result.='" /><br />'."\n";
- &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
+ $count = $Apache::randomlabel::obj_cnt;
+ if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }
+ $result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";
+ &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; }
- my $howtoskipback = $texwidth*$height/$width;
- $result.= ' \vskip -'.$howtoskipback.' mm } \\\\ ';
+ $result.= ' \vskip -'.$height_param.' mm } \\\\ ';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
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_bgimg {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::startredirection();
+ }
+ return $result;
+}
+
+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();
+ if ($target eq 'web') {
+ $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
+ $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+ } elsif ($target eq 'tex') {
+ $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
+ }
+ }
+ return $result;
+}
+
+sub make_eps_image {
+ my ($bgimg,$parstack,$safeeval,$depth)=@_;
+ my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg);
+ ($height_param,$width_param)=
+ &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
+ $depth,1);
+ 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";
+ return $result;
}
sub start_labelgroup {
@@ -208,15 +199,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();
@@ -227,6 +228,7 @@ sub start_labelgroup {
sub add_vars {
my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
+ if (!defined($name) || $name eq '') { return; }
my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
my $out=Apache::run::run($code,$safeeval);
if ($value) {
@@ -255,53 +257,34 @@ sub end_labelgroup {
&Apache::structuretags::shuffle(\@idx_arr);
for(0 .. $#Apache::randomlabel::label_arr) {
my $str;
- my $xstr;
- my $ystr;
my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";
my $x = $Apache::randomlabel::xcoord[$_];
my $y = $Apache::randomlabel::ycoord[$_];
my $value = $Apache::randomlabel::value[$_];
+ my $i=$Apache::randomlabel::obj_cnt++;
if( $type eq 'text') {
&add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
- $str = 'LB'.$Apache::randomlabel::tlabel_cnt;
- $xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
- $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
- $Apache::randomlabel::tlabel_cnt += 1;
+ $str = join(':',$x,$y,&Apache::lonnet::escape($label));
+ $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
} elsif ( $type eq 'image') {
&add_vars($gname,$_,
$Apache::randomlabel::description[$idx_arr[$_]],
$idx_arr[$_],$value,$label,$safeeval);
- $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
- $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
- $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
- $Apache::randomlabel::ilabel_cnt += 1;
+ $str = join(':',$x,$y,&Apache::lonnet::escape($label));
+ $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
} else {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
}
- if ($target eq 'web') {
- $result .= '&'. $str .'='.&Apache::lonnet::escape($label);
- $result .= '&'. $xstr .'='.$x;
- $result .= '&'. $ystr .'='.$y;
- }
+ if ($target eq 'web') { $args{"cgi.$cgi_id.OBJ$i"} =$str; }
}
} elsif ($target eq 'tex') {
my $WX1=0; # Web x-coord. of upper left corner (ULC)
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 $TX1=0;
- my $TY1=$texwidth*($wheight/$wwidth);
- my $TX2=$texwidth;
- my $TY2=0;
-
-
- my $slopex=($wwidth-$WX1)/($TX2-$TX1);
- my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0));
- my $cstx=$wwidth-$slopex*($TX2);
- my $csty=$wheight-$slopey*($TY2);
-
+ 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);
@@ -309,16 +292,17 @@ sub end_labelgroup {
for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
my $x = $Apache::randomlabel::xcoord[$i];
- my $y = $Apache::randomlabel::ycoord[$i];
+ # FIXME the 3.5 here is the 'height' of the letter in TeX
+ 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=$TY1-$y*($TY1/$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.'){'.$TeXsize.' \bf '.$label.'}'."\n";
if( $type eq 'text') {
&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
} elsif ( $type eq 'image') {
@@ -378,18 +362,7 @@ sub start_label {
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
if ($target eq 'web' || $target eq 'tex' ||
$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
- my $ltext=&Apache::lonxml::get_all_text("/label",$parser);
- $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
- if ($type eq 'image') {
- &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
- $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
- $ltext);
- &Apache::lonxml::debug("into $ltext");
- my $description = &Apache::lonxml::get_param('description',
- $parstack,$safeeval);
- push(@Apache::randomlabel::description,$description);
- }
- push(@Apache::randomlabel::label_arr,$ltext);
+ &Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,"$type Label");
my $text=&Apache::lonxml::get_all_text("/label",$parser);
@@ -404,7 +377,6 @@ sub start_label {
$result.=&Apache::edit::editline('',$text,'',50).
&Apache::edit::end_table();
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/label");
$result = '<label>';
if ($type eq 'image') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -416,7 +388,7 @@ sub start_label {
$result = $token->[4];
}
}
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/label",$parser);
}
return $result;
}
@@ -424,7 +396,26 @@ sub start_label {
sub end_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my @result;
- if ($target eq 'edit') { @result=('','no') }
+ if ($target eq 'edit') {
+ @result=('','no') ;
+ } elsif ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'answer' || $target eq 'analyze') {
+ my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
+ my $ltext=&Apache::lonxml::endredirection;
+ if ($type eq 'image') {
+ &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
+ $ltext=&Apache::imageresponse::clean_up_image($ltext);
+# $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
+# $ltext);
+ &Apache::lonxml::debug("into $ltext");
+ my $description = &Apache::lonxml::get_param('description',
+ $parstack,$safeeval);
+ push(@Apache::randomlabel::description,$description);
+ } else {
+ $ltext=~s/[\r\n]*//gs
+ }
+ push(@Apache::randomlabel::label_arr,$ltext);
+ }
return @result;
}