--- loncom/homework/randomlabel.pm 2002/03/06 21:56:27 1.17 +++ loncom/homework/randomlabel.pm 2002/05/17 21:27:44 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.17 2002/03/06 21:56:27 matthew Exp $ +# $Id: randomlabel.pm,v 1.27 2002/05/17 21:27:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,6 +57,7 @@ # (21,54) : $GroupTwo[2] = "TEXT-2" # =========================================== package Apache::randomlabel; +use Apache::lonnet; use strict; use Apache::edit; @@ -64,16 +65,26 @@ 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=''; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - '/res/adm/includes/GLabel.class'; - + 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:/ ) { - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg; + 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'}//; @@ -84,26 +95,28 @@ sub start_randomlabel { } 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); - $Apache::randomlabel::ratio = ($w > 0 ? $h/$w : 1 ); + 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)$/.eps/; - $bgimg=~s/http:\/\/[^\/]*/\/home\/httpd\/html/; + $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}('.$texwidth.','.$texwidth*$h/$w.')' + $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); - $result.=&Apache::edit::browse('bgimg').'
'. + $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). @@ -124,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; } @@ -154,6 +166,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). @@ -209,9 +222,9 @@ sub end_labelgroup { $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; + $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.':'); @@ -219,7 +232,7 @@ sub end_labelgroup { if ($target eq 'web') { $result .= ''; $result .= ''; - $result .= ''; + $result .= ''."\n"; } } } elsif ($target eq 'tex') { @@ -249,9 +262,10 @@ sub end_labelgroup { my $y = $Apache::randomlabel::ycoord[$i]; my $value = $Apache::randomlabel::value[$i]; # my $tcX=$x*($texwidth/$wwidth) - $texwidth; - my $tcX=$x*($texwidth/$wwidth); + my $tcX=($x-10)*($texwidth/$wwidth); # my $tcY=$TY1-$y*($TY1/$wheight)-2; - my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$Apache::randomlabel::ratio; + 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"; @@ -272,8 +286,8 @@ sub end_labelgroup { # 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); @@ -308,20 +322,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::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.='