--- loncom/xml/lonplot.pm 2004/05/26 19:44:20 1.96
+++ loncom/xml/lonplot.pm 2005/02/24 22:01:40 1.105
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.96 2004/05/26 19:44:20 matthew Exp $
+# $Id: lonplot.pm,v 1.105 2005/02/24 22:01:40 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,8 +36,17 @@ use Apache::response;
use Apache::lonxml;
use Apache::edit;
+use vars qw/$weboutputformat $versionstring/;
+
BEGIN {
- &Apache::lonxml::register('Apache::lonplot',('gnuplot'));
+ &Apache::lonxml::register('Apache::lonplot',('gnuplot'));
+ #
+ # Determine the version of GNUPLOT
+ $weboutputformat = 'gif';
+ $versionstring = `gnuplot --version 2>/dev/null`;
+ if ($versionstring =~ /^gnuplot 4/) {
+ $weboutputformat = 'png';
+ }
}
##
@@ -110,7 +119,10 @@ my $words_test = sub {$_[0]=~s/\s+/
###################################################################
my @gnuplot_edit_order =
qw/alttag bgcolor fgcolor height width font transparent grid samples
- border align texwidth texfont plottype/;
+ border align texwidth texfont plotcolor plottype lmargin rmargin tmargin
+ bmargin major_ticscale minor_ticscale/;
+
+my $margin_choices = ['default',0..20];
my %gnuplot_defaults =
(
@@ -202,6 +214,13 @@ my %gnuplot_defaults =
edit_type => 'choice',
choices => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/],
},
+ plotcolor => {
+ default => 'monochrome',
+ test => sub {$_[0]=~/^(monochrome|color|colour)$/},
+ description => 'Color setting for printing:',
+ edit_type => 'choice',
+ choices => [qw/monochrome color colour/],
+ },
plottype => {
default => 'Cartesian',
test => sub {$_[0]=~/^(Polar|Cartesian)$/},
@@ -209,6 +228,48 @@ my %gnuplot_defaults =
edit_type => 'choice',
choices => ['Cartesian','Polar']
},
+ lmargin => {
+ default => 'default',
+ test => sub {$_[0]=~/^(default|\d+)$/},
+ description => 'Left margin width (pts):',
+ edit_type => 'choice',
+ choices => $margin_choices,
+ },
+ rmargin => {
+ default => 'default',
+ test => sub {$_[0]=~/^(default|\d+)$/},
+ description => 'Right margin width (pts):',
+ edit_type => 'choice',
+ choices => $margin_choices,
+ },
+ tmargin => {
+ default => 'default',
+ test => sub {$_[0]=~/^(default|\d+)$/},
+ description => 'Top margin width (pts):',
+ edit_type => 'choice',
+ choices => $margin_choices,
+ },
+ bmargin => {
+ default => 'default',
+ test => sub {$_[0]=~/^(default|\d+)$/},
+ description => 'Bottom margin width (pts):',
+ edit_type => 'choice',
+ choices => $margin_choices,
+ },
+ major_ticscale => {
+ default => '1',
+ test => $real_test,
+ description => 'Size of major tic marks (plot coordinates)',
+ edit_type => 'entry',
+ size => '5'
+ },
+ minor_ticscale => {
+ default => '0.5',
+ test => $real_test,
+ description => 'Size of minor tic mark (plot coordinates)',
+ edit_type => 'entry',
+ size => '5'
+ },
);
my %key_defaults =
@@ -302,7 +363,7 @@ my %tic_defaults =
minorfreq => {
default => '0',
test => $int_test,
- description => 'Number of minor tics between major tic marks',
+ description => 'Number of minor tics per major tic mark',
edit_type => 'entry',
size => '10'
},
@@ -460,7 +521,7 @@ sub end_gnuplot {
## return image tag for the plot
if ($target eq 'web') {
$result .= <<"ENDIMAGE";
-
{'function'})) {
+ if ($curve->{'function'} !~ /^\s*$/) {
+ push(@curvescopy,$curve);
+ }
+ } elsif (exists($curve->{'data'})) {
+ foreach my $data (@{$curve->{'data'}}) {
+ if (scalar(@$data) > 0) {
+ push(@curvescopy,$curve);
+ last;
+ }
+ }
+ }
+ }
+ @curves = @curvescopy;
# Collect all the colors
my @Colors;
push @Colors, $plot{'bgcolor'};
@@ -957,7 +1036,7 @@ sub write_gnuplot_file {
}
# set term
if ($target eq 'web') {
- $gnuplot_input .= 'set term gif ';
+ $gnuplot_input .= 'set term '.$weboutputformat .' ';
$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
$gnuplot_input .= $plot{'font'} . ' ';
$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
@@ -965,7 +1044,7 @@ sub write_gnuplot_file {
# set output
$gnuplot_input .= "set output\n";
} elsif ($target eq 'tex') {
- $gnuplot_input .= "set term postscript eps monochrome solid \"Helvetica\" $pt \n";
+ $gnuplot_input .= "set term postscript eps $plot{'plotcolor'} solid \"Helvetica\" $pt \n";
$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
&Apache::lonnet::unescape($filename).".eps\"\n";
}
@@ -975,6 +1054,22 @@ sub write_gnuplot_file {
} else {
# Assume Cartesian
}
+ # margin
+ if (lc($plot{'lmargin'}) ne 'default') {
+ $gnuplot_input .= 'set lmargin '.$plot{'lmargin'}.$/;
+ }
+ if (lc($plot{'rmargin'}) ne 'default') {
+ $gnuplot_input .= 'set rmargin '.$plot{'rmargin'}.$/;
+ }
+ if (lc($plot{'tmargin'}) ne 'default') {
+ $gnuplot_input .= 'set tmargin '.$plot{'tmargin'}.$/;
+ }
+ if (lc($plot{'bmargin'}) ne 'default') {
+ $gnuplot_input .= 'set bmargin '.$plot{'bmargin'}.$/;
+ }
+ # tic scales
+ $gnuplot_input .= 'set ticscale '.
+ $plot{'major_ticscale'}.' '.$plot{'minor_ticscale'}.$/;
# grid
$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
# border
@@ -1034,7 +1129,11 @@ sub write_gnuplot_file {
my $label;
foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
- $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.' font "Helvetica,'.$pt.'pt"'.$/ ;
+ $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
+ if ($target eq 'tex') {
+ $gnuplot_input .=' font "Helvetica,'.$pt.'pt"' ;
+ }
+ $gnuplot_input .= $/;
}
if ($target eq 'tex') {
$gnuplot_input .="set size 1,".$plot{'height'}/$plot{'width'}*1.38;
@@ -1145,10 +1244,10 @@ sub edit_attributes {
($description,$attr,$token,
$defaults->{$attr}->{'size'});
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
- $result .= &Apache::edit::select_arg
+ $result .= &Apache::edit::select_or_text_arg
($description,$attr,$defaults->{$attr}->{'choices'},$token);
} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {
- $result .= &Apache::edit::select_arg
+ $result .= &Apache::edit::select_or_text_arg
($description,$attr,['on','off'],$token);
}
$result .= '
';