--- loncom/homework/randomlabel.pm 2002/02/05 16:21:03 1.12 +++ loncom/homework/randomlabel.pm 2002/04/08 21:28:53 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.12 2002/02/05 16:21:03 sakharuk Exp $ +# $Id: randomlabel.pm,v 1.23 2002/04/08 21:28:53 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,21 +58,32 @@ # =========================================== package Apache::randomlabel; 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=''; - $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'}//; @@ -83,8 +94,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/'; } @@ -100,11 +111,13 @@ sub start_randomlabel { $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$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', @@ -121,8 +134,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.= ""; } @@ -155,7 +167,7 @@ sub start_labelgroup { $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'); @@ -245,8 +257,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) - $texwidth; - my $tcY=$TY1-$y*($TY1/$wheight)-2; +# my $tcX=$x*($texwidth/$wwidth) - $texwidth; + my $tcX=$x*($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 +282,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); @@ -279,7 +294,7 @@ sub start_location { $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, @@ -306,16 +321,17 @@ 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::editfield('',$text,'',20,1). + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(). + &Apache::edit::editline('',$text,'',20). &Apache::edit::end_table(); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/label"); - $result.=&Apache::edit::modifiedfield($token); + $result.='