--- loncom/homework/randomlabel.pm	2002/02/14 21:37:26	1.14
+++ 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.14 2002/02/14 21:37:26 albertel Exp $
+# $Id: randomlabel.pm,v 1.19 2002/03/08 20:43:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,11 +101,13 @@ 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).'<br />'.
-      &Apache::edit::text_arg('Width(pixel):','width',$token,4).
-	&Apache::edit::text_arg('Height(pixel):','height',$token,4).
-	  &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).
-	     &Apache::edit::end_row().&Apache::edit::start_spanning_row();     
+    $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
+    $result.=&Apache::edit::browse('bgimg').' ';
+    $result.=&Apache::edit::search('bgimg').'<br />'.
+        &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).
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row();     
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'bgimg','width','height',
@@ -246,8 +248,11 @@ sub end_labelgroup {
       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 $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";