version 1.83, 2006/08/29 10:42:59
|
version 1.89, 2007/06/20 17:33:33
|
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 147 sub start_randomlabel {
|
Line 147 sub start_randomlabel {
|
} elsif ($target eq 'tex' && defined($bgimg)) { |
} elsif ($target eq 'tex' && defined($bgimg)) { |
$result.=&make_eps_image($bgimg,$parstack,$safeeval); |
$result.=&make_eps_image($bgimg,$parstack,$safeeval); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$Apache::edit::bgimgsrc= |
$Apache::edit::bgimgsrc= |
&Apache::lonxml::get_param('bgimg',$parstack,$safeeval); |
&Apache::lonxml::get_param('bgimg',$parstack,$safeeval); |
$Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth; |
$Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth; |
$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '; |
$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '; |
$result.=&Apache::edit::browse('bgimg').' '; |
$result.=&Apache::edit::browse('bgimg',undef,undef,$only).' '; |
$result.=&Apache::edit::search('bgimg').'<br />'. |
$result.=&Apache::edit::search('bgimg').'<br />'. |
&Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6). |
&Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6). |
&Apache::edit::text_arg('Height(pixel):','height' ,$token,6). |
&Apache::edit::text_arg('Height(pixel):','height' ,$token,6). |
Line 164 sub start_randomlabel {
|
Line 165 sub start_randomlabel {
|
'height','texwidth'); |
'height','texwidth'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::handle_insert(); |
|
} |
} |
} |
} |
return $result; |
return $result; |
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; |
# |
|
# Note that lonprintout/prinout will conspire to replace |
|
# spaces in paths and names with _'s since spacess cause problems |
|
# for latex included filenames. Therefore: |
|
# |
|
my $safe_path = $path; |
|
$safe_path =~ s/ /\_/g; |
|
my $safe_file = $file; |
|
$safe_file =~ s/ /\_/g; |
|
|
|
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. |
' mm \epsffile{'.$safe_path.$safe_file. |
' mm \epsffile{'.$path.$file. |
'}\setlength{\unitlength}{1mm}'."\n".' \begin{picture}('. |
'}\setlength{\unitlength}{1mm}'."\n".' \begin{picture}('. |
$width_param.','.$height_param.')(0,-'.$height_param.')'."\n"; |
$width_param.','.$height_param.')(0,-'.$height_param.')'."\n"; |
my $magick = Image::Magick->new; |
my $magick = Image::Magick->new; |
Line 358 sub start_labelgroup {
|
Line 354 sub start_labelgroup {
|
'TeXsize'); |
'TeXsize'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::handle_insert(); |
|
} |
} |
} |
} |
return $result; |
return $result; |
Line 496 sub end_labelgroup {
|
Line 491 sub end_labelgroup {
|
# Note that spaces in e.. \includegraphics cause problems for Latex |
# Note that spaces in e.. \includegraphics cause problems for Latex |
# so they get replaced by _'s by lonprintout/printout and us: |
# so they get replaced by _'s by lonprintout/printout and us: |
# |
# |
$image_name =~ s/ /\_/g; |
|
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]{' |
Line 545 sub start_location {
|
Line 539 sub start_location {
|
$safeeval,'x','y','value'); |
$safeeval,'x','y','value'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::handle_insert(); |
|
} |
} |
} |
} |
$Apache::lonxml::debug = 0; |
$Apache::lonxml::debug = 0; |