[BACK]Return to randomlabel.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/randomlabel.pm between versions 1.78 and 1.85

version 1.78, 2005/06/28 14:58:23 version 1.85, 2006/11/07 02:39:58
Line 61  use Apache::File(); Line 61  use Apache::File();
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use Image::Magick;  use Image::Magick;
 use Apache::lonplot;  use Apache::lonplot;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 my %args;  my %args;
 my $cgi_id;  my $cgi_id;
Line 138  sub start_randomlabel { Line 141  sub start_randomlabel {
     if ($target eq 'web') {      if ($target eq 'web') {
  $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"}=&escape($bgimg);
  $height_param = &Apache::lonxml::get_param('height',$parstack, $safeeval);   $height_param = &Apache::lonxml::get_param('height',$parstack, $safeeval);
  $width_param  = &Apache::lonxml::get_param('width', $parstack, $safeeval);   $width_param  = &Apache::lonxml::get_param('width', $parstack, $safeeval);
     } elsif ($target eq 'tex' && defined($bgimg)) {      } elsif ($target eq 'tex' && defined($bgimg)) {
Line 223  sub end_bgimg { Line 226  sub end_bgimg {
     &Apache::lonxml::debug("Image: $bgimg");      &Apache::lonxml::debug("Image: $bgimg");
     $bgimg=&Apache::imageresponse::clean_up_image($bgimg);      $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
     &Apache::lonxml::debug("Cleaned image: $bgimg");      &Apache::lonxml::debug("Cleaned image: $bgimg");
     $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);      $args{"cgi.$cgi_id.BGIMG"}=&escape($bgimg);
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     #   Some bg images can create latex for us... e.g. gnuplot.      #   Some bg images can create latex for us... e.g. gnuplot.
     #   If it looks like we have some latex use that,       #   If it looks like we have some latex use that, 
Line 293  sub make_eps_image { Line 296  sub make_eps_image {
     &Apache::lonxml::debug("Image size: $height_param x $width_param");      &Apache::lonxml::debug("Image size: $height_param x $width_param");
   
     my $dirtywidth=$width_param+5;      my $dirtywidth=$width_param+5;
   
     my $result ="\n".'\vspace*{2mm}\noindent'."\n".      my $result ="\n".'\vspace*{2mm}\noindent'."\n".
  '\parbox{'.$dirtywidth.   '\parbox{'.$dirtywidth.
  ' mm}{  \noindent \epsfxsize='.$width_param.   ' mm}{  \noindent \epsfxsize='.$width_param.
Line 369  sub get_label_width { Line 373  sub get_label_width {
           
   
 }  }
   
   sub get_label_height {
       my $label         = shift;
       &Apache::lonxml::debug("image label = $label");
       if (-e $label) {
    &Apache::lonxml::debug("$label exists");
       } else {
    &Apache::lonxml::debug("$label does not exist");
       }
       my $magick        = Image::Magick->new;
       $magick->Read($label);
       my $pixel_height   = $magick->Get('height');
       return $pixel_height * $scale_factor;
   }
   
 sub add_vars {  sub add_vars {
     my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;      my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
     if (!defined($name) || $name eq '') { return; }      if (!defined($name) || $name eq '') { return; }
Line 407  sub end_labelgroup { Line 426  sub end_labelgroup {
     my $i=$Apache::randomlabel::obj_cnt++;      my $i=$Apache::randomlabel::obj_cnt++;
     if( $type eq 'text') {      if( $type eq 'text') {
  &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);   &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
  $str = join(':',$x,$y,&Apache::lonnet::escape($label));   $str = join(':',$x,$y,&escape($label));
  $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';   $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
     } elsif ( $type eq 'image') {      } elsif ( $type eq 'image') {
  &add_vars($gname,$_,   &add_vars($gname,$_,
   $Apache::randomlabel::description[$idx_arr[$_]],    $Apache::randomlabel::description[$idx_arr[$_]],
   $idx_arr[$_],$value,$label,$safeeval);    $idx_arr[$_],$value,$label,$safeeval);
  $str = join(':',$x,$y,&Apache::lonnet::escape($label));   $str = join(':',$x,$y,&escape($label));
  $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';   $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
     } else {      } else {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
Line 436  sub end_labelgroup { Line 455  sub end_labelgroup {
  for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {   for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
     my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";      my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
     my $x = $Apache::randomlabel::xcoord[$i];      my $x = $Apache::randomlabel::xcoord[$i];
     # FIXME the 3.5 here is the 'height' of the letter in TeX      my $y = $Apache::randomlabel::ycoord[$i];
     my $y = $Apache::randomlabel::ycoord[$i]-3.5;      if ( $type eq 'text' ) {
    # FIXME the 3.5 here is the 'height' of the letter in TeX
    $y=$y-3.5;
       }
     &Apache::lonxml::debug("initially: x= $x y= $y");      &Apache::lonxml::debug("initially: x= $x y= $y");
     my $value = $Apache::randomlabel::value[$i];      my $value = $Apache::randomlabel::value[$i];
     #x latex coordinate      #x latex coordinate
Line 446  sub end_labelgroup { Line 468  sub end_labelgroup {
     #y latex coordinate      #y latex coordinate
             #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );              #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
     my $tcY=$height_param-$y*($height_param/$wheight);      my $tcY=$height_param-$y*($height_param/$wheight);
       if ( $type eq 'image') {
    my $label_height = &get_label_height($label);
    $tcY=$tcY-$label_height;
       }
   
     &Apache::lonxml::debug("hparam = $height_param wheight = $wheight texy = $tcY");      &Apache::lonxml::debug("hparam = $height_param wheight = $wheight texy = $tcY");
     $tcX=sprintf('%.2f',$tcX);      $tcX=sprintf('%.2f',$tcX);
     $tcY=sprintf('%.2f',$tcY);      $tcY=sprintf('%.2f',$tcY);
Line 456  sub end_labelgroup { Line 483  sub end_labelgroup {
     } elsif ( $type eq 'image') {      } elsif ( $type eq 'image') {
  my ($path,$file) = &Apache::londefdef::get_eps_image($label);   my ($path,$file) = &Apache::londefdef::get_eps_image($label);
  my $image_name = $path.$file;   my $image_name = $path.$file;
  my $label_width = get_label_width($label);   #
    #  Note that spaces in e.. \includegraphics cause problems for Latex
    # so they get replaced by _'s by lonprintout/printout and us:
    #
    my $label_width = &get_label_width($label);
   
  $result .=  '\includegraphics[width='.$label_width.'mm]{'   $result .=  '\includegraphics[width='.$label_width.'mm]{'
             .$image_name."}}\n";              .$image_name."}}\n";
Line 528  sub start_label { Line 559  sub start_label {
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token,"$type Label");   $result.=&Apache::edit::tag_start($target,$token,"$type Label");
  my $text=&Apache::lonxml::get_all_text("/label",$parser);   my $text=&Apache::lonxml::get_all_text("/label",$parser,$style);
  if ($type eq 'image') {   if ($type eq 'image') {
     $result.=&Apache::edit::end_row().      $result.=&Apache::edit::end_row().
  &Apache::edit::start_spanning_row();   &Apache::edit::start_spanning_row();
Removed from v.1.78  
changed lines
  Added in v.1.85

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