--- loncom/xml/lonplot.pm 2007/08/03 06:08:06 1.124
+++ loncom/xml/lonplot.pm 2007/12/14 06:34:59 1.133
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.124 2007/08/03 06:08:06 albertel Exp $
+# $Id: lonplot.pm,v 1.133 2007/12/14 06:34:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,11 +36,10 @@ use Apache::response;
use Apache::lonxml;
use Apache::edit;
use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
-use vars qw/$weboutputformat $versionstring/;
+use vars qw/$weboutputformat $version/;
@@ -49,8 +48,9 @@ BEGIN {
#
# Determine the version of GNUPLOT
$weboutputformat = 'gif';
- $versionstring = `gnuplot --version 2>/dev/null`;
- if ($versionstring =~ /^gnuplot 4/) {
+ my $versionstring = `gnuplot --version 2>/dev/null`;
+ ($version) = ($versionstring =~ /^gnuplot ([\d.]+)/);
+ if ($version >= 4) {
$weboutputformat = 'png';
}
@@ -206,9 +206,9 @@ my %gnuplot_defaults =
font => {
default => '9',
test => $sml_test,
- description => 'Size of font to use',
+ description => 'Font size to use in web output (pts)',
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 => {
default => 'sans-serif',
@@ -435,7 +435,7 @@ my %tic_defaults =
},
);
-my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
+my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat');
my %axis_defaults =
(
color => {
@@ -472,7 +472,22 @@ my %axis_defaults =
description => 'Maximum y-value shown in plot',
edit_type => 'entry',
size => '10'
- }
+ },
+ xformat => {
+ default => 'on',
+ test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+ description => 'X-axis number formatting',
+ edit_type => 'choice',
+ choices => ['on', 'off', '2e', '2f'],
+ },
+ yformat => {
+ default => 'on',
+ test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+ description => 'X-axis number formatting',
+ edit_type => 'choice',
+ choices => ['on', 'off', '2e', '2f'],
+ },
+
);
my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit');
@@ -501,7 +516,7 @@ my %curve_defaults =
choices => [keys(%linestyles)]
},
linewidth => {
- default => 4,
+ default => 1,
test => $int_test,
description => 'Line width (may not apply to all line styles)',
edit_type => 'choice',
@@ -713,7 +728,7 @@ sub get_font {
} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') {
$size = '9';
} elsif ( $Apache::lonplot::plot{'font'} eq 'large') {
- $size = '15';
+ $size = '11';
} else {
$size = '9';
}
@@ -757,6 +772,96 @@ sub end_key {
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 =
+ ('(Alpha|#913)' => {'tex' => '{/Symbol A}', 'web' => "\x{391}"},
+ '(Beta|#914)' => {'tex' => '{/Symbol B}', 'web' => "\x{392}"},
+ '(Chi|#935)' => {'tex' => '{/Symbol C}', 'web' => "\x{3A7}"},
+ '(Delta|#916)' => {'tex' => '{/Symbol D}', 'web' => "\x{394}"},
+ '(Epsilon|#917)' => {'tex' => '{/Symbol E}', 'web' => "\x{395}"},
+ '(Phi|#934)' => {'tex' => '{/Symbol F}', 'web' => "\x{3A6}"},
+ '(Gamma|#915)' => {'tex' => '{/Symbol G}', 'web' => "\x{393}"},
+ '(Eta|#919)' => {'tex' => '{/Symbol H}', 'web' => "\x{397}"},
+ '(Iota|#921)' => {'tex' => '{/Symbol I}', 'web' => "\x{399}"},
+ '(Kappa|#922)' => {'tex' => '{/Symbol K}', 'web' => "\x{39A}"},
+ '(Lambda|#923)' => {'tex' => '{/Symbol L}', 'web' => "\x{39B}"},
+ '(Mu|#924)' => {'tex' => '{/Symbol M}', 'web' => "\x{39C}"},
+ '(Nu|#925)' => {'tex' => '{/Symbol N}', 'web' => "\x{39D}"},
+ '(Omicron|#927)' => {'tex' => '{/Symbol O}', 'web' => "\x{39F}"},
+ '(Pi|#928)' => {'tex' => '{/Symbol P}', 'web' => "\x{3A0}"},
+ '(Theta|#920)' => {'tex' => '{/Symbol Q}', 'web' => "\x{398}"},
+ '(Rho|#929)' => {'tex' => '{/Symbol R}', 'web' => "\x{3A1}"},
+ '(Sigma|#931)' => {'tex' => '{/Symbol S}', 'web' => "\x{3A3}"},
+ '(Tau|#932)' => {'tex' => '{/Symbol T}', 'web' => "\x{3A4}"},
+ '(Upsilon|#933)' => {'tex' => '{/Symbol U}', 'web' => "\x{3A5}"},
+ '(Omega|#937)' => {'tex' => '{/Symbol W}', 'web' => "\x{3A9}"},
+ '(Xi|#926)' => {'tex' => '{/Symbol X}', 'web' => "\x{39E}"},
+ '(Psi|#936)' => {'tex' => '{/Symbol Y}', 'web' => "\x{3A8}"},
+ '(Zeta|#918)' => {'tex' => '{/Symbol Z}', 'web' => "\x{396}"},
+ '(alpha|#945)' => {'tex' => '{/Symbol a}', 'web' => "\x{3B1}"},
+ '(beta|#946)' => {'tex' => '{/Symbol b}', 'web' => "\x{3B2}"},
+ '(chi|#967)' => {'tex' => '{/Symbol c}', 'web' => "\x{3C7}"},
+ '(delta|#948)' => {'tex' => '{/Symbol d}', 'web' => "\x{3B4}"},
+ '(epsilon|#949)' => {'tex' => '{/Symbol e}', 'web' => "\x{3B5}"},
+ '(phi|#966)' => {'tex' => '{/Symbol f}', 'web' => "\x{3C6}"},
+ '(gamma|#947)' => {'tex' => '{/Symbol g}', 'web' => "\x{3B3}"},
+ '(eta|#951)' => {'tex' => '{/Symbol h}', 'web' => "\x{3B7}"},
+ '(iota|#953)' => {'tex' => '{/Symbol i}', 'web' => "\x{3B9}"},
+ '(kappa|#954)' => {'tex' => '{/Symbol k}', 'web' => "\x{3BA}"},
+ '(lambda|#955)' => {'tex' => '{/Symbol k}', 'web' => "\x{3BB}"},
+ '(mu|#956)' => {'tex' => '{/Symbol m}', 'web' => "\x{3BC}"},
+ '(nu|#957)' => {'tex' => '{/Symbol n}', 'web' => "\x{3BD}"},
+ '(omicron|#959)' => {'tex' => '{/Symbol o}', 'web' => "\x{3BF}"},
+ '(pi|#960)' => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},
+ '(theta|#952)' => {'tex' => '{/Symbol q}', 'web' => "\x{3B8}"},
+ '(rho|#961)' => {'tex' => '{/Symbol r}', 'web' => "\x{3C1}"},
+ '(sigma|#963)' => {'tex' => '{/Symbol s}', 'web' => "\x{3C3}"},
+ '(tau|#964)' => {'tex' => '{/Symbol t}', 'web' => "\x{3C4}"},
+ '(upsilon|#965)' => {'tex' => '{/Symbol u}', 'web' => "\x{3C5}"},
+ '(omega|#969)' => {'tex' => '{/Symbol w}', 'web' => "\x{3C9}"},
+ '(xi|#958)' => {'tex' => '{/Symbol x}', 'web' => "\x{3BE}"},
+ '(psi|#968)' => {'tex' => '{/Symbol y}', 'web' => "\x{3C8}"},
+ '(zeta|#950)' => {'tex' => '{/Symbol z}', 'web' => "\x{3B6}"},
+ );
+
+
+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
sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -768,6 +873,7 @@ sub start_title {
if (length($title) > $max_str_len) {
$title = substr($title,0,$max_str_len);
}
+ $title = &parse_label($target,$title);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
@@ -799,6 +905,7 @@ sub start_xlabel {
if (length($xlabel) > $max_str_len) {
$xlabel = substr($xlabel,0,$max_str_len);
}
+ $xlabel = &parse_label($target,$xlabel);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
@@ -831,6 +938,7 @@ sub start_ylabel {
if (length($ylabel) > $max_str_len) {
$ylabel = substr($ylabel,0,$max_str_len);
}
+ $ylabel = &parse_label($target,$ylabel);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
@@ -864,7 +972,7 @@ sub start_label {
$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
$text =~ s/\n/ /g;
$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);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
@@ -1215,9 +1323,15 @@ sub write_gnuplot_file {
if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') {
$gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/;
}
+
# tic scales
- $gnuplot_input .= 'set ticscale '.
- $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+ if ($version > 4) {
+ $gnuplot_input .= 'set tics scale '.
+ $Apache::lonplot::plot{'major_ticscale'}.', '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+ } else {
+ $gnuplot_input .= 'set ticscale '.
+ $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+ }
#boxwidth
if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') {
$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/;
@@ -1236,14 +1350,17 @@ sub write_gnuplot_file {
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
# title, xlabel, ylabel
# 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') {
- $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
} else {
- $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
}
# tics
if (%xtics) {
@@ -1268,6 +1385,22 @@ sub write_gnuplot_file {
}
# axis
if (%axis) {
+ if ($axis{'xformat'} ne 'on') {
+ $gnuplot_input .= "set format x ";
+ if ($axis{'xformat'} eq 'off') {
+ $gnuplot_input .= "\"\"\n";
+ } else {
+ $gnuplot_input .= "\"\%.".$axis{'xformat'}."\"\n";
+ }
+ }
+ if ($axis{'yformat'} ne 'on') {
+ $gnuplot_input .= "set format y ";
+ if ($axis{'yformat'} eq 'off') {
+ $gnuplot_input .= "\"\"\n";
+ } else {
+ $gnuplot_input .= "\"\%.".$axis{'yformat'}."\"\n";
+ }
+ }
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
}
@@ -1308,7 +1441,6 @@ sub write_gnuplot_file {
$curve->{'function'}.' title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
- $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
if (($curve->{'linestyle'} eq 'points') ||
($curve->{'linestyle'} eq 'linespoints') ||
@@ -1321,6 +1453,8 @@ sub write_gnuplot_file {
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$gnuplot_input.= ' '.$curve->{'limit'};
}
+ $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
+
} elsif (exists($curve->{'data'})) {
# Store data values in $datatext
my $datatext = '';
@@ -1344,7 +1478,6 @@ sub write_gnuplot_file {
$gnuplot_input.= '"'.$datafilename.'" title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
- $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
if (($curve->{'linestyle'} eq 'points') ||
($curve->{'linestyle'} eq 'linespoints') ||
($curve->{'linestyle'} eq 'errorbars') ||
@@ -1356,10 +1489,12 @@ sub write_gnuplot_file {
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$gnuplot_input.= ' '.$curve->{'limit'};
}
+ $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
}
}
# 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;
close($fh);
# That's all folks.