version 1.82, 2006/05/30 12:45:37
|
version 1.87, 2007/05/10 10:46:51
|
Line 70 my $cgi_id;
|
Line 70 my $cgi_id;
|
my $scale_factor; # image scale factor. |
my $scale_factor; # image scale factor. |
my $label_xscale; # Label scale factor (needed for gnuplot). |
my $label_xscale; # Label scale factor (needed for gnuplot). |
my $label_yscale; |
my $label_yscale; |
|
my $dirty_width_adjust = 5; # Width adjustment for e.g. gnuplot images. |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg')); |
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg')); |
Line 268 sub end_bgimg {
|
Line 268 sub end_bgimg {
|
&Apache::lonxml::debug("height $height_param"); |
&Apache::lonxml::debug("height $height_param"); |
&Apache::lonxml::debug("Width $width_param"); |
&Apache::lonxml::debug("Width $width_param"); |
&Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale"); |
&Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale"); |
my $dirty_width = $width_param + 5; |
my $dirty_width = $width_param + $dirty_width_adjust; |
|
my $x_offset = -$dirty_width_adjust/2.0; |
|
# |
|
# Somewhere here it looks like height_param and |
|
# width_param got backwards... |
|
# |
$result .= '\parbox{'.$dirty_width.'mm}{'; |
$result .= '\parbox{'.$dirty_width.'mm}{'; |
$result .= " $src \n"; |
$result .= " $src \n"; |
$result .= '\setlength{\unitlength}{1mm}'."\n"; |
$result .= '\setlength{\unitlength}{1mm}'."\n"; |
$result .= '\begin{picture}('."$height_param,$width_param)"; |
$result .= '\begin{picture}('."$width_param,$height_param)"; |
$result .= "(0,-$height_param)"; |
$result .= "($x_offset,-$height_param)"; |
$result .= "\n"; |
$result .= "\n"; |
$Apache::lonxml::debug = 0; |
$Apache::lonxml::debug = 0; |
|
|
Line 296 sub make_eps_image {
|
Line 301 sub make_eps_image {
|
&Apache::lonxml::debug("Image size: $height_param x $width_param"); |
&Apache::lonxml::debug("Image size: $height_param x $width_param"); |
|
|
my $dirtywidth=$width_param+5; |
my $dirtywidth=$width_param+5; |
|
|
my $result ="\n".'\vspace*{2mm}\noindent'."\n". |
my $result ="\n".'\vspace*{2mm}\noindent'."\n". |
'\parbox{'.$dirtywidth. |
'\parbox{'.$dirtywidth. |
' mm}{ \noindent \epsfxsize='.$width_param. |
' mm}{ \noindent \epsfxsize='.$width_param. |
Line 482 sub end_labelgroup {
|
Line 488 sub end_labelgroup {
|
} elsif ( $type eq 'image') { |
} elsif ( $type eq 'image') { |
my ($path,$file) = &Apache::londefdef::get_eps_image($label); |
my ($path,$file) = &Apache::londefdef::get_eps_image($label); |
my $image_name = $path.$file; |
my $image_name = $path.$file; |
|
# |
|
# Note that spaces in e.. \includegraphics cause problems for Latex |
|
# so they get replaced by _'s by lonprintout/printout and us: |
|
# |
my $label_width = &get_label_width($label); |
my $label_width = &get_label_width($label); |
|
|
$result .= '\includegraphics[width='.$label_width.'mm]{' |
$result .= '\includegraphics[width='.$label_width.'mm]{' |