version 1.128, 2007/08/09 06:25:43
|
version 1.129, 2007/08/28 23:48:39
|
Line 36 use Apache::response;
|
Line 36 use Apache::response;
|
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::edit; |
use Apache::edit; |
use Apache::lonnet; |
use Apache::lonnet; |
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
use LONCAPA; |
|
|
|
|
use vars qw/$weboutputformat $versionstring/; |
use vars qw/$weboutputformat $version/; |
|
|
|
|
|
|
Line 49 BEGIN {
|
Line 48 BEGIN {
|
# |
# |
# Determine the version of GNUPLOT |
# Determine the version of GNUPLOT |
$weboutputformat = 'gif'; |
$weboutputformat = 'gif'; |
$versionstring = `gnuplot --version 2>/dev/null`; |
my $versionstring = `gnuplot --version 2>/dev/null`; |
if ($versionstring =~ /^gnuplot 4/) { |
($version) = ($versionstring =~ /^gnuplot ([\d.]+)/); |
|
if ($version >= 4) { |
$weboutputformat = 'png'; |
$weboutputformat = 'png'; |
} |
} |
|
|
Line 1259 sub write_gnuplot_file {
|
Line 1259 sub write_gnuplot_file {
|
if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') { |
if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') { |
$gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/; |
$gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/; |
} |
} |
|
|
# tic scales |
# tic scales |
$gnuplot_input .= 'set ticscale '. |
if ($version > 4) { |
$Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/; |
$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 |
#boxwidth |
if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') { |
if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') { |
$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/; |
$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/; |