Diff for /loncom/homework/randomlabel.pm between versions 1.63 and 1.64

version 1.63, 2004/12/04 01:15:41 version 1.64, 2005/02/10 23:00:10
Line 82  sub check_int { Line 82  sub check_int {
     return $num;      return $num;
 }  }
   
   my ($height_param,$width_param);
 sub start_randomlabel {  sub start_randomlabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     push (@Apache::lonxml::namespace,'randomlabel');      push (@Apache::lonxml::namespace,'randomlabel');
       ($height_param,$width_param)=(0,0);
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);      my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
     if ( defined($bgimg) && $bgimg !~ /^http:/ ) {      if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
  $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);   $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
Line 98  sub start_randomlabel { Line 100  sub start_randomlabel {
  $cgi_id=&Apache::loncommon::get_cgi_id();   $cgi_id=&Apache::loncommon::get_cgi_id();
  %args=();   %args=();
  $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);   $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex' && defined($bgimg)) {
  my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));   $result.=&make_eps_image($bgimg,$parstack,$safeeval);
  my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));  
  my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));  
  if (!$texwidth) { $texwidth=90; }  
  $result.=&make_eps_image($bgimg,$texwidth,$h,$w);  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $Apache::edit::bgimgsrc=   $Apache::edit::bgimgsrc=
Line 140  sub end_randomlabel { Line 138  sub end_randomlabel {
  &Apache::lonnet::appenv(%args);   &Apache::lonnet::appenv(%args);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result='\end{picture}\\\\';   $result='\end{picture}\\\\';
  my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);   $result.= ' \vskip -'.$height_param.' mm }  \\\\ ';
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);  
  my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));  
         if (!$texwidth) { $texwidth=90; }  
  # what if width is undefined?  
  my $howtoskipback = $texwidth*$height/$width;  
  $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table;   $result.=&Apache::edit::end_table;
     }      }
Line 157  sub start_bgimg { Line 149  sub start_bgimg {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection(); 
     }      }
     return $result;      return $result;
 }  }
Line 166  sub end_bgimg { Line 158  sub end_bgimg {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
  my $bgimg=&Apache::lonxml::endredirection;    my $bgimg=&Apache::lonxml::endredirection(); 
  if ($target eq 'web') {   if ($target eq 'web') {
     $bgimg=&Apache::imageresponse::clean_up_image($bgimg);      $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
     $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);      $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $w=&check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval,-2));      $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
     my $h=&check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval,-2));  
     my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,-2));  
     if (!$texwidth) { $texwidth=90; }  
     $result.=&make_eps_image($bgimg,$texwidth,$h,$w);  
  }   }
     }      }
     return $result;      return $result;
 }  }
   
 sub make_eps_image {  sub make_eps_image {
     my ($bgimg,$texwidth,$h,$w)=@_;      my ($bgimg,$parstack,$safeeval,$depth)=@_;
     my $newbgimg = $bgimg;      my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg);
     $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;      ($height_param,$width_param)=
     $bgimg= &Apache::lonnet::filelocation($bgimg);   &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
     $bgimg=~s|http:/[^/]*|/home/httpd/html|;         $depth,1);
     $bgimg=~s|/$||;      my $dirtywidth=$width_param+5;
     #if no eps file try to replicate it  
     if (not-e $bgimg) {  
  if (&Apache::lonnet::repcopy($bgimg) ne OK ) {  
     #if replication failed try to find ps file  
     $bgimg=~s/\.eps$/\.ps/;  
     #if no ps file try to replicate it  
     if (not -e $bgimg &&  
  &Apache::lonnet::repcopy($bgimg) ne OK) {  
  #if replication failed try to produce eps file dynamically  
  $bgimg=~s/\.ps$/\.eps/;  
  my $temp_file;  
  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";  
  $temp_file = Apache::File->new('>>'.$filename);  
  $newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|;  
  print $temp_file "$newbgimg\n";  
  $bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;  
  $bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;  
     }  
  }  
     }  
     $bgimg=~s|/$||;  
     my $dirtywidth=$texwidth+5;  
     my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.      my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.
  ' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.$bgimg.   ' mm}{  \noindent \epsfxsize='.$width_param.
    ' mm \epsffile{'.$path.$file.
  '}\setlength{\unitlength}{1mm}  \begin{picture}('.   '}\setlength{\unitlength}{1mm}  \begin{picture}('.
  $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';   $width_param.','.$height_param.')(0,-'.$height_param.')';
     return $result;      return $result;
 }  }
   
 sub adjust_textwidth {  
     my $texwidth=shift;   
     my $pagewidth=$ENV{'form.textwidth'};  
     $pagewidth=~s/\s*mm\s*$//;  
     if ($texwidth>$pagewidth) {$texwidth=$pagewidth;}  
     return $texwidth;  
 }  
   
 sub start_labelgroup {  sub start_labelgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
Line 325  sub end_labelgroup { Line 284  sub end_labelgroup {
  my $WY1=0; #  Web y-coord. of (ULC)   my $WY1=0; #  Web y-coord. of (ULC)
  my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);   my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
  my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);   my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
  my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));  
  my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);   my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
  if (!defined($TeXsize)) { $TeXsize='\\normalsize'; }   if (!defined($TeXsize)) { $TeXsize='\\normalsize'; }
  if (!$texwidth) { $texwidth=90; }  
  my $texheight=$texwidth*($wheight/$wwidth);  
   
  my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);   my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
  &Apache::structuretags::shuffle(\@idx_arr);   &Apache::structuretags::shuffle(\@idx_arr);
Line 342  sub end_labelgroup { Line 298  sub end_labelgroup {
     my $y = $Apache::randomlabel::ycoord[$i]-3.5;      my $y = $Apache::randomlabel::ycoord[$i]-3.5;
     my $value = $Apache::randomlabel::value[$i];      my $value = $Apache::randomlabel::value[$i];
     #x latex coordinate      #x latex coordinate
     my $tcX=($x)*($texwidth/$wwidth);      my $tcX=($x)*($width_param/$wwidth);
     #y latex coordinate      #y latex coordinate
             #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );              #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
     my $tcY=$texheight-$y*($texheight/$wheight);      my $tcY=$height_param-$y*($height_param/$wheight);
     $tcX=sprintf('%.2f',$tcX);      $tcX=sprintf('%.2f',$tcX);
     $tcY=sprintf('%.2f',$tcY);      $tcY=sprintf('%.2f',$tcY);
     $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n";      $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n";

Removed from v.1.63  
changed lines
  Added in v.1.64


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>