version 1.123, 2007/08/03 06:00:18
|
version 1.128, 2007/08/09 06:25:43
|
Line 206 my %gnuplot_defaults =
|
Line 206 my %gnuplot_defaults =
|
font => { |
font => { |
default => '9', |
default => '9', |
test => $sml_test, |
test => $sml_test, |
description => 'Size of font to use', |
description => 'Font size to use in web output (pts)', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']] |
choices => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15'] |
}, |
}, |
fontface => { |
fontface => { |
default => 'sans-serif', |
default => 'sans-serif', |
Line 501 my %curve_defaults =
|
Line 501 my %curve_defaults =
|
choices => [keys(%linestyles)] |
choices => [keys(%linestyles)] |
}, |
}, |
linewidth => { |
linewidth => { |
default => 4, |
default => 2, |
test => $int_test, |
test => $int_test, |
description => 'Line width (may not apply to all line styles)', |
description => 'Line width (may not apply to all line styles)', |
edit_type => 'choice', |
edit_type => 'choice', |
Line 703 my %font_properties =
|
Line 703 my %font_properties =
|
); |
); |
|
|
sub get_font { |
sub get_font { |
|
my ($target) = @_; |
my ($size, $selected_font); |
my ($size, $selected_font); |
|
|
if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) { |
if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) { |
Line 712 sub get_font {
|
Line 713 sub get_font {
|
} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') { |
} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') { |
$size = '9'; |
$size = '9'; |
} elsif ( $Apache::lonplot::plot{'font'} eq 'large') { |
} elsif ( $Apache::lonplot::plot{'font'} eq 'large') { |
$size = '15'; |
$size = '11'; |
} else { |
} else { |
$size = '9'; |
$size = '9'; |
} |
} |
Line 720 sub get_font {
|
Line 721 sub get_font {
|
$size = $Apache::lonplot::plot{'font'}; |
$size = $Apache::lonplot::plot{'font'}; |
$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}}; |
$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}}; |
} |
} |
|
if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) { |
|
$size = $Apache::lonplot::plot{'texfont'}; |
|
} |
return ($size, $selected_font); |
return ($size, $selected_font); |
} |
} |
|
|
Line 753 sub end_key {
|
Line 757 sub end_key {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub parse_label { |
|
my ($target,$text) = @_; |
|
my $parser=HTML::LCParser->new(\$text); |
|
my $result; |
|
while (my $token=$parser->get_token) { |
|
if ($token->[0] eq 'S') { |
|
if ($token->[1] eq 'sub') { |
|
$result .= '_{'; |
|
} elsif ($token->[1] eq 'sup') { |
|
$result .= '^{'; |
|
} else { |
|
$result .= $token->[4]; |
|
} |
|
} elsif ($token->[0] eq 'E') { |
|
if ($token->[1] eq 'sub' |
|
|| $token->[1] eq 'sup') { |
|
$result .= '}'; |
|
} else { |
|
$result .= $token->[2]; |
|
} |
|
} elsif ($token->[0] eq 'T') { |
|
$result .= &replace_entities($target,$token->[1]); |
|
} |
|
} |
|
return $result; |
|
} |
|
|
|
|
|
my %lookup = |
|
('(pi|#960)' => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},); |
|
|
|
sub replace_entities { |
|
my ($target,$text) = @_; |
|
$text =~ s{([_^~\{\}]|\\\\)}{\\\\$1}g; |
|
while (my ($re, $replace) = each(%lookup)) { |
|
$text =~ s/&$re;/$replace->{$target}/g; |
|
} |
|
$text =~ s{(&)}{\\\\$1}g; |
|
return $text; |
|
} |
|
|
##------------------------------------------------------------------- title |
##------------------------------------------------------------------- title |
sub start_title { |
sub start_title { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
Line 764 sub start_title {
|
Line 809 sub start_title {
|
if (length($title) > $max_str_len) { |
if (length($title) > $max_str_len) { |
$title = substr($title,0,$max_str_len); |
$title = substr($title,0,$max_str_len); |
} |
} |
|
$title = &parse_label($target,$title); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style); |
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style); |
Line 795 sub start_xlabel {
|
Line 841 sub start_xlabel {
|
if (length($xlabel) > $max_str_len) { |
if (length($xlabel) > $max_str_len) { |
$xlabel = substr($xlabel,0,$max_str_len); |
$xlabel = substr($xlabel,0,$max_str_len); |
} |
} |
|
$xlabel = &parse_label($target,$xlabel); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style); |
Line 827 sub start_ylabel {
|
Line 874 sub start_ylabel {
|
if (length($ylabel) > $max_str_len) { |
if (length($ylabel) > $max_str_len) { |
$ylabel = substr($ylabel,0,$max_str_len); |
$ylabel = substr($ylabel,0,$max_str_len); |
} |
} |
|
$ylabel = &parse_label($target,$ylabel); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); |
Line 860 sub start_label {
|
Line 908 sub start_label {
|
$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]); |
$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]); |
$text =~ s/\n/ /g; |
$text =~ s/\n/ /g; |
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len); |
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len); |
$label{'text'} = $text; |
$label{'text'} = &parse_label($target,$text); |
push(@labels,\%label); |
push(@labels,\%label); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Plot Label'); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Label'); |
Line 1117 sub get_attributes{
|
Line 1165 sub get_attributes{
|
##------------------------------------------------------- write_gnuplot_file |
##------------------------------------------------------- write_gnuplot_file |
sub write_gnuplot_file { |
sub write_gnuplot_file { |
my ($tmpdir,$filename,$target)= @_; |
my ($tmpdir,$filename,$target)= @_; |
my ($fontsize, $font_properties) = &get_font(); |
my ($fontsize, $font_properties) = &get_font($target); |
my $gnuplot_input = ''; |
my $gnuplot_input = ''; |
my $curve; |
my $curve; |
my $pt = $Apache::lonplot::plot{'texfont'}; |
|
# |
# |
# Check to be sure we do not have any empty curves |
# Check to be sure we do not have any empty curves |
my @curvescopy; |
my @curvescopy; |
Line 1233 sub write_gnuplot_file {
|
Line 1280 sub write_gnuplot_file {
|
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n"; |
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n"; |
# title, xlabel, ylabel |
# title, xlabel, ylabel |
# titles |
# titles |
|
my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : ''; |
|
my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : ''; |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($title)) ; |
$gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ; |
$gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($xlabel)); |
$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($ylabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel)); |
} else { |
} else { |
$gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ; |
$gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ; |
$gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel)); |
$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel)); |
} |
} |
# tics |
# tics |
if (%xtics) { |
if (%xtics) { |
Line 1284 sub write_gnuplot_file {
|
Line 1334 sub write_gnuplot_file {
|
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '. |
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '. |
$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}; |
$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}; |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$pt.'pt"' ; |
$gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ; |
} |
} |
$gnuplot_input .= $/; |
$gnuplot_input .= $/; |
} |
} |
Line 1356 sub write_gnuplot_file {
|
Line 1406 sub write_gnuplot_file {
|
} |
} |
} |
} |
# Write the output to a file. |
# Write the output to a file. |
my $fh=Apache::File->new(">$tmpdir$filename.data"); |
open (my $fh,">$tmpdir$filename.data"); |
|
binmode($fh, ":utf8"); |
print $fh $gnuplot_input; |
print $fh $gnuplot_input; |
close($fh); |
close($fh); |
# That's all folks. |
# That's all folks. |