--- loncom/homework/randomlabel.pm 2002/03/06 21:56:27 1.17
+++ loncom/homework/randomlabel.pm 2002/03/08 20:43:06 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.17 2002/03/06 21:56:27 matthew Exp $
+# $Id: randomlabel.pm,v 1.19 2002/03/08 20:43:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -86,7 +86,6 @@ sub start_randomlabel {
my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);
- $Apache::randomlabel::ratio = ($w > 0 ? $h/$w : 1 );
my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
if (!$code) { $code='GLabel.class'; }
if (!$codebase) { $codebase='/res/adm/includes/'; }
@@ -102,8 +101,9 @@ sub start_randomlabel {
$bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
- $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75);
- $result.=&Apache::edit::browse('bgimg').'
'.
+ $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
+ $result.=&Apache::edit::browse('bgimg').' ';
+ $result.=&Apache::edit::search('bgimg').'
'.
&Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6).
&Apache::edit::text_arg('Height(pixel):','height' ,$token,6).
&Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
@@ -251,7 +251,8 @@ sub end_labelgroup {
# my $tcX=$x*($texwidth/$wwidth) - $texwidth;
my $tcX=$x*($texwidth/$wwidth);
# my $tcY=$TY1-$y*($TY1/$wheight)-2;
- my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$Apache::randomlabel::ratio;
+ 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";