--- loncom/homework/randomlabel.pm 2005/05/16 21:58:19 1.73
+++ loncom/homework/randomlabel.pm 2005/06/07 22:31:30 1.77
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.73 2005/05/16 21:58:19 foxr Exp $
+# $Id: randomlabel.pm,v 1.77 2005/06/07 22:31:30 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,11 +65,16 @@ use Apache::lonplot;
my %args;
my $cgi_id;
my $scale_factor; # image scale factor.
+my $label_xscale; # Label scale factor (needed for gnuplot).
+my $label_yscale;
+
BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
}
+
+
sub check_int {
# utility function to do error checking on a integer.
my ($num,$default) = @_;
@@ -82,12 +87,46 @@ sub check_int {
return $num;
}
+# Get width/height from an image tag...
+#
+# Parameters:
+# tag - tag potentially containing height/width attributes.
+# def_width - Default width.
+# def_height - Default height.
+# Returns:
+# list containing width/height.
+#
+sub extract_tag_sizes {
+ my ($tag, $dw, $dh) = @_;
+ $tag =~ s/\s+/ /g; # Collapse whitespace.
+ $tag =~ s/\s*=\s*/=/g; # kill space around ='s.
+ $tag =~ s/[<>\"]//g; # Get rid of the <">'s too.
+
+ &Apache::lonxml::debug("Compressed tag: $tag");
+ my @taglist = split(/ /,$tag);
+ foreach my $attribute (@taglist) {
+ if ($attribute =~ /^width/i) {
+ my ($e, $s)= split(/=/,$attribute);
+ $dw = $s;
+ }
+ if ($attribute =~ /^height/i) {
+ my ($e, $s) = split(/=/,$attribute);
+ $dh = $s;
+ }
+ }
+ return($dw, $dh);
+
+}
+
my ($height_param,$width_param);
sub start_randomlabel {
+
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
push (@Apache::lonxml::namespace,'randomlabel');
($height_param,$width_param)=(0,0);
+ $label_xscale = 1.0; # Assume image size not overridden.
+ $label_yscale = 1.0;
my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
@@ -100,6 +139,8 @@ sub start_randomlabel {
$cgi_id=&Apache::loncommon::get_cgi_id();
%args=();
$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+ $height_param = &Apache::lonxml::get_param('height',$parstack, $safeeval);
+ $width_param = &Apache::lonxml::get_param('width', $parstack, $safeeval);
} elsif ($target eq 'tex' && defined($bgimg)) {
$result.=&make_eps_image($bgimg,$parstack,$safeeval);
} elsif ($target eq 'edit') {
@@ -145,6 +186,7 @@ sub end_randomlabel {
return $result;
}
+
sub start_bgimg {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -160,7 +202,24 @@ sub end_bgimg {
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
my $bgimg=&Apache::lonxml::endredirection();
if ($target eq 'web') {
+
+ # If the tag produced has sizes, they override ours.
+ # (for now anyway).
+ #
+
+ &Apache::lonxml::debug("Base sizes: $width_param x $height_param");
+
+ my ($plot_x, $plot_y) = &extract_tag_sizes($bgimg,
+ $width_param,
+ $height_param );
+ &Apache::lonxml::debug("Extracted sizes: $plot_x x $plot_y");
+ $label_xscale = $plot_x / $width_param;
+ $label_yscale = $plot_y / $height_param;
+ &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
+
+ &Apache::lonxml::debug("Image: $bgimg");
$bgimg=&Apache::imageresponse::clean_up_image($bgimg);
+ &Apache::lonxml::debug("Cleaned image: $bgimg");
$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
} elsif ($target eq 'tex') {
# Some bg images can create latex for us... e.g. gnuplot.
@@ -171,19 +230,47 @@ sub end_bgimg {
my $src = $bgimg;
$src =~ s/\s+$//s;
$src =~ s/^\s+//s;
-
- if ($src =~ /^\\graphicspath/) {
- $height_param = $Apache::lonplot::plot{'height'}*0.3;
- $width_param = $Apache::lonplot::plot{'width'}*0.3;
+ #If this is a dynamically generated image, it will
+ #be in latex already, with a comment header that
+ #describes the dimensions:
+
+ if($src =~ /^%DYNAMICIMAGE:/) {
+ $Apache::lonxml::debug = 0;
+ &Apache::lonxml::debug("Dynamic image");
+ my ($commentline, $junk) = split(/\n/, $src);
+ &Apache::lonxml::debug("Comment line was: $commentline");
+ my $trash;
+ my $initial_width;
+ ($trash, $initial_width, $height_param, $width_param) =
+ split(/:/,$commentline);
+ &Apache::lonxml::debug("internal web Width/height: $initial_width $height_param");
+ &Apache::lonxml::debug("Texwitdh: $width_param");
+ if($initial_width == 0) {
+ $initial_width = $width_param;
+ }
+ # strip off the comments since output does not always
+ # preserve \n's:
+ #
+ $src =~ s/$commentline//;
+ $scale_factor = $width_param / $initial_width;
+ $height_param = $height_param*$scale_factor;
+
+ $label_xscale = 1.0; # $scale_factor;
+ $label_yscale = 1.0; # $scale_factor;
+
&Apache::lonxml::debug("height $height_param");
&Apache::lonxml::debug("Width $width_param");
- $scale_factor=1.0;
+ &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
my $dirty_width = $width_param + 5;
$result .= '\parbox{'.$dirty_width.'mm}{';
- $result .= $src;
+ $result .= " $src \n";
+ $result .= '\setlength{\unitlength}{1mm}'."\n";
$result .= '\begin{picture}('."$height_param,$width_param)";
$result .= "(0,-$height_param)";
+ $result .= "\n";
+ $Apache::lonxml::debug = 0;
+
} else {
@@ -344,17 +431,21 @@ sub end_labelgroup {
&Apache::structuretags::shuffle(\@idx_arr);
&Apache::lonxml::debug("Array is:".$#Apache::randomlabel::label_arr.":");
+ $Apache::lonxml::debug = 0;
for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
my $x = $Apache::randomlabel::xcoord[$i];
# FIXME the 3.5 here is the 'height' of the letter in TeX
my $y = $Apache::randomlabel::ycoord[$i]-3.5;
+ &Apache::lonxml::debug("initially: x= $x y= $y");
my $value = $Apache::randomlabel::value[$i];
#x latex coordinate
my $tcX=($x)*($width_param/$wwidth);
+ &Apache::lonxml::debug("wparam = $width_param wwidth = $wwidth, texx = $tcX");
#y latex coordinate
# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
my $tcY=$height_param-$y*($height_param/$wheight);
+ &Apache::lonxml::debug("hparam = $height_param wheight = $wheight texy = $tcY");
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result .= '\put('.$tcX.','.$tcY.'){';
@@ -375,6 +466,7 @@ sub end_labelgroup {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
}
}
+ $Apache::lonxml::debug =0;
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -383,9 +475,16 @@ sub end_labelgroup {
# <location x="123" y="456" value="some value"/>
sub start_location {
+ $Apache::lonxml::debug = 0;
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
+ &Apache::lonxml::debug("x = $x y = $y");
+ $x = $x*$label_xscale;
+ $y = $y*$label_yscale;
+ &Apache::lonxml::debug(" H = $height_param W = $width_param");
+ &Apache::lonxml::debug(" XS = $label_xscale YS = $label_yscale");
+ &Apache::lonxml::debug(" X = $x Y = $y");
my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
my $result='';
push(@Apache::randomlabel::xcoord,$x);
@@ -407,6 +506,7 @@ sub start_location {
$result.=&Apache::edit::handle_insert();
}
}
+ $Apache::lonxml::debug = 0;
return $result;
}