--- loncom/homework/randomlabel.pm 2002/04/26 18:19:40 1.25
+++ loncom/homework/randomlabel.pm 2002/08/02 18:20:48 1.33
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.25 2002/04/26 18:19:40 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.33 2002/08/02 18:20:48 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,7 +91,7 @@ sub start_randomlabel {
} 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);
@@ -103,15 +103,25 @@ sub start_randomlabel {
$Apache::randomlabel::tlabel_cnt=0;
$Apache::randomlabel::ilabel_cnt=0;
if ($target eq 'web') {
- $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";
- $result.="<param name=\"bgimg\" value=\"$bgimg\">";
+ $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";
+ $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";
} 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}(0,0)('.$texwidth.','.$texwidth*$h/$w.')'
+ if ($texwidth==90) {
+ $result.='\vspace*{2mm} \parbox{\textwidth}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$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.')';
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
@@ -140,12 +150,17 @@ sub end_randomlabel {
pop @Apache::lonxml::namespace;
if ($target eq 'web') {
$count = $Apache::randomlabel::tlabel_cnt;
- if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }
+ if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }
$count = $Apache::randomlabel::ilabel_cnt;
- if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }
- $result .= "</applet><BR />";
+ if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
+ $result .= "</applet>\n<BR />";
} elsif ($target eq 'tex') {
- $result='\end{picture}\\\\';
+ $result='\end{picture}\\\\}';
+ if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #"
+ @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
+ my $howtoskipback = $1/48;
+ $result.=' \vskip -'.$howtoskipback.' cm ';
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -166,6 +181,7 @@ sub start_labelgroup {
@Apache::randomlabel::ycoord = ();
@Apache::randomlabel::value = ();
@Apache::randomlabel::label_arr = ();
+ @Apache::randomlabel::decription = ();
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token).
@@ -183,7 +199,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) {
@@ -192,6 +208,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);
}
@@ -214,16 +234,18 @@ 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);
- $str = 'LB'.$Apache::randomlabel::ilabel_cnt;
- $xstr = 'X'.$Apache::randomlabel::ilabel_cnt;
- $ystr = 'Y'.$Apache::randomlabel::ilabel_cnt;
+ &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;
$Apache::randomlabel::ilabel_cnt += 1;
} else {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
@@ -231,7 +253,7 @@ sub end_labelgroup {
if ($target eq 'web') {
$result .= '<param name="' . $str . '" value="'.$label.'">';
$result .= '<param name="' . $xstr . '" value="'.$x.'">';
- $result .= '<param name="' . $ystr . '" value="'.$y.'">';
+ $result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";
}
}
} elsif ($target eq 'tex') {
@@ -260,18 +282,20 @@ 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 $tcX=($x-10)*($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);
$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.':');
}
@@ -321,20 +345,45 @@ sub end_location {
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
+ my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
if ($target eq 'web' || $target eq 'tex' ||
$target eq 'grade' || $target eq 'answer') {
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
+ if ($type eq 'image') {
+ &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
+ $ltext="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],
+ $ltext);
+ &Apache::lonxml::debug("into $ltext");
+ my $description = &Apache::lonxml::get_param('description',
+ $parstack,$safeeval);
+ push(@Apache::randomlabel::description,$description);
+ }
push(@Apache::randomlabel::label_arr,$ltext);
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::tag_start($target,$token,"$type Label");
my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
- $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',20).
- &Apache::edit::end_table();
+ if ($type eq 'image') {
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Description:','description',$token);
+ }
+ if ($type eq 'text') { $result.="Label Text:"; }
+ if ($type eq 'image') { $result.="Path to image:"; }
+ $result.=&Apache::edit::editline('',$text,'',20).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/label");
- $result.='<label>'.&Apache::edit::modifiedfield($token);
+ $result = '<label>';
+ if ($type eq 'image') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'description');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ } else {
+ $result = $token->[4];
+ }
+ }
+ $result.=&Apache::edit::modifiedfield($token);
}
return $result;
}