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

[sakharuk]

sakharuk		Thu Jul 18 15:40:15 2002 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  Restored correct printing after Guy's corrections.
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.28 loncom/homework/randomlabel.pm:1.29
--- loncom/homework/randomlabel.pm:1.28	Mon May 20 16:35:13 2002
+++ loncom/homework/randomlabel.pm	Thu Jul 18 15:40:15 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.28 2002/05/20 20:35:13 albertel Exp $
+# $Id: randomlabel.pm,v 1.29 2002/07/18 19:40:15 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,7 +111,7 @@
     $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
     $bgimg=~s/\/$//;
     $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}(0,0)('.$texwidth.','.$texwidth*$h/$w.')'
+    $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).' ';
@@ -268,7 +268,7 @@
       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 $tcX=($x)*($texwidth/$wwidth);
 #      my $tcY=$TY1-$y*($TY1/$wheight)-2;
       my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;