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

[sakharuk]

sakharuk		Mon Jul 22 13:15:55 2002 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  Now 1. Correctly reproduce random labelling;
      2. Automatically adjust size of the original eps picture
         to the LaTeX picture environment;
      3. Automatically remove blank space after images (does not matter
         of the size of this blank space). 
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.30 loncom/homework/randomlabel.pm:1.31
--- loncom/homework/randomlabel.pm:1.30	Thu Jul 18 16:17:45 2002
+++ loncom/homework/randomlabel.pm	Mon Jul 22 13:15:55 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.30 2002/07/18 20:17:45 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.31 2002/07/22 17:15:55 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,7 +91,7 @@
     } elsif ($bgimg =~ m:^/home/.*/public_html:) {
       $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
     }
-    $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
+    $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
   }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
@@ -108,10 +108,20 @@
   } elsif ($target eq 'tex') {
     $bgimg=~s/(.gif|.jpg)$/.eps/;
     $bgimg= &Apache::lonnet::filelocation($bgimg);
-    $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+    if (not $ENV{'request.role'}=~/^au\./) {
+	$bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+    } else {
+	$bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;
+
+    }
     $bgimg=~s/\/$//;
-    $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
-    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'
+    if ($texwidth==90) {
+	$result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+	    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')';
+    } else {
+	$result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+	    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')('.(100-$texwidth).','.(100-$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 +155,12 @@
     if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
     $result .= "</applet>\n<BR />";
   } elsif ($target eq 'tex') {
-    $result='\end{picture}\\\\ \vskip -3 cm';
+      $result='\end{picture}\\\\';
+      if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #"
+	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
+	  my $howtoskipback = $1/45;
+	  $result.=' \vskip -'.$howtoskipback.' cm ';
+      }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;
   }
@@ -267,9 +282,9 @@
       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 $tcX=($x-2)*($texwidth/$wwidth);
-#      my $tcY=$TY1-$y*($TY1/$wheight)-2;
+      #x latex coordinate
+      my $tcX=($x-5)*($texwidth/$wwidth);
+      #y latex coordinate
       my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
       $tcX=sprintf('%.2f',$tcX);