Diff for /loncom/homework/randomlabel.pm between versions 1.11 and 1.24

version 1.11, 2002/01/21 16:40:57 version 1.24, 2002/04/25 21:36:36
Line 57 Line 57
 #             (21,54)  : $GroupTwo[2] = "TEXT-2"  #             (21,54)  : $GroupTwo[2] = "TEXT-2"
 #  ===========================================  #  ===========================================
 package Apache::randomlabel;  package Apache::randomlabel;
   use Apache::lonnet;
 use strict;  use strict;
 use Apache::edit;  use Apache::edit;
   
Line 64  BEGIN { Line 65  BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));    &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
 }  }
   
   sub check_int {
       # utility function to do error checking on a integer.
       my ($num,$default) = @_;
       $default = 100 if (! defined($default));
       $num =~ s/\s+//g;  # We dont need no stinkin white space!
       # If it is a real, just grab the integer part.
       ($num,undef) = split (/\./,$num) if ($num =~ /\./); 
       # set to default if what we have left doesn't match anything...
       $num = $default unless ($num =~/^\d+$/);
       return $num;
   }
   
 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='';
   $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=    push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
     '/res/adm/includes/GLabel.class';    push (@Apache::lonxml::namespace,'randomlabel');
   
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);    my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   
   if ( $bgimg !~ /^http:/ ) {    if ( $bgimg !~ /^http:/ ) {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg;      push (@Apache::lonxml::extlinks,$bgimg);
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
     if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {      if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
       $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;        $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
Line 84  sub start_randomlabel { Line 95  sub start_randomlabel {
   }    }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);    my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);    my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);    my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);    my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   if (!$code) { $code='GLabel.class'; }    if (!$code) { $code='GLabel.class'; }
   if (!$codebase) { $codebase='/res/adm/includes/'; }    if (!$codebase) { $codebase='/res/adm/includes/'; }
Line 95  sub start_randomlabel { Line 106  sub start_randomlabel {
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";      $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";
     $result.="<param name=\"bgimg\" value=\"$bgimg\">";      $result.="<param name=\"bgimg\" value=\"$bgimg\">";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $bgimg=~s/(.gif|.jpg)$/.ps/;      $bgimg=~s/(.gif|.jpg)$/.eps/;
     $result.='\vspace*{2mm} \\ \noindent \epsfxsize='.$texwidth.' \epsffile{'.      $bgimg= &Apache::lonnet::filelocation($bgimg);
       $bgimg.'}\setlength{\unitlength}{1mm} \\ \begin{picture}(0,0)(0,-5)';      $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
       $bgimg=~s/\/$//;
       $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
       $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}(0,0)('.$texwidth.','.$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);
     $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).'<br />'.      $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
       &Apache::edit::text_arg('Width(pixel):','width',$token,4).      $result.=&Apache::edit::browse('bgimg').' ';
  &Apache::edit::text_arg('Height(pixel):','height',$token,4).      $result.=&Apache::edit::search('bgimg').'<br />'.
   &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).          &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
      &Apache::edit::end_row().&Apache::edit::start_spanning_row();          &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
           &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
           &Apache::edit::end_row().&Apache::edit::start_spanning_row();     
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'bgimg','width','height',   'bgimg','width','height',
Line 121  sub end_randomlabel { Line 137  sub end_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   my $count;    my $count;
     pop @Apache::lonxml::namespace;
   
   if ($target eq 'web') {    if ($target eq 'web') {
     $count = $Apache::randomlabel::tlabel_cnt;      $count = $Apache::randomlabel::tlabel_cnt;
     if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }      if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }
Line 130  sub end_randomlabel { Line 145  sub end_randomlabel {
     if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }      if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }
     $result .= "</applet><BR />";      $result .= "</applet><BR />";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $result='\end{picture}';      $result='\end{picture}\\\\';
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
   }    }
Line 245  sub end_labelgroup { Line 260  sub end_labelgroup {
       my $x = $Apache::randomlabel::xcoord[$i];        my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];        my $y = $Apache::randomlabel::ycoord[$i];
       my $value = $Apache::randomlabel::value[$i];        my $value = $Apache::randomlabel::value[$i];
   #      my $tcX=$x*($texwidth/$wwidth) - $texwidth;
       my $tcX=$x*($texwidth/$wwidth);        my $tcX=$x*($texwidth/$wwidth);
       my $tcY=$TY1-$y*($TY1/$wheight)-2;  #      my $tcY=$TY1-$y*($TY1/$wheight)-2;
         my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
         my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
       $tcX=sprintf('%.2f',$tcX);        $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);        $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";        $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
Line 267  sub end_labelgroup { Line 285  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 {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $x= &Apache::lonxml::get_param('x',$parstack,$safeeval);    my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
   my $y= &Apache::lonxml::get_param('y',$parstack,$safeeval);    my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
   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 306  sub start_label { Line 324  sub start_label {
   if ($target eq 'web' || $target eq 'tex' ||     if ($target eq 'web' || $target eq 'tex' || 
       $target eq 'grade' || $target eq 'answer') {        $target eq 'grade' || $target eq 'answer') {
     my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);      my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
       $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     push(@Apache::randomlabel::label_arr,$ltext);      push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);      my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().      $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
       &Apache::edit::editfield('',$text,'',20,1).        &Apache::edit::editline('',$text,'',20).
  &Apache::edit::end_table();   &Apache::edit::end_table();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");      my $text=$$parser[-1]->get_text("/label");

Removed from v.1.11  
changed lines
  Added in v.1.24


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