Diff for /loncom/homework/randomlabel.pm between versions 1.18 and 1.19

version 1.18, 2002/03/08 18:31:27 version 1.19, 2002/03/08 20:43:06
Line 86  sub start_randomlabel { Line 86  sub start_randomlabel {
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);    my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);    my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
   my $h= &Apache::lonxml::get_param('height',$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);    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   if (!$code) { $code='GLabel.class'; }    if (!$code) { $code='GLabel.class'; }
   if (!$codebase) { $codebase='/res/adm/includes/'; }    if (!$codebase) { $codebase='/res/adm/includes/'; }
Line 252  sub end_labelgroup { Line 251  sub end_labelgroup {
 #      my $tcX=$x*($texwidth/$wwidth) - $texwidth;  #      my $tcX=$x*($texwidth/$wwidth) - $texwidth;
       my $tcX=$x*($texwidth/$wwidth);        my $tcX=$x*($texwidth/$wwidth);
 #      my $tcY=$TY1-$y*($TY1/$wheight)-2;  #      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);        $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);        $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";        $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";

Removed from v.1.18  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>