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

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

version 1.24, 2002/04/25 21:36:36 version 1.28, 2002/05/20 20:35:13
Line 103  sub start_randomlabel { Line 103  sub start_randomlabel {
   $Apache::randomlabel::tlabel_cnt=0;    $Apache::randomlabel::tlabel_cnt=0;
   $Apache::randomlabel::ilabel_cnt=0;    $Apache::randomlabel::ilabel_cnt=0;
   if ($target eq 'web') {    if ($target eq 'web') {
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";      $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";
     $result.="<param name=\"bgimg\" value=\"$bgimg\">";      $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $bgimg=~s/(.gif|.jpg)$/.eps/;      $bgimg=~s/(.gif|.jpg)$/.eps/;
     $bgimg= &Apache::lonnet::filelocation($bgimg);      $bgimg= &Apache::lonnet::filelocation($bgimg);
Line 140  sub end_randomlabel { Line 140  sub end_randomlabel {
   pop @Apache::lonxml::namespace;    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\">\n"; }
     $count = $Apache::randomlabel::ilabel_cnt;      $count = $Apache::randomlabel::ilabel_cnt;
     if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }      if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
     $result .= "</applet><BR />";      $result .= "</applet>\n<BR />";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $result='\end{picture}\\\\';      $result='\end{picture}\\\\';
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
Line 166  sub start_labelgroup { Line 166  sub start_labelgroup {
     @Apache::randomlabel::ycoord = ();      @Apache::randomlabel::ycoord = ();
     @Apache::randomlabel::value = ();      @Apache::randomlabel::value = ();
     @Apache::randomlabel::label_arr  = ();      @Apache::randomlabel::label_arr  = ();
       @Apache::randomlabel::decription  = ();
   } 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('Name:','name',$token).      $result.=&Apache::edit::text_arg('Name:','name',$token).
Line 183  sub start_labelgroup { Line 184  sub start_labelgroup {
 }  }
   
 sub add_vars {  sub add_vars {
   my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;    my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
   my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";    my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
   my $out=Apache::run::run($code,$safeeval);    my $out=Apache::run::run($code,$safeeval);
   if ($value) {    if ($value) {
Line 192  sub add_vars { Line 193  sub add_vars {
     $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";      $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
     $out=Apache::run::run($code,$safeeval);      $out=Apache::run::run($code,$safeeval);
   }    }
     if ($image) {
         my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';";
         my $out=Apache::run::run($code,$safeeval);
     }
   $code = '${'.$name."}{'numlocations'}='".($order+1)."';";    $code = '${'.$name."}{'numlocations'}='".($order+1)."';";
   $out=Apache::run::run($code,$safeeval);    $out=Apache::run::run($code,$safeeval);
 }  }
Line 214  sub end_labelgroup { Line 219  sub end_labelgroup {
       my $y = $Apache::randomlabel::ycoord[$_];        my $y = $Apache::randomlabel::ycoord[$_];
       my $value = $Apache::randomlabel::value[$_];        my $value = $Apache::randomlabel::value[$_];
       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 = 'LB'.$Apache::randomlabel::tlabel_cnt;   $str = 'LB'.$Apache::randomlabel::tlabel_cnt;
  $xstr = 'X'.$Apache::randomlabel::tlabel_cnt;   $xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
  $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;   $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
  $Apache::randomlabel::tlabel_cnt += 1;   $Apache::randomlabel::tlabel_cnt += 1;
       } elsif ( $type eq 'image') {        } elsif ( $type eq 'image') {
  &add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);   &add_vars($gname,$_,
  $str = 'LB'.$Apache::randomlabel::ilabel_cnt;    $Apache::randomlabel::description[$idx_arr[$_]],
  $xstr = 'X'.$Apache::randomlabel::ilabel_cnt;    $idx_arr[$_],$value,$label,$safeeval);
  $ystr = 'Y'.$Apache::randomlabel::ilabel_cnt;   $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
    $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
    $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
  $Apache::randomlabel::ilabel_cnt += 1;   $Apache::randomlabel::ilabel_cnt += 1;
       } else {        } else {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
Line 231  sub end_labelgroup { Line 238  sub end_labelgroup {
       if ($target eq 'web') {        if ($target eq 'web') {
  $result .= '<param name="' . $str  . '" value="'.$label.'">';   $result .= '<param name="' . $str  . '" value="'.$label.'">';
  $result .= '<param name="' . $xstr . '" value="'.$x.'">';   $result .= '<param name="' . $xstr . '" value="'.$x.'">';
  $result .= '<param name="' . $ystr . '" value="'.$y.'">';   $result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";
       }        }
     }      }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
Line 261  sub end_labelgroup { Line 268  sub end_labelgroup {
       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) - $texwidth;
       my $tcX=$x*($texwidth/$wwidth);        my $tcX=($x-10)*($texwidth/$wwidth);
 #      my $tcY=$TY1-$y*($TY1/$wheight)-2;  #      my $tcY=$TY1-$y*($TY1/$wheight)-2;
       my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );        my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;        my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
Line 269  sub end_labelgroup { Line 276  sub end_labelgroup {
       $tcY=sprintf('%.2f',$tcY);        $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";        $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {        if( $type eq 'text') {
  &add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);   &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
       } elsif ( $type eq 'image') {        } elsif ( $type eq 'image') {
  &add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);   &add_vars($gname,$i,
     $Apache::randomlabel::description[$idx_arr[$i]],
     $idx_arr[$i],$value,$label,$safeeval);
       } else {        } else {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
       }        }
Line 321  sub end_location { Line 330  sub end_location {
 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='';
     my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
   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]);      $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
       if ($type eq 'image') {
         &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
         $ltext="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],
      $ltext);
         &Apache::lonxml::debug("into $ltext");
         my $description = &Apache::lonxml::get_param('description',
      $parstack,$safeeval);
         push(@Apache::randomlabel::description,$description);
       }
     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,"$type Label");
     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().      if ($type eq 'image') {
       &Apache::edit::editline('',$text,'',20).        $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
  &Apache::edit::end_table();        $result.=&Apache::edit::text_arg('Description:','description',$token);
       }
       if ($type eq 'text') { $result.="Label Text:"; }
       if ($type eq 'image') { $result.="Path to image:"; }
       $result.=&Apache::edit::editline('',$text,'',20).
         &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");
     $result.='<label>'.&Apache::edit::modifiedfield($token);      $result = '<label>';
       if ($type eq 'image') {
         my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
      'description');
         if ($constructtag) {
    $result = &Apache::edit::rebuild_tag($token);
         } else {
    $result = $token->[4];
         }
       }
       $result.=&Apache::edit::modifiedfield($token);
   }    }
   return $result;    return $result;
 }  }
Removed from v.1.24  
changed lines
  Added in v.1.28

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