--- loncom/homework/randomlabel.pm 2001/10/13 05:57:43 1.4 +++ loncom/homework/randomlabel.pm 2002/05/17 21:27:44 1.27 @@ -1,5 +1,30 @@ # The LearningOnline Network with CAPA # random labelling tool +# +# $Id: randomlabel.pm,v 1.27 2002/05/17 21:27:44 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 7/20/2001 Isaac Tsai, initial syntax # 8/10/2001 Isaac Tsai, # 8/30/2001 Isaac Tsai, @@ -32,39 +57,70 @@ # (21,54) : $GroupTwo[2] = "TEXT-2" # =========================================== package Apache::randomlabel; +use Apache::lonnet; use strict; +use Apache::edit; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label')); } +sub check_int { + # utility function to do error checking on a integer. + my ($num,$default) = @_; + $default = 100 if (! defined($default)); + $num =~ s/\s+//g; # We dont need no stinkin white space! + # If it is a real, just grab the integer part. + ($num,undef) = split (/\./,$num) if ($num =~ /\./); + # set to default if what we have left doesn't match anything... + $num = $default unless ($num =~/^\d+$/); + return $num; +} + sub start_randomlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; + push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class'); + push (@Apache::lonxml::namespace,'randomlabel'); my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); + if ( $bgimg !~ /^http:/ ) { + push (@Apache::lonxml::extlinks,$bgimg); + $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg); + if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) { + $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//; + } elsif ($bgimg =~ m:^/home/.*/public_html:) { + $bgimg =~ s:^/home/(.*)/public_html:/~$1:; + } + $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg; + } my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval); my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval); - my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval); - my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval); + my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval)); + my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval)); my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval); if (!$code) { $code='GLabel.class'; } if (!$codebase) { $codebase='/res/adm/includes/'; } $Apache::randomlabel::tlabel_cnt=0; $Apache::randomlabel::ilabel_cnt=0; if ($target eq 'web') { - $result.=""; - $result.=""; + $result.="\n"; + $result.="\n"; } elsif ($target eq 'tex') { - $bgimg=~s/(.gif|.jpg)$/.ps/; - $result.='\vspace*{2mm} \\ \noindent \epsfxsize='.$texwidth.' \epsffile{'. - $bgimg.'}\setlength{\unitlength}{1mm} \\ \begin{picture}(0,0)(0,-5)'; + $bgimg=~s/(.gif|.jpg)$/.eps/; + $bgimg= &Apache::lonnet::filelocation($bgimg); + $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.')' } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).'
'. - &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). - ''; + $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '; + $result.=&Apache::edit::browse('bgimg').' '; + $result.=&Apache::edit::search('bgimg').'
'. + &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', @@ -81,16 +137,15 @@ sub end_randomlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; my $count; - - + pop @Apache::lonxml::namespace; if ($target eq 'web') { $count = $Apache::randomlabel::tlabel_cnt; - if( $count != 0) { $result.= ""; } + if( $count != 0) { $result.= "\n"; } $count = $Apache::randomlabel::ilabel_cnt; - if( $count != 0) { $result.= ""; } - $result .= "
"; + if( $count != 0) { $result.= "\n"; } + $result .= "\n
"; } elsif ($target eq 'tex') { - $result='\end{picture}'; + $result='\end{picture}\\\\'; } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } @@ -103,17 +158,20 @@ sub start_labelgroup { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); $type =~tr/A-Z/a-z/; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer') { $Apache::randomlabel::groupname=$name; $Apache::randomlabel::type=$type; @Apache::randomlabel::xcoord = (); @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). &Apache::edit::select_arg('Type:','type',['text','image'],$token). - ''; + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, 'name','type'); @@ -125,22 +183,27 @@ sub start_labelgroup { return $result; } -sub add_var { - my ($name,$value,$type,$safeeval) = @_; - if ($type eq 'array') { - my $code = 'push(@'.$name.',\''.$value.'\');'; - my $out=Apache::run::run($code,$safeeval); - } else { - &Apache::lonxml::error('Unsupported add_var type :'.$type.':'); +sub add_vars { + my ($name,$order,$label,$labelorder,$value,$safeeval) = @_; + my $code = '${'.$name."}{'".($order+1)."'}='".$label."';"; + my $out=Apache::run::run($code,$safeeval); + if ($value) { + $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';"; + $out=Apache::run::run($code,$safeeval); + $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';"; + $out=Apache::run::run($code,$safeeval); } + $code = '${'.$name."}{'numlocations'}='".($order+1)."';"; + $out=Apache::run::run($code,$safeeval); } + # begin to assign labels to locations sub end_labelgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $gname = $Apache::randomlabel::groupname; my $type = $Apache::randomlabel::type; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') { my @idx_arr = (0 .. $#Apache::randomlabel::label_arr); &Apache::structuretags::shuffle(\@idx_arr); for(0 .. $#Apache::randomlabel::label_arr) { @@ -148,26 +211,29 @@ sub end_labelgroup { my $xstr; my $ystr; my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]"; + my $x = $Apache::randomlabel::xcoord[$_]; + my $y = $Apache::randomlabel::ycoord[$_]; + my $value = $Apache::randomlabel::value[$_]; if( $type eq 'text') { - &add_var($gname,$label,'array',$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_var($gname,$idx_arr[$_],'array',$safeeval); - $str = 'LB'.$Apache::randomlabel::ilabel_cnt; - $xstr = 'X'.$Apache::randomlabel::ilabel_cnt; - $ystr = 'Y'.$Apache::randomlabel::ilabel_cnt; + &add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$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.':'); } - my $x = $Apache::randomlabel::xcoord[$_]; - my $y = $Apache::randomlabel::ycoord[$_]; - $result .= ''; - $result .= ''; - $result .= ''; + if ($target eq 'web') { + $result .= ''; + $result .= ''; + $result .= ''."\n"; + } } } elsif ($target eq 'tex') { my $WX1=0; # Web x-coord. of upper left corner (ULC) @@ -194,15 +260,19 @@ sub end_labelgroup { my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]"; my $x = $Apache::randomlabel::xcoord[$i]; my $y = $Apache::randomlabel::ycoord[$i]; - my $tcX=$x*($texwidth/$wwidth); - my $tcY=$TY1-$y*($TY1/$wheight)-2; + 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; + 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_var($gname,$label,'array',$safeeval); + &add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval); } elsif ( $type eq 'image') { - &add_var($gname,$idx_arr[$i],'array',$safeeval); + &add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval); } else { &Apache::lonxml::error('Unknown type of label :'.$type.':'); } @@ -213,23 +283,26 @@ sub end_labelgroup { return $result; } -# +# sub start_location { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $x= &Apache::lonxml::get_param('x',$parstack,$safeeval); - my $y= &Apache::lonxml::get_param('y',$parstack,$safeeval); + my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50); + my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50); + my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval); my $result=''; push(@Apache::randomlabel::xcoord,$x); push(@Apache::randomlabel::ycoord,$y); + push(@Apache::randomlabel::value,$value); if ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('X:','x',$token,4). &Apache::edit::text_arg('Y:','y',$token,4). - ''; + &Apache::edit::text_arg('Value:','value',$token). + &Apache::edit::end_row(); $result.=&Apache::edit::end_table; } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'x','y'); + 'x','y','value'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); @@ -249,17 +322,44 @@ sub end_location { sub start_label { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + 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::editfield('',$text,'',20,1). - &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 = '