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

Diff for /loncom/homework/randomlabel.pm between versions 1.74 and 1.98

version 1.74, 2005/05/23 11:02:13 version 1.98, 2025/01/26 16:29:03
Line 24 Line 24
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  
 # SYNTAX:  =pod
 # <randomlabel bgimg="URL" width="12" height="45" texwidth="50">  
 #    <labelgroup name="GroupOne" type="image">  =head1 NAME
 #      <location x="123" y="456" />  
 #      <location x="321" y="654" />  Apache::randomlable.pm
 #      <location x="213" y="546" />  
 #      <label description="TEXT-1">IMG-URL</label>  =head1 SYNOPSIS
 #      <label description="TEXT-2">IMG-URL</label>  
 #      <label description="TEXT-3">IMG-URL</label>  Interface for producing applet code which
 #    </labelgroup>  randomizes the labelling of an image.
 #    <labelgroup name="GroupTwo" type="text">  
 #      <location x="12" y="45" />  This is part of the LearningOnline Network with CAPA project
 #      <location x="32" y="65" />  described at http://www.lon-capa.org.
 #      <location x="21" y="54" />  
 #      <label>TEXT-1</label>  
 #      <label>TEXT-2</label>  =head1 SYNTAX
 #      <label>TEXT-3</label>  
 #    </labelgroup>   <randomlabel bgimg="URL" width="12" height="45" texwidth="50">
 #   </randomlabel>      <labelgroup name="GroupOne" type="image">
 #  ===========================================        <location x="123" y="456" />
 #  side effect:        <location x="321" y="654" />
 #    location (123,456): $GroupOne[0] = 2  # images give out indexes        <location x="213" y="546" />
 #             (321,654): $GroupOne[1] = 1        <label description="TEXT-1">IMG-URL</label>
 #             (213,546): $GroupOne[2] = 0        <label description="TEXT-2">IMG-URL</label>
 #    location (12,45)  : $GroupTwo[0] = "TEXT-3"        <label description="TEXT-3">IMG-URL</label>
 #             (32,65)  : $GroupTwo[1] = "TEXT-1"      </labelgroup>
 #             (21,54)  : $GroupTwo[2] = "TEXT-2"      <labelgroup name="GroupTwo" type="text">
 #  ===========================================        <location x="12" y="45" />
         <location x="32" y="65" />
         <location x="21" y="54" />
         <label>TEXT-1</label>
         <label>TEXT-2</label>
         <label>TEXT-3</label>
       </labelgroup>
      </randomlabel>
     ===========================================
     side effect:
       location (123,456): $GroupOne[0] = 2   images give out indexes
                (321,654): $GroupOne[1] = 1
                (213,546): $GroupOne[2] = 0
       location (12,45)  : $GroupTwo[0] = "TEXT-3"
                (32,65)  : $GroupTwo[1] = "TEXT-1"
                (21,54)  : $GroupTwo[2] = "TEXT-2"
     ===========================================
   
   
   =head1 NOTABLE SUBROUTINES
   
   =over
   
   =item check_int()
   
    utility function to do error checking on a integer.
   
   =item extract_tag_sizes()
   
   Parameters:
         tag         - tag potentially containing height/width attributes.
         def_width   - Default width.
         def_height  - Default height.
     Returns:
         list containing width/height.
   
   =item get_label_width()
   
    Utility sub to compute the width of a label.
     
   =item end_labelgroup()
   
   begin to assign labels to locations
   
   =back
   
   =cut
   
   
   
 package Apache::randomlabel;  package Apache::randomlabel;
 use Apache::lonnet;  use Apache::lonnet;
 use strict;  use strict;
Line 61  use Apache::File(); Line 110  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 Apache::lonlocal;
   use Apache::lonmeta;
   use LONCAPA;
    
   
 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;
   my $dirty_width_adjust = 5;     # Width adjustment for e.g. gnuplot images.
   
 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 140  sub check_int {
     return $num;      return $num;
 }  }
   
 my ($height_param,$width_param);  
   
   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,$alt_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);
       $alt_param = '';
       $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 !~ /^https?\:/ ) {
  $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);   $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
  if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {   if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {
     $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $bgimg=$Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
     $Apache::randomlabel::obj_cnt=0;      $Apache::randomlabel::obj_cnt=0;
     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);
    $width_param  = &Apache::lonxml::get_param('width', $parstack, $safeeval);
           $alt_param    = &Apache::lonxml::get_param('alt',   $parstack, $safeeval);
           if ($alt_param eq '') {
               unless (($bgimg =~ m{^data\:image/gif;base64,}) || ($bgimg =~ /^https?\:/) ||
                       ($bgimg eq $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/lonKaputt/lonlogo_broken.gif')) {
                   $alt_param = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$bgimg);
               }
           }
     } 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') {
           my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $Apache::edit::bgimgsrc=   $Apache::edit::bgimgsrc=
     &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);      &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
  $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;   $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
  $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';   $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '.
  $result.=&Apache::edit::browse('bgimg').' ';           &Apache::edit::browse_or_search('bgimg',undef,undef,$only,undef,1).
  $result.=&Apache::edit::search('bgimg').'<br />'.           '<br />'.
               &Apache::edit::text_arg('Description:'  ,'alt'     ,$token,40).'<br />'.
     &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).      &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
     &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).      &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
     &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).      &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
Line 117  sub start_randomlabel { Line 214  sub start_randomlabel {
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'bgimg','width',       $safeeval,'bgimg','width',
      'height','texwidth');       'height','texwidth','alt');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     }      }
     return $result;      return $result;
Line 132  sub end_randomlabel { Line 228  sub end_randomlabel {
     my $count;      my $count;
     pop @Apache::lonxml::namespace;      pop @Apache::lonxml::namespace;
     if ($target eq 'web') {      if ($target eq 'web') {
           my $alttext;
           if ($alt_param eq '') {
               $alttext = &mt('labeled image');
           } else {
               $alttext = $alt_param;
           }
           $alttext = &HTML::Entities::encode($alttext,'<>&"');
  $count = $Apache::randomlabel::obj_cnt;   $count = $Apache::randomlabel::obj_cnt;
  if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }   if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }
  $result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";   $result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" alt="'.$alttext.'" /><br />'."\n";
  &Apache::lonnet::appenv(%args);   &Apache::lonnet::appenv(\%args);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result='\end{picture}\\\\';   $result='\end{picture}\\\\';
  $result.= ' \vskip -'.$height_param.' mm }  \\\\ ';   $result.= ' \vskip -'.$height_param.' mm } \\newline ';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table;   $result.=&Apache::edit::end_table;
     }      }
     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 264  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");
       if ($width_param) {
    $label_xscale     = $plot_x / $width_param;
       }
       if ($height_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);
     $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);      &Apache::lonxml::debug("Cleaned image: $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 171  sub end_bgimg { Line 295  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'};      #be in latex already, with a comment header that
  my $initial_width= $Apache::lonplot::plot{'width'};      #describes the dimensions:
  $width_param  = $Apache::lonplot::plot{'texwidth'};  
       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;   $scale_factor = $width_param / $initial_width;
  $height_param = $height_param*$scale_factor;   $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");
    &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
  my $dirty_width = $width_param + 5;   my $dirty_width = $width_param + $dirty_width_adjust;
    my $x_offset    = -$dirty_width_adjust/2.0;
    #
    #  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}('."$width_param,$height_param)";
  $result  .= "(0,-$height_param)";   $result  .= "($x_offset,-$height_param)";
  $result  .= "\n";   $result  .= "\n";
    $Apache::lonxml::debug = 0;
   
     } else {      } else {
   
   
  $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);   $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
     }      }
  }   }
Line 211  sub make_eps_image { Line 360  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 263  sub start_labelgroup { Line 413  sub start_labelgroup {
      'TeXsize');       'TeXsize');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     }      }
     return $result;      return $result;
 }  }
   
 #  
 #   Utility sub to compute the width of a label.  
 #  
 sub get_label_width {  sub get_label_width {
     my $label         = shift;      my $label         = shift;
     &Apache::lonxml::debug("image label = $label");      &Apache::lonxml::debug("image label = $label");
Line 287  sub get_label_width { Line 435  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 306  sub add_vars { Line 469  sub add_vars {
     $out=Apache::run::run($code,$safeeval);      $out=Apache::run::run($code,$safeeval);
 }  }
   
 # begin to assign labels to locations  
   
 sub end_labelgroup {  sub end_labelgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $gname = $Apache::randomlabel::groupname;      my $gname = $Apache::randomlabel::groupname;
Line 325  sub end_labelgroup { Line 489  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 350  sub end_labelgroup { Line 514  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      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");
     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);
       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");
     $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 370  sub end_labelgroup { Line 546  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 381  sub end_labelgroup { Line 561  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 389  sub end_labelgroup { Line 570  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 410  sub start_location { Line 598  sub start_location {
     $safeeval,'x','y','value');      $safeeval,'x','y','value');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     }      }
       $Apache::lonxml::debug = 0;
     return $result;      return $result;
 }  }
   
Line 424  sub end_location { Line 612  sub end_location {
 }  }
   
 # <label>$var_abc</label>  # <label>$var_abc</label>
   sub insert_label {
       my ($after) = @_;
       my $depth = scalar(@Apache::lonxml::depthcounter);
       $depth-- if ($after);
       my $inset = "\t"x$depth;
       return "\n$inset<label></label>";
   }
   
 sub start_label {  sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
Line 433  sub start_label { Line 629  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.74  
changed lines
  Added in v.1.98

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