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

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

version 1.11, 2002/01/21 16:40:57 version 1.17, 2002/03/06 21:56:27
Line 86  sub start_randomlabel { Line 86  sub start_randomlabel {
   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= &Apache::lonxml::get_param('width',$parstack,$safeeval);
   my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);    my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     $Apache::randomlabel::ratio = ($w > 0 ? $h/$w : 1 );
   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 96  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=~s/http:\/\/[^\/]*/\/home\/httpd\/html/;
       $bgimg.'}\setlength{\unitlength}{1mm} \\ \begin{picture}(0,0)(0,-5)';      $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
       $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$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').'<br />'.
  &Apache::edit::text_arg('Height(pixel):','height',$token,4).          &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
   &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).          &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
      &Apache::edit::end_row().&Apache::edit::start_spanning_row();          &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 245  sub end_labelgroup { Line 248  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 $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$Apache::randomlabel::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 306  sub start_label { Line 311  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);
Removed from v.1.11  
changed lines
  Added in v.1.17

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