--- loncom/homework/randomlabel.pm 2002/05/17 21:16:55 1.26
+++ loncom/homework/randomlabel.pm 2002/10/22 21:25:34 1.38
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.26 2002/05/17 21:16:55 albertel Exp $
+# $Id: randomlabel.pm,v 1.38 2002/10/22 21:25:34 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,6 +60,8 @@ package Apache::randomlabel;
use Apache::lonnet;
use strict;
use Apache::edit;
+use Apache::File();
+use Apache::Constants qw(:common :http);
BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
@@ -91,7 +93,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);
@@ -106,12 +108,44 @@ sub start_randomlabel {
$result.="\n
";
} elsif ($target eq 'tex') {
- $result='\end{picture}\\\\';
+ $result='\end{picture}\\\\';
+ @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
+ my $one=$1;
+ @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
+ my $two=$1;
+ @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
+ my $three=$1;
+ my $howtoskipback = $three*$one/$two;
+ $result.=' \vskip -'.$howtoskipback.' mm }';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -158,8 +200,8 @@ sub start_labelgroup {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
$type =~tr/A-Z/a-z/;
- if ($target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
$Apache::randomlabel::groupname=$name;
$Apache::randomlabel::type=$type;
@Apache::randomlabel::xcoord = ();
@@ -184,7 +226,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 +235,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);
}
@@ -203,7 +249,8 @@ sub end_labelgroup {
my $gname = $Apache::randomlabel::groupname;
my $type = $Apache::randomlabel::type;
my $result='';
- if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' ||
+ $target eq 'analyze') {
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
&Apache::structuretags::shuffle(\@idx_arr);
for(0 .. $#Apache::randomlabel::label_arr) {
@@ -215,13 +262,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 +310,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;
- my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
- my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
+ #x latex coordinate
+ my $tcX=($x)*($texwidth/$wwidth);
+ #y latex coordinate
+# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
+ my $tcY=$TY1-$y*($TY1/$wheight);
$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.':');
}
@@ -323,8 +374,8 @@ sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
- if ($target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
+ 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[-1]);
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
if ($type eq 'image') {
@@ -339,9 +390,11 @@ sub start_label {
push(@Apache::randomlabel::label_arr,$ltext);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,"$type Label");
- $result.=&Apache::edit::text_arg('Description:','description',$token);
my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
- $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ if ($type eq 'image') {
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Description:','description',$token);
+ }
if ($type eq 'text') { $result.="Label Text:"; }
if ($type eq 'image') { $result.="Path to image:"; }
$result.=&Apache::edit::editline('',$text,'',20).