--- loncom/homework/randomlabel.pm 2002/03/06 20:41:17 1.16 +++ loncom/homework/randomlabel.pm 2002/03/08 18:31:27 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.16 2002/03/06 20:41:17 sakharuk Exp $ +# $Id: randomlabel.pm,v 1.18 2002/03/08 18:31:27 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,7 +86,7 @@ sub start_randomlabel { 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 = $h/$w; + $Apache::randomlabel::ratio = ($w > 0 ? $h/$w : 1 ); my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval); if (!$code) { $code='GLabel.class'; } if (!$codebase) { $codebase='/res/adm/includes/'; } @@ -102,8 +102,9 @@ 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); - $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).