--- loncom/homework/randomlabel.pm 2001/10/26 18:47:43 1.7 +++ loncom/homework/randomlabel.pm 2002/03/22 22:06:06 1.22 @@ -1,5 +1,30 @@ # The LearningOnline Network with CAPA # random labelling tool +# +# $Id: randomlabel.pm,v 1.22 2002/03/22 22:06:06 albertel Exp $ +# +# 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, @@ -33,8 +58,9 @@ # =========================================== package Apache::randomlabel; use strict; +use Apache::edit; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label')); } @@ -43,7 +69,7 @@ sub start_randomlabel { my $result=''; $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= '/res/adm/includes/GLabel.class'; - + push (@Apache::lonxml::namespace,'randomlabel'); my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); if ( $bgimg !~ /^http:/ ) { @@ -69,16 +95,19 @@ sub start_randomlabel { $result.=""; $result.=""; } elsif ($target eq 'tex') { - $bgimg=~s/(.gif|.jpg)$/.ps/; - $result.='\vspace*{2mm} \\ \noindent \epsfxsize='.$texwidth.' \epsffile{'. - $bgimg.'}\setlength{\unitlength}{1mm} \\ \begin{picture}(0,0)(0,-5)'; + $bgimg=~s/(.gif|.jpg)$/.eps/; + $bgimg=~s/http:\/\/[^\/]*/\/home\/httpd\/html/; + $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).'
'. - &Apache::edit::text_arg('Width(pixel):','width',$token,4). - &Apache::edit::text_arg('Height(pixel):','height',$token,4). - &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4). - ''; + $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '; + $result.=&Apache::edit::browse('bgimg').' '; + $result.=&Apache::edit::search('bgimg').'
'. + &Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6). + &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') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, 'bgimg','width','height', @@ -95,8 +124,7 @@ sub end_randomlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; my $count; - - + pop @Apache::lonxml::namespace; if ($target eq 'web') { $count = $Apache::randomlabel::tlabel_cnt; if( $count != 0) { $result.= ""; } @@ -129,7 +157,7 @@ sub start_labelgroup { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Name:','name',$token). &Apache::edit::select_arg('Type:','type',['text','image'],$token). - ''; + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, 'name','type'); @@ -219,8 +247,11 @@ 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) - $texwidth; 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); $tcY=sprintf('%.2f',$tcY); $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n"; @@ -253,7 +284,7 @@ sub start_location { $result.=&Apache::edit::text_arg('X:','x',$token,4). &Apache::edit::text_arg('Y:','y',$token,4). &Apache::edit::text_arg('Value:','value',$token). - ''; + &Apache::edit::end_row(); $result.=&Apache::edit::end_table; } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, @@ -280,16 +311,17 @@ sub start_label { if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'answer') { my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]); + $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]); push(@Apache::randomlabel::label_arr,$ltext); } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]); - $result.=''. - &Apache::edit::editfield('',$text,'',20,1). + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(). + &Apache::edit::editline('',$text,'',20). &Apache::edit::end_table(); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/label"); - $result.=&Apache::edit::modifiedfield($token); + $result.='