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

Diff for /loncom/homework/randomlabel.pm between versions 1.73 and 1.77

version 1.73, 2005/05/16 21:58:19 version 1.77, 2005/06/07 22:31:30
Line 65  use Apache::lonplot; Line 65  use Apache::lonplot;
 my %args;  my %args;
 my $cgi_id;  my $cgi_id;
 my $scale_factor; # image scale factor.  my $scale_factor; # image scale factor.
   my $label_xscale;                # Label scale factor (needed for gnuplot).
   my $label_yscale;
   
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));      &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
 }  }
   
   
   
 sub check_int {  sub check_int {
     # utility function to do error checking on a integer.      # utility function to do error checking on a integer.
     my ($num,$default) = @_;      my ($num,$default) = @_;
Line 82  sub check_int { Line 87  sub check_int {
     return $num;      return $num;
 }  }
   
   #  Get width/height from an image tag...
   #
   #  Parameters:
   #      tag         - tag potentially containing height/width attributes.
   #      def_width   - Default width.
   #      def_height  - Default height.
   #  Returns:
   #      list containing width/height.
   #
   sub extract_tag_sizes {
       my ($tag, $dw, $dh) = @_;
       $tag =~ s/\s+/ /g;         # Collapse whitespace.
       $tag =~ s/\s*=\s*/=/g;     # kill space around ='s.
       $tag =~ s/[<>\"]//g;       # Get rid of the <">'s too.
   
       &Apache::lonxml::debug("Compressed tag: $tag");
       my @taglist = split(/ /,$tag);
       foreach my $attribute (@taglist) {
    if ($attribute =~ /^width/i) {
       my ($e, $s)= split(/=/,$attribute);
       $dw = $s;
    }
    if ($attribute =~  /^height/i) {
       my ($e, $s) = split(/=/,$attribute);
       $dh = $s;
    }
       } 
       return($dw, $dh);
   
   }
   
 my ($height_param,$width_param);  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);      ($height_param,$width_param)=(0,0);
       $label_xscale = 1.0; # Assume image size not overridden.
       $label_yscale = 1.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 100  sub start_randomlabel { Line 139  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);
    $height_param = &Apache::lonxml::get_param('height',$parstack, $safeeval);
    $width_param  = &Apache::lonxml::get_param('width', $parstack, $safeeval);
     } elsif ($target eq 'tex' && defined($bgimg)) {      } elsif ($target eq 'tex' && defined($bgimg)) {
  $result.=&make_eps_image($bgimg,$parstack,$safeeval);   $result.=&make_eps_image($bgimg,$parstack,$safeeval);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 145  sub end_randomlabel { Line 186  sub end_randomlabel {
     return $result;      return $result;
 }  }
   
   
 sub start_bgimg {  sub start_bgimg {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
Line 160  sub end_bgimg { Line 202  sub end_bgimg {
     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') {
       
       # If the  tag produced has sizes, they override ours.
       # (for now anyway).
       #
   
       &Apache::lonxml::debug("Base sizes: $width_param x $height_param");
   
       my ($plot_x, $plot_y) = &extract_tag_sizes($bgimg, 
          $width_param,
          $height_param );
       &Apache::lonxml::debug("Extracted sizes: $plot_x x $plot_y");
       $label_xscale         = $plot_x / $width_param;
       $label_yscale         = $plot_y / $height_param;
       &Apache::lonxml::debug("Scale factors:   $label_xscale $label_yscale");
   
       &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");
     $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') {
     #   Some bg images can create latex for us... e.g. gnuplot.      #   Some bg images can create latex for us... e.g. gnuplot.
Line 171  sub end_bgimg { Line 230  sub end_bgimg {
     my $src = $bgimg;      my $src = $bgimg;
     $src =~ s/\s+$//s;      $src =~ s/\s+$//s;
     $src =~ s/^\s+//s;      $src =~ s/^\s+//s;
       
   
     if ($src =~ /^\\graphicspath/) {      #If this is a dynamically generated image, it will
         $height_param = $Apache::lonplot::plot{'height'}*0.3;      #be in latex already, with a comment header that
  $width_param  = $Apache::lonplot::plot{'width'}*0.3;      #describes the dimensions:
   
       if($src =~ /^%DYNAMICIMAGE:/) {
    $Apache::lonxml::debug = 0;
    &Apache::lonxml::debug("Dynamic image");
    my ($commentline, $junk) = split(/\n/, $src);
    &Apache::lonxml::debug("Comment line was: $commentline");
    my $trash;
    my $initial_width;
    ($trash, $initial_width, $height_param, $width_param) =
       split(/:/,$commentline);
    &Apache::lonxml::debug("internal web Width/height: $initial_width $height_param");
    &Apache::lonxml::debug("Texwitdh: $width_param");
    if($initial_width == 0) {
       $initial_width = $width_param;
    }
    # strip off the comments since output does not always
    # preserve \n's:
                   #
    $src =~ s/$commentline//;
    $scale_factor = $width_param / $initial_width;
    $height_param = $height_param*$scale_factor;
   
    $label_xscale = 1.0; #  $scale_factor;
    $label_yscale = 1.0; #  $scale_factor;
      
  &Apache::lonxml::debug("height $height_param");   &Apache::lonxml::debug("height $height_param");
  &Apache::lonxml::debug("Width $width_param");   &Apache::lonxml::debug("Width $width_param");
  $scale_factor=1.0;   &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
  my $dirty_width = $width_param + 5;   my $dirty_width = $width_param + 5;
  $result .= '\parbox{'.$dirty_width.'mm}{';   $result .= '\parbox{'.$dirty_width.'mm}{';
  $result  .= $src;   $result  .= " $src \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,-$height_param)";
    $result  .= "\n";
    $Apache::lonxml::debug = 0;
   
     } else {      } else {
   
   
Line 344  sub end_labelgroup { Line 431  sub end_labelgroup {
  &Apache::structuretags::shuffle(\@idx_arr);   &Apache::structuretags::shuffle(\@idx_arr);
   
  &Apache::lonxml::debug("Array is:".$#Apache::randomlabel::label_arr.":");   &Apache::lonxml::debug("Array is:".$#Apache::randomlabel::label_arr.":");
    $Apache::lonxml::debug = 0;
  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      # FIXME the 3.5 here is the 'height' of the letter in TeX
     my $y = $Apache::randomlabel::ycoord[$i]-3.5;      my $y = $Apache::randomlabel::ycoord[$i]-3.5;
       &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
     my $tcX=($x)*($width_param/$wwidth);      my $tcX=($x)*($width_param/$wwidth);
       &Apache::lonxml::debug("wparam = $width_param wwidth = $wwidth, texx = $tcX");
     #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);
       &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);
     $result .= '\put('.$tcX.','.$tcY.'){';      $result .= '\put('.$tcX.','.$tcY.'){';
Line 375  sub end_labelgroup { Line 466  sub end_labelgroup {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
     }      }
  }   }
    $Apache::lonxml::debug =0;
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table;   $result.=&Apache::edit::end_table;
     }      }
Line 383  sub end_labelgroup { Line 475  sub end_labelgroup {
   
 # <location x="123" y="456" value="some value"/>  # <location x="123" y="456" value="some value"/>
 sub start_location {  sub start_location {
       $Apache::lonxml::debug = 0;
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);      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 $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
       &Apache::lonxml::debug("x = $x y = $y");
       $x = $x*$label_xscale;
       $y = $y*$label_yscale;
       &Apache::lonxml::debug(" H = $height_param W = $width_param");
       &Apache::lonxml::debug(" XS = $label_xscale YS = $label_yscale");
       &Apache::lonxml::debug(" X  = $x Y = $y");
     my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
     my $result='';      my $result='';
     push(@Apache::randomlabel::xcoord,$x);      push(@Apache::randomlabel::xcoord,$x);
Line 407  sub start_location { Line 506  sub start_location {
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
  }   }
     }      }
       $Apache::lonxml::debug = 0;
     return $result;      return $result;
 }  }
   
Removed from v.1.73  
changed lines
  Added in v.1.77

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