[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm
sakharuk
lon-capa-cvs@mail.lon-capa.org
Wed, 07 Aug 2002 21:49:35 -0000
sakharuk Wed Aug 7 17:49:35 2002 EDT
Modified files:
/loncom/homework randomlabel.pm
Log:
Changed algorithm for placing labels and converting width of the box.
In addition now picture is adjusted to the left side of the page.
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.33 loncom/homework/randomlabel.pm:1.34
--- loncom/homework/randomlabel.pm:1.33 Fri Aug 2 14:20:48 2002
+++ loncom/homework/randomlabel.pm Wed Aug 7 17:49:35 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.33 2002/08/02 18:20:48 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.34 2002/08/07 21:49:35 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -115,12 +115,13 @@
}
$bgimg=~s/\/$//;
+ my $dirtywidth=$texwidth+5;
if ($texwidth==90) {
- $result.='\vspace*{2mm} \parbox{\textwidth}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')';
+ $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
} else {
- $result.='\vspace*{2mm} \parbox{\textwidth}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')('.(100-$texwidth).','.(100-$texwidth)*$h/$w.')';
+ $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -156,11 +157,14 @@
$result .= "</applet>\n<BR />";
} elsif ($target eq 'tex') {
$result='\end{picture}\\\\}';
- if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #"
@$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
- my $howtoskipback = $1/48;
- $result.=' \vskip -'.$howtoskipback.' cm ';
- }
+ my $one=$1;
+ @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
+ my $two=$1;
+ @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
+ my $three=$1;
+ my $howtoskipback = $three*$one/$two;
+ $result.=' \vskip -'.$howtoskipback.' mm ';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -283,10 +287,10 @@
my $y = $Apache::randomlabel::ycoord[$i];
my $value = $Apache::randomlabel::value[$i];
#x latex coordinate
- my $tcX=($x-5)*($texwidth/$wwidth);
+ my $tcX=($x)*($texwidth/$wwidth);
#y latex coordinate
- my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
- my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
+# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
+ my $tcY=$TY1-$y*($TY1/$wheight);
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";