--- loncom/homework/randomlabel.pm 2004/02/11 21:58:15 1.57
+++ loncom/homework/randomlabel.pm 2004/11/13 19:39:45 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.57 2004/02/11 21:58:15 albertel Exp $
+# $Id: randomlabel.pm,v 1.62 2004/11/13 19:39:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -87,14 +87,13 @@ sub start_randomlabel {
my $result='';
push (@Apache::lonxml::namespace,'randomlabel');
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) {
$bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
}
}
- $Apache::randomlabel::tlabel_cnt=0;
- $Apache::randomlabel::ilabel_cnt=0;
+ $Apache::randomlabel::obj_cnt=0;
if ($target eq 'web') {
$cgi_id=&Apache::loncommon::get_cgi_id();
%args=();
@@ -135,10 +134,8 @@ sub end_randomlabel {
my $count;
pop @Apache::lonxml::namespace;
if ($target eq 'web') {
- $count = $Apache::randomlabel::tlabel_cnt;
- if( $count != 0) { $args{"cgi.$cgi_id.COUNT"}=$count; }
- $count = $Apache::randomlabel::ilabel_cnt;
- if( $count != 0) { $args{"cgi.$cgi_id.ICOUNT"}=$count; }
+ $count = $Apache::randomlabel::obj_cnt;
+ if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }
$result.='
'."\n";
&Apache::lonnet::appenv(%args);
} elsif ($target eq 'tex') {
@@ -147,6 +144,7 @@ sub end_randomlabel {
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 } \\\\ ';
} elsif ($target eq 'edit') {
@@ -169,7 +167,6 @@ sub end_bgimg {
my $result='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
my $bgimg=&Apache::lonxml::endredirection;
- &Apache::lonnet::logthis("bgimg is -$bgimg-");
if ($target eq 'web') {
$bgimg=&Apache::imageresponse::clean_up_image($bgimg);
$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
@@ -264,6 +261,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) {
@@ -292,34 +290,25 @@ 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') {
- $args{"cgi.$cgi_id.$str"} =&Apache::lonnet::escape($label);
- $args{"cgi.$cgi_id.$xstr"}=$x;
- $args{"cgi.$cgi_id.$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)
@@ -328,17 +317,8 @@ sub end_labelgroup {
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 $texheight=$texwidth*($wheight/$wwidth);
+
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
&Apache::structuretags::shuffle(\@idx_arr);
@@ -346,13 +326,14 @@ 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);
#y latex coordinate
# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
- my $tcY=$TY1-$y*($TY1/$wheight);
+ my $tcY=$texheight-$y*($texheight/$wheight);
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
@@ -464,6 +445,8 @@ sub end_label {
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);
}