--- loncom/homework/randomlabel.pm 2002/05/17 21:27:44 1.27
+++ loncom/homework/randomlabel.pm 2002/07/22 17:15:55 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.27 2002/05/17 21:27:44 albertel Exp $
+# $Id: randomlabel.pm,v 1.31 2002/07/22 17:15:55 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,7 +91,7 @@ sub start_randomlabel {
} elsif ($bgimg =~ m:^/home/.*/public_html:) {
$bgimg =~ s:^/home/(.*)/public_html:/~$1:;
}
- $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
+ $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
}
my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
@@ -108,10 +108,20 @@ sub start_randomlabel {
} elsif ($target eq 'tex') {
$bgimg=~s/(.gif|.jpg)$/.eps/;
$bgimg= &Apache::lonnet::filelocation($bgimg);
- $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+ if (not $ENV{'request.role'}=~/^au\./) {
+ $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+ } else {
+ $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;
+
+ }
$bgimg=~s/\/$//;
- $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}(0,0)('.$texwidth.','.$texwidth*$h/$w.')'
+ if ($texwidth==90) {
+ $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')';
+ } else {
+ $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')('.(100-$texwidth).','.(100-$texwidth)*$h/$w.')';
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
@@ -145,7 +155,12 @@ sub end_randomlabel {
if( $count != 0) { $result.= "\n"; }
$result .= "\n
";
} elsif ($target eq 'tex') {
- $result='\end{picture}\\\\';
+ $result='\end{picture}\\\\';
+ if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #"
+ @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
+ my $howtoskipback = $1/45;
+ $result.=' \vskip -'.$howtoskipback.' cm ';
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -184,7 +199,7 @@ sub start_labelgroup {
}
sub add_vars {
- my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;
+ my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
my $out=Apache::run::run($code,$safeeval);
if ($value) {
@@ -193,6 +208,10 @@ sub add_vars {
$code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
$out=Apache::run::run($code,$safeeval);
}
+ if ($image) {
+ my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';";
+ my $out=Apache::run::run($code,$safeeval);
+ }
$code = '${'.$name."}{'numlocations'}='".($order+1)."';";
$out=Apache::run::run($code,$safeeval);
}
@@ -215,13 +234,15 @@ sub end_labelgroup {
my $y = $Apache::randomlabel::ycoord[$_];
my $value = $Apache::randomlabel::value[$_];
if( $type eq 'text') {
- &add_vars($gname,$_,$label,$idx_arr[$_],$value,$safeeval);
+ &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;
} elsif ( $type eq 'image') {
- &add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);
+ &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;
@@ -261,18 +282,20 @@ sub end_labelgroup {
my $x = $Apache::randomlabel::xcoord[$i];
my $y = $Apache::randomlabel::ycoord[$i];
my $value = $Apache::randomlabel::value[$i];
-# my $tcX=$x*($texwidth/$wwidth) - $texwidth;
- my $tcX=($x-10)*($texwidth/$wwidth);
-# my $tcY=$TY1-$y*($TY1/$wheight)-2;
+ #x latex coordinate
+ my $tcX=($x-5)*($texwidth/$wwidth);
+ #y latex coordinate
my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
if( $type eq 'text') {
- &add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);
+ &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
} elsif ( $type eq 'image') {
- &add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);
+ &add_vars($gname,$i,
+ $Apache::randomlabel::description[$idx_arr[$i]],
+ $idx_arr[$i],$value,$label,$safeeval);
} else {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
}