--- loncom/homework/randomlabel.pm	2002/05/17 21:27:44	1.27
+++ loncom/homework/randomlabel.pm	2002/07/18 20:17:45	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.27 2002/05/17 21:27:44 albertel Exp $
+# $Id: randomlabel.pm,v 1.30 2002/07/18 20:17:45 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,7 +111,7 @@ sub start_randomlabel {
     $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).' ';
@@ -145,7 +145,7 @@ sub end_randomlabel {
     if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
     $result .= "</applet>\n<BR />";
   } elsif ($target eq 'tex') {
-    $result='\end{picture}\\\\';
+    $result='\end{picture}\\\\ \vskip -3 cm';
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;
   }
@@ -184,7 +184,7 @@ sub start_labelgroup {
 }
 
 sub add_vars {
-  my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;
+  my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
   my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
   my $out=Apache::run::run($code,$safeeval);
   if ($value) {
@@ -193,6 +193,10 @@ sub add_vars {
     $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
     $out=Apache::run::run($code,$safeeval);
   }
+  if ($image) {
+      my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';";
+      my $out=Apache::run::run($code,$safeeval);
+  }
   $code = '${'.$name."}{'numlocations'}='".($order+1)."';";
   $out=Apache::run::run($code,$safeeval);
 }
@@ -215,13 +219,15 @@ sub end_labelgroup {
       my $y = $Apache::randomlabel::ycoord[$_];
       my $value = $Apache::randomlabel::value[$_];
       if( $type eq 'text') {
-	&add_vars($gname,$_,$label,$idx_arr[$_],$value,$safeeval);
+	&add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
 	$str = 'LB'.$Apache::randomlabel::tlabel_cnt;
 	$xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
 	$ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
 	$Apache::randomlabel::tlabel_cnt += 1;
       } elsif ( $type eq 'image') {
-	&add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);
+	&add_vars($gname,$_,
+		  $Apache::randomlabel::description[$idx_arr[$_]],
+		  $idx_arr[$_],$value,$label,$safeeval);
 	$str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
 	$xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
 	$ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
@@ -262,7 +268,7 @@ sub end_labelgroup {
       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-2)*($texwidth/$wwidth);
 #      my $tcY=$TY1-$y*($TY1/$wheight)-2;
       my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
@@ -270,9 +276,11 @@ sub end_labelgroup {
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {
-	&add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);
+	&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
       } elsif ( $type eq 'image') {
-	&add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);
+	&add_vars($gname,$i,
+		  $Apache::randomlabel::description[$idx_arr[$i]],
+		  $idx_arr[$i],$value,$label,$safeeval);
       } else {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }