loncom/homework/randomlabel.pm - diff

Return to randomlabel.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/randomlabel.pm between versions 1.5 and 1.12

-version 1.5, 2001/10/14 05:08:09
+version 1.12, 2002/02/05 16:21:03
  Line 1
  # The LearningOnline Network with CAPA
  # random labelling tool
+ #
+ # $Id$
+ #
+ # Copyright Michigan State University Board of Trustees
+ #
+ # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+ #
+ # LON-CAPA is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # LON-CAPA is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with LON-CAPA; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+ # /home/httpd/html/adm/gpl.txt
+ #
+ # http://www.lon-capa.org/
+ #
  # 7/20/2001 Isaac Tsai, initial syntax
  # 8/10/2001 Isaac Tsai,
  # 8/30/2001 Isaac Tsai,
- Line 41  sub BEGIN {
+ Line 66  sub BEGIN {
  sub start_randomlabel {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $result='';
+   $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+     '/res/adm/includes/GLabel.class';
    my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
+   if ( $bgimg !~ /^http:/ ) {
+     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg;
+     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
+     if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
+       $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
+     } elsif ($bgimg =~ m:^/home/.*/public_html:) {
+       $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
+     }
+     $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
+   }
    my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
    my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
    my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
- Line 55  sub start_randomlabel {
+ Line 94  sub start_randomlabel {
      $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";
      $result.="<param name=\"bgimg\" value=\"$bgimg\">";
    } 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') {
      $result.=&Apache::edit::tag_start($target,$token);
      $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).'<br />'.
- Line 205  sub end_labelgroup {
+ Line 245  sub end_labelgroup {
        my $x = $Apache::randomlabel::xcoord[$i];
        my $y = $Apache::randomlabel::ycoord[$i];
        my $value = $Apache::randomlabel::value[$i];
-       my $tcX=$x*($texwidth/$wwidth);
+       my $tcX=$x*($texwidth/$wwidth) - $texwidth;
        my $tcY=$TY1-$y*($TY1/$wheight)-2;
        $tcX=sprintf('%.2f',$tcX);
        $tcY=sprintf('%.2f',$tcY);

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

Removed from v.1.5
changed lines
	Added in v.1.12