--- loncom/xml/lonplot.pm 2003/09/19 17:53:03 1.89
+++ loncom/xml/lonplot.pm 2006/05/30 12:47:53 1.113
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.89 2003/09/19 17:53:03 matthew Exp $
+# $Id: lonplot.pm,v 1.113 2006/05/30 12:47:53 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,11 +25,6 @@
#
# http://www.lon-capa.org/
#
-# 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
-# 01/01/02 Matthew
-# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew
-# 01/21 02/05 02/06 2/28Matthew
package Apache::lonplot;
@@ -40,11 +35,28 @@ use Apache::File;
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/;
+
+
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';
+ }
+
}
+
##
## Description of data structures:
##
@@ -93,6 +105,7 @@ my %linestyles =
yerrorbars => [3,4],
xyerrorbars => [4,6],
boxes => 3,
+ filledcurves => 2,
vector => 4
);
@@ -115,39 +128,11 @@ my $words_test = sub {$_[0]=~s/\s+/
###################################################################
my @gnuplot_edit_order =
qw/alttag bgcolor fgcolor height width font transparent grid samples
- border align texwidth plottype/;
+ border align texwidth texfont plotcolor plottype lmargin rmargin tmargin
+ bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
+ pattern solid/;
-my $gnuplot_help_text = <<"ENDPLOTHELP";
-<p>
-The <b>gnuplot</b> tag allows an author to design a plot which can
-be created on the fly. This is intended for use in homework problems
-where each student needs to see a distinct plot. It can be used in
-conjunction with a <b>script</b> tag to generate random plots.
-</p><p>
-A <b>gnuplot</b> tag can contain the following sub-tags:
-</p>
-<dl>
-<dt> Plot Label
- <dd> Allows you to place text at a given (x,y) coordinate on the plot.
-<dt> Plot Title
- <dd> The title of the plot
-<dt> Plot Xlabel
- <dd> The label on the horizontal axis of the plot
-<dt> Plot Ylabel
- <dd> The label on the vertical axis of the plot
-<dt> Plot Axes
- <dd> allows specification of the x and y ranges displayed in the plot
-<dt> Plot Key
- <dd> Lists the functions displayed in the plot.
-<dt> Plot Curve
- <dd> Sets the data used in the plot.
-<dt> Plot Tics
- <dd> Allows specification of the x and y coordinate 'tics' on the axes.
-This is mostly used to adjust the grid lines when a grid is displayed.
-</dl>
-If you are having trouble with your plot, please read the help
-available on Plot Curve.
-ENDPLOTHELP
+my $margin_choices = ['default',0..20];
my %gnuplot_defaults =
(
@@ -198,6 +183,19 @@ my %gnuplot_defaults =
description => 'Display grid',
edit_type => 'onoff'
},
+ gridlayer => {
+ default => 'off',
+ test => $onoff_test,
+ description => 'Display grid front layer over filled boxes or filled curves',
+ edit_type => 'onoff'
+ },
+ box_border => {
+ default => 'noborder',
+ test => sub {$_[0]=~/^(noborder|border)$/},
+ description => 'Draw border for boxes',
+ edit_type => 'choice',
+ choices => ['border','noborder']
+ },
border => {
default => 'on',
test => $onoff_test,
@@ -211,7 +209,7 @@ my %gnuplot_defaults =
edit_type => 'choice',
choices => ['small','medium','large']
},
- samples => {
+ samples => {
default => '100',
test => $int_test,
description => 'Number of samples for non-data plots',
@@ -232,12 +230,96 @@ my %gnuplot_defaults =
edit_type => 'entry',
size => '5'
},
- plottype => {
+ texfont => {
+ default => '22',
+ test => $int_test,
+ description => 'Font size to use in TeX output (pts):',
+ 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/],
+ },
+ pattern => {
+ default => '',
+ test => $int_test,
+ description => 'pattern value for boxes:',
+ edit_type => 'choice',
+ choices => [0,1,2,3,4,5,6]
+ },
+ solid => {
+ default => 0,
+ test => $real_test,
+ description => 'The density of fill style for boxes',
+ edit_type => 'entry',
+ size => '5'
+ },
+ fillstyle => {
+ default => 'empty',
+ test => sub {$_[0]=~/^(empty|solid|pattern)$/},
+ description => 'Filled style for boxes:',
+ edit_type => 'choice',
+ choices => ['empty','solid','pattern']
+ },
+ plottype => {
default => 'Cartesian',
test => sub {$_[0]=~/^(Polar|Cartesian)$/},
description => 'Plot type:',
edit_type => 'choice',
- choices => ['Polar','Cartesian']
+ 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,
+ },
+ boxwidth => {
+ default => '',
+ test => $real_test,
+ description => 'width of boxes default auto',
+ edit_type => 'entry',
+ size => '5'
+ },
+ 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'
},
);
@@ -298,41 +380,41 @@ my %tic_defaults =
location => {
default => 'border',
test => sub {$_[0]=~/^(border|axis)$/},
- description => 'Location of major tick marks',
+ description => 'Location of major tic marks',
edit_type => 'choice',
choices => ['border','axis']
},
mirror => {
default => 'on',
test => $onoff_test,
- description => 'mirror ticks on opposite axis?',
+ description => 'mirror tics on opposite axis?',
edit_type => 'onoff'
},
start => {
default => '-10.0',
test => $real_test,
- description => 'Start major ticks at',
+ description => 'Start major tics at',
edit_type => 'entry',
size => '10'
},
increment => {
default => '1.0',
test => $real_test,
- description => 'Place a major tick every',
+ description => 'Place a major tic every',
edit_type => 'entry',
size => '10'
},
end => {
default => ' 10.0',
test => $real_test,
- description => 'Stop major ticks at ',
+ description => 'Stop major tics at ',
edit_type => 'entry',
size => '10'
},
minorfreq => {
default => '0',
test => $int_test,
- description => 'Number of minor tics between major tick marks',
+ description => 'Number of minor tics per major tic mark',
edit_type => 'entry',
size => '10'
},
@@ -378,38 +460,7 @@ my %axis_defaults =
}
);
-my $curve_help_text = <<"ENDCURVEHELP";
-The <b>curve</b> tag is where you set the data to be plotted by gnuplot.
-There are two ways of entering the information:
-<dl>
- <dt> Curve Data
- <dd> Using a <b>data</b> tag you can specify the numbers used to produce
-the plot.
-<p>
-By default, two <b>data</b> tags will be available in a plot. The
-first will specify X coordinates of the data and the second will
-give the Y coordinates of the data. When working with a linestyle that
-requires more than two data sets, inserting another <b>data</b> tag is
-required. Unfortunately, you must make sure the <b>data</b> tags appear
-in the order gnuplot expects the data.
-</p><p>
-Specifying the data should usually be done with a perl variable or array,
-such as \@Xdata and \@Ydata. You may also specify numerical data seperated
-by commas. Again, the order of the <b>data</b> tags is important. The
-first tag will be the X data and the second will be the Y data.
-</p>
- <dt> Curve Function
- <dd> The <b>function</b> tag allows you to specify the curve to be
-plotted as a formula that gnuplot can understand. <b>Be careful using this
-tag.</b> It is surprisingly easy to give gnuplot a function it cannot deal
-with properly. Be explicit: 2*sin(2*3.141592*x/4) will work but
-2sin(2*3.141592x/4) will not. If you do not receive any errors in the
-gnuplot data but still do not have an image produced, it is likely there
-is an error in your <b>function</b> tag.
-</dl>
-ENDCURVEHELP
-
-my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize');
+my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize','limit');
my %curve_defaults =
(
@@ -455,7 +506,14 @@ my %curve_defaults =
description => 'point type (may not apply to all line styles)',
edit_type => 'choice',
choices => [0,1,2,3,4,5,6]
- }
+ },
+ limit => {
+ default => 'closed',
+ test => sub {$_[0]=~/^(closed|x1|x2|y1|y2)$/},
+ description => 'point to fill -- for filledcurves',
+ edit_type => 'choice',
+ choices => ['closed','x1','x2','y1','y2']
+ },
);
###################################################################
@@ -463,10 +521,12 @@ my %curve_defaults =
## parsing and edit rendering ##
## ##
###################################################################
-my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
+
+undef %Apache::lonplot::plot;
+my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
sub start_gnuplot {
- undef(%plot); undef(%key); undef(%axis);
+ undef(%Apache::lonplot::plot); undef(%key); undef(%axis);
undef($title); undef($xlabel); undef($ylabel);
undef(@labels); undef(@curves);
undef(%xtics); undef(%ytics);
@@ -478,12 +538,10 @@ sub start_gnuplot {
'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');
if ($target eq 'web' || $target eq 'tex') {
- &get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval,
+ &get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
- $result .= &make_javascript();
- $result .= &help_win($gnuplot_help_text);
$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
\@gnuplot_edit_order);
} elsif ($target eq 'modified') {
@@ -505,7 +563,7 @@ sub end_gnuplot {
my $randnumber;
# need to call rand everytime start_script would evaluate, as the
# safe space rand number generator and the global rand generator
- # are not seperate
+ # are not separate
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
$target eq 'answer') {
$randnumber=int(rand(1000));
@@ -515,24 +573,28 @@ sub end_gnuplot {
##
## Determine filename
my $tmpdir = '/home/httpd/perl/tmp/';
- my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+ my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
'_'.time.'_'.$$.$randnumber.'_plot';
## Write the plot description to the file
&write_gnuplot_file($tmpdir,$filename,$target);
- $filename = &Apache::lonnet::escape($filename);
+ $filename = &escape($filename);
## return image tag for the plot
if ($target eq 'web') {
$result .= <<"ENDIMAGE";
-<img src = "/cgi-bin/plot.gif?file=$filename.data&output=gif"
- width = "$plot{'width'}"
- height = "$plot{'height'}"
- align = "$plot{'align'}"
- alt = "$plot{'alttag'}" />
+<img src = "/cgi-bin/plot.gif?file=$filename.data&output=$weboutputformat"
+ width = "$Apache::lonplot::plot{'width'}"
+ height = "$Apache::lonplot::plot{'height'}"
+ align = "$Apache::lonplot::plot{'align'}"
+ alt = "$Apache::lonplot::plot{'alttag'}" />
ENDIMAGE
} elsif ($target eq 'tex') {
- &Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
-
- $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';
+ &Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}");
+ &Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}");
+ #might be inside the safe space, register the URL for later
+ &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
+ $result = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";
+ $result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";
+ $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
@@ -639,7 +701,7 @@ sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'tex') {
- $title = &Apache::lonxml::get_all_text("/title",$parser);
+ $title = &Apache::lonxml::get_all_text("/title",$parser,$style);
$title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]);
$title =~ s/\n/ /g;
if (length($title) > $max_str_len) {
@@ -647,14 +709,13 @@ sub start_title {
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
- my $text=&Apache::lonxml::get_all_text("/title",$parser);
+ my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
$result.=&Apache::edit::end_row().
&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/title");
$result.=&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/title",$parser);
}
return $result;
}
@@ -673,7 +734,7 @@ sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'tex') {
- $xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser);
+ $xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser,$style);
$xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]);
$xlabel =~ s/\n/ /g;
if (length($xlabel) > $max_str_len) {
@@ -681,14 +742,13 @@ sub start_xlabel {
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
- my $text=&Apache::lonxml::get_all_text("/xlabel",$parser);
+ my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
$result.=&Apache::edit::end_row().
&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/xlabel");
$result.=&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/xlabel",$parser);
}
return $result;
}
@@ -708,7 +768,7 @@ sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'tex') {
- $ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser);
+ $ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
$ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]);
$ylabel =~ s/\n/ /g;
if (length($ylabel) > $max_str_len) {
@@ -716,14 +776,13 @@ sub start_ylabel {
}
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
- my $text = &Apache::lonxml::get_all_text("/ylabel",$parser);
+ my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/ylabel");
$result.=&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/ylabel",$parser);
}
return $result;
}
@@ -746,7 +805,7 @@ sub start_label {
my %label;
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
$tagstack->[-1]);
- my $text = &Apache::lonxml::get_all_text("/label",$parser);
+ my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
$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);
@@ -755,7 +814,7 @@ sub start_label {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
$result .= &edit_attributes($target,$token,\%label_defaults);
- my $text = &Apache::lonxml::get_all_text("/label",$parser);
+ my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);
@@ -763,8 +822,7 @@ sub start_label {
&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));
$result.=&Apache::edit::rebuild_tag($token);
- my $text=$$parser[-1]->get_text("/label");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/label",$parser);
}
return $result;
}
@@ -792,7 +850,6 @@ sub start_curve {
push (@curves,\%curve);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Curve');
- $result .= &help_win($curve_help_text);
$result .= &edit_attributes($target,$token,\%curve_defaults,
\@curve_edit_order);
} elsif ($target eq 'modified') {
@@ -831,19 +888,19 @@ sub start_function {
'curve function declaration.');
delete $curves[-1]->{'data'} ;
}
- my $function = &Apache::lonxml::get_all_text("/function",$parser);
+ my $function = &Apache::lonxml::get_all_text("/function",$parser,
+ $style);
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
$curves[-1]->{'function'} = $function;
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
- my $text = &Apache::lonxml::get_all_text("/function",$parser);
+ my $text = &Apache::lonxml::get_all_text("/function",$parser,$style);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
- my $text=$$parser[-1]->get_text("/function");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/function",$parser);
}
return $result;
}
@@ -871,7 +928,7 @@ sub start_data {
'curve data declaration.');
delete($curves[-1]->{'function'});
}
- my $datatext = &Apache::lonxml::get_all_text("/data",$parser);
+ my $datatext = &Apache::lonxml::get_all_text("/data",$parser,$style);
$datatext=&Apache::run::evaluate($datatext,$safeeval,$$parstack[-1]);
# Deal with cases where we're given an array...
if ($datatext =~ /^\@/) {
@@ -885,7 +942,7 @@ sub start_data {
my @data;
if ($datatext =~ /,/) { # comma deliminated
@data = split /,/,$datatext;
- } else { # Assume it's space seperated.
+ } else { # Assume it's space separated.
@data = split / /,$datatext;
}
for (my $i=0;$i<=$#data;$i++) {
@@ -914,14 +971,13 @@ sub start_data {
push @{$curves[-1]->{'data'}},\@data;
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');
- my $text = &Apache::lonxml::get_all_text("/data",$parser);
+ my $text = &Apache::lonxml::get_all_text("/data",$parser,$style);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
- my $text=$$parser[-1]->get_text("/data");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/data",$parser);
}
return $result;
}
@@ -987,7 +1043,7 @@ sub set_defaults {
sub get_attributes{
my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
foreach my $attr (keys(%{$defaults})) {
- if ($attr eq 'texwidth') {
+ if ($attr eq 'texwidth' || $attr eq 'texfont') {
$values->{$attr} =
&Apache::lonxml::get_param($attr,$parstack,$safeeval,undef,1);
} else {
@@ -1014,50 +1070,101 @@ sub write_gnuplot_file {
my ($tmpdir,$filename,$target)= @_;
my $gnuplot_input = '';
my $curve;
+ my $pt = $Apache::lonplot::plot{'texfont'};
+ #
+ # Check to be sure we do not have any empty curves
+ my @curvescopy;
+ foreach my $curve (@curves) {
+ if (exists($curve->{'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'};
- push @Colors, $plot{'fgcolor'};
- push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
+ push @Colors, $Apache::lonplot::plot{'bgcolor'};
+ push @Colors, $Apache::lonplot::plot{'fgcolor'};
+ push @Colors, (defined($axis{'color'})?$axis{'color'}:$Apache::lonplot::plot{'fgcolor'});
foreach $curve (@curves) {
push @Colors, ($curve->{'color'} ne '' ?
$curve->{'color'} :
- $plot{'fgcolor'} );
+ $Apache::lonplot::plot{'fgcolor'} );
}
# set term
if ($target eq 'web') {
- $gnuplot_input .= 'set term gif ';
- $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
- $gnuplot_input .= $plot{'font'} . ' ';
- $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
+ $gnuplot_input .= 'set term '.$weboutputformat .' ';
+ $gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on');
+ $gnuplot_input .= $Apache::lonplot::plot{'font'} . ' ';
+ $gnuplot_input .= 'size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' ';
$gnuplot_input .= "@Colors\n";
# set output
$gnuplot_input .= "set output\n";
} elsif ($target eq 'tex') {
- $gnuplot_input .= "set term postscript eps monochrome solid \"Helvetica\" 25 \n";
+ $gnuplot_input .= "set term postscript eps $Apache::lonplot::plot{'plotcolor'} solid \"Helvetica\" $pt \n";
$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
- &Apache::lonnet::unescape($filename).".eps\"\n";
+ &unescape($filename).".eps\"\n";
}
# cartesian or polar?
- if (lc($plot{'plottype'}) eq 'polar') {
+ if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
$gnuplot_input .= 'set polar'.$/;
} else {
# Assume Cartesian
}
+ # solid or pattern for boxes?
+ if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') {
+ $gnuplot_input .= 'set style fill solid '.
+ $Apache::lonplot::plot{'solid'}.$Apache::lonplot::plot{'box_border'}.$/;
+ } elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'pattern') {
+ $gnuplot_input .= 'set style fill pattern '.$Apache::lonplot::plot{'pattern'}.$Apache::lonplot::plot{'box_border'}.$/;
+ } elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'empty') {
+ }
+ # margin
+ if (lc($Apache::lonplot::plot{'lmargin'}) ne 'default') {
+ $gnuplot_input .= 'set lmargin '.$Apache::lonplot::plot{'lmargin'}.$/;
+ }
+ if (lc($Apache::lonplot::plot{'rmargin'}) ne 'default') {
+ $gnuplot_input .= 'set rmargin '.$Apache::lonplot::plot{'rmargin'}.$/;
+ }
+ if (lc($Apache::lonplot::plot{'tmargin'}) ne 'default') {
+ $gnuplot_input .= 'set tmargin '.$Apache::lonplot::plot{'tmargin'}.$/;
+ }
+ 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'}.$/;
+ #boxwidth
+ if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') {
+ $gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/;
+ }
+ # gridlayer
+ $gnuplot_input .= 'set grid noxtics noytics front '.$/
+ if ($Apache::lonplot::plot{'gridlayer'} eq 'on');
+
# grid
- $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
+ $gnuplot_input .= 'set grid'.$/ if ($Apache::lonplot::plot{'grid'} eq 'on');
# border
- $gnuplot_input .= ($plot{'border'} eq 'on'?
+ $gnuplot_input .= ($Apache::lonplot::plot{'border'} eq 'on'?
'set border'.$/ :
'set noborder'.$/ );
# sampling rate for non-data curves
- $gnuplot_input .= "set samples $plot{'samples'}\n";
+ $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
# title, xlabel, ylabel
# titles
if ($target eq 'tex') {
- $gnuplot_input .= "set title \"$title\" font \"Helvetica,25pt\"\n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" font \"Helvetica,25pt\" \n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" font \"Helvetica,25pt\"\n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" font \"Helvetica,".$pt."pt\"\n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" font \"Helvetica,".$pt."pt\" \n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" font \"Helvetica,".$pt."pt\"\n" if (defined($ylabel));
} else {
$gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
$gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
@@ -1103,10 +1210,14 @@ sub write_gnuplot_file {
my $label;
foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
- $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.' font "Helvetica,25pt"'.$/ ;
+ $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;
+ $gnuplot_input .="set size 1,".$Apache::lonplot::plot{'height'}/$Apache::lonplot::plot{'width'}*1.38;
$gnuplot_input .="\n";
}
# curves
@@ -1128,6 +1239,8 @@ sub write_gnuplot_file {
($curve->{'linestyle'} eq 'xyerrorbars')) {
$gnuplot_input.=' pointtype '.$curve->{'pointtype'};
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
+ } elsif ($curve->{'linestyle'} eq 'filledcurves') {
+ $gnuplot_input.= ' '.$curve->{'limit'};
}
} elsif (exists($curve->{'data'})) {
# Store data values in $datatext
@@ -1161,6 +1274,8 @@ sub write_gnuplot_file {
($curve->{'linestyle'} eq 'xyerrorbars')) {
$gnuplot_input.=' pointtype '.$curve->{'pointtype'};
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
+ } elsif ($curve->{'linestyle'} eq 'filledcurves') {
+ $gnuplot_input.= ' '.$curve->{'limit'};
}
}
}
@@ -1176,7 +1291,7 @@ sub write_gnuplot_file {
sub check_inputs {
## Note: no inputs, no outputs - this acts only on global variables.
## Make sure we have all the input we need:
- if (! %plot) { &set_defaults(\%plot,\%gnuplot_defaults); }
+ if (! %Apache::lonplot::plot) { &set_defaults(\%Apache::lonplot::plot,\%gnuplot_defaults); }
if (! %key ) {} # No key for this plot, thats okay
# if (! %axis) { &set_defaults(\%axis,\%axis_defaults); }
if (! defined($title )) {} # No title for this plot, thats okay
@@ -1214,10 +1329,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 .= '<br />';
@@ -1337,40 +1452,6 @@ sub insert_data {
}
##----------------------------------------------------------------------
-# Javascript functions to display help for tags
-
-sub make_javascript {
- my $helpwindowwidth = 400;
- my $helpwindowheight = 400;
- my $result = '';
- $result.=<<"ENDFUNCTION";
-<script language="JavaScript">
-function openWin(text)
-{
- newWin = open("", "new_W", "width=$helpwindowwidth,height=$helpwindowheight,resizable=1,scrollbars=1");
- newWin.document.open("text/html", "replace");
- newWin.document.writeln(text);
- newWin.document.writeln('<center><a href=\"javascript:window.close()\">close this window</a></center>');
- newWin.document.close();
-}
-</script>
-ENDFUNCTION
- return $result;
-}
-
-sub help_win {
- my ($helptext)=@_;
- $helptext =~ s/\n/ /g;
- $helptext =~ s/\'/\\\'/g;
- my $result = '';
- $result.=<<"ENDWIN";
-<table width="100%"><tr><td align="right">
-<a href="javascript:openWin('$helptext')">help</a>
-</td></tr></table><hr />
-ENDWIN
- return $result;
-}
-##----------------------------------------------------------------------
1;
__END__