--- loncom/homework/randomlabel.pm 2002/01/21 16:40:57 1.11 +++ loncom/homework/randomlabel.pm 2002/04/26 18:19:40 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.11 2002/01/21 16:40:57 matthew Exp $ +# $Id: randomlabel.pm,v 1.25 2002/04/26 18:19:40 sakharuk 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,8 +95,8 @@ 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); + 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/'; } @@ -95,16 +106,21 @@ sub start_randomlabel { $result.=""; $result.=""; } 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). - &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + $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', @@ -121,8 +137,7 @@ 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.= ""; } @@ -130,7 +145,7 @@ sub end_randomlabel { if( $count != 0) { $result.= ""; } $result .= "
"; } elsif ($target eq 'tex') { - $result='\end{picture}'; + $result='\end{picture}\\\\'; } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } @@ -245,8 +260,11 @@ 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); - my $tcY=$TY1-$y*($TY1/$wheight)-2; +# 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"; @@ -267,8 +285,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); @@ -306,12 +324,13 @@ sub start_label { 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]); push(@Apache::randomlabel::label_arr,$ltext); } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); 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::editline('',$text,'',20). &Apache::edit::end_table(); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/label");