--- loncom/homework/randomlabel.pm 2002/02/05 16:21:03 1.12
+++ loncom/homework/randomlabel.pm 2002/03/06 20:41:17 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.12 2002/02/05 16:21:03 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.16 2002/03/06 20:41:17 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,8 +58,9 @@
# ===========================================
package Apache::randomlabel;
use strict;
+use Apache::edit;
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
}
@@ -85,6 +86,7 @@ sub start_randomlabel {
my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+ $Apache::randomlabel::ratio = $h/$w;
my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
if (!$code) { $code='GLabel.class'; }
if (!$codebase) { $codebase='/res/adm/includes/'; }
@@ -100,11 +102,12 @@ sub start_randomlabel {
$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').' '.
+ &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',
@@ -155,7 +158,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');
@@ -245,8 +248,10 @@ 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 $tcY=$TY1-$y*($TY1/$wheight)-2;
+# my $tcX=$x*($texwidth/$wwidth) - $texwidth;
+ my $tcX=$x*($texwidth/$wwidth);
+# my $tcY=$TY1-$y*($TY1/$wheight)-2;
+ my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$Apache::randomlabel::ratio;
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
@@ -279,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,
@@ -306,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.=' |
'.
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',20,1).
&Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/label");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=' |