--- loncom/homework/randomlabel.pm 2002/01/21 16:40:57 1.11 +++ loncom/homework/randomlabel.pm 2002/08/02 18:20:48 1.33 @@ -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.33 2002/08/02 18:20:48 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,47 +65,72 @@ 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'}//; } elsif ($bgimg =~ m:^/home/.*/public_html:) { $bgimg =~ s:^/home/(.*)/public_html:/~$1:; } - $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg; + $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); + if (not $ENV{'request.role'}=~/^au\./) { + $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/; + } else { + $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/; + + } + $bgimg=~s/\/$//; + if ($texwidth==90) { + $result.='\vspace*{2mm} \parbox{\textwidth}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'. + $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'; + } else { + $result.='\vspace*{2mm} \parbox{\textwidth}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'. + $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')('.(100-$texwidth).','.(100-$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,16 +147,20 @@ 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}\\\\}'; + if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #" + @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/; + my $howtoskipback = $1/48; + $result.=' \vskip -'.$howtoskipback.' cm '; + } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } @@ -151,6 +181,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). @@ -168,7 +199,7 @@ sub start_labelgroup { } sub add_vars { - my ($name,$order,$label,$labelorder,$value,$safeeval) = @_; + my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_; my $code = '${'.$name."}{'".($order+1)."'}='".$label."';"; my $out=Apache::run::run($code,$safeeval); if ($value) { @@ -177,6 +208,10 @@ sub add_vars { $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';"; $out=Apache::run::run($code,$safeeval); } + if ($image) { + my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';"; + my $out=Apache::run::run($code,$safeeval); + } $code = '${'.$name."}{'numlocations'}='".($order+1)."';"; $out=Apache::run::run($code,$safeeval); } @@ -199,16 +234,18 @@ sub end_labelgroup { my $y = $Apache::randomlabel::ycoord[$_]; my $value = $Apache::randomlabel::value[$_]; if( $type eq 'text') { - &add_vars($gname,$_,$label,$idx_arr[$_],$value,$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_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; + &add_vars($gname,$_, + $Apache::randomlabel::description[$idx_arr[$_]], + $idx_arr[$_],$value,$label,$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.':'); @@ -216,7 +253,7 @@ sub end_labelgroup { if ($target eq 'web') { $result .= ''; $result .= ''; - $result .= ''; + $result .= ''."\n"; } } } elsif ($target eq 'tex') { @@ -245,15 +282,20 @@ 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; + #x latex coordinate + my $tcX=($x-5)*($texwidth/$wwidth); + #y latex coordinate + 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_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval); + &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval); } elsif ( $type eq 'image') { - &add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval); + &add_vars($gname,$i, + $Apache::randomlabel::description[$idx_arr[$i]], + $idx_arr[$i],$value,$label,$safeeval); } else { &Apache::lonxml::error('Unknown type of label :'.$type.':'); } @@ -267,8 +309,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); @@ -303,19 +345,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.='