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

Diff for /loncom/homework/randomlabel.pm between versions 1.81 and 1.86

version 1.81, 2005/12/01 18:46:31 version 1.86, 2007/05/10 10:27:22
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 266  sub end_bgimg { Line 269  sub end_bgimg {
  &Apache::lonxml::debug("Width $width_param");   &Apache::lonxml::debug("Width $width_param");
  &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");   &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
  my $dirty_width = $width_param + 5;   my $dirty_width = $width_param + 5;
    #
    #  Somewhere here it looks like height_param and
    #  width_param got backwards...
    #
  $result .= '\parbox{'.$dirty_width.'mm}{';   $result .= '\parbox{'.$dirty_width.'mm}{';
  $result  .= " $src \n";   $result  .= " $src \n";
  $result  .= '\setlength{\unitlength}{1mm}'."\n";   $result  .= '\setlength{\unitlength}{1mm}'."\n";
  $result  .= '\begin{picture}('."$height_param,$width_param)";   $result  .= '\begin{picture}('."$height_param,$width_param)";
  $result  .= "(0,-$height_param)";   $result  .= "(0,-$width_param)";
  $result  .= "\n";   $result  .= "\n";
  $Apache::lonxml::debug = 0;   $Apache::lonxml::debug = 0;
   
Line 293  sub make_eps_image { Line 300  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 422  sub end_labelgroup { Line 430  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 479  sub end_labelgroup { Line 487  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;
    #
    #  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);   my $label_width = &get_label_width($label);
   
  $result .=  '\includegraphics[width='.$label_width.'mm]{'   $result .=  '\includegraphics[width='.$label_width.'mm]{'
Removed from v.1.81  
changed lines
  Added in v.1.86

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