[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm

[sakharuk]

sakharuk		Wed Mar  6 15:41:18 2002 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  corrected algorithm for calculating coordinates, added one Global in this module variable
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.15 loncom/homework/randomlabel.pm:1.16
--- loncom/homework/randomlabel.pm:1.15	Wed Mar  6 15:29:03 2002
+++ loncom/homework/randomlabel.pm	Wed Mar  6 15:41:17 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.15 2002/03/06 20:29:03 matthew Exp $
+# $Id: randomlabel.pm,v 1.16 2002/03/06 20:41:17 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,6 +86,7 @@
   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 = $h/$w;
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   if (!$code) { $code='GLabel.class'; }
   if (!$codebase) { $codebase='/res/adm/includes/'; }
@@ -247,8 +248,10 @@
       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 $tcY=$TY1-$y*($TY1/$wheight)-2;
+#      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;
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";