|
version 1.43, 2002/01/21 17:23:31
|
version 1.51, 2002/02/27 22:10:23
|
|
Line 29
|
Line 29
|
| # 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 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/01/02 Matthew |
| # 01/02 01/03 01/04 01/07 01/08 01/09 Matthew |
# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew |
| # 01/21 Matthew |
# 01/21 02/05 02/06 Matthew |
| |
|
| package Apache::lonplot; |
package Apache::lonplot; |
| |
|
|
Line 40 use Apache::lonxml;
|
Line 40 use Apache::lonxml;
|
| use Apache::edit; |
use Apache::edit; |
| |
|
| BEGIN { |
BEGIN { |
| &Apache::lonxml::register('Apache::lonplot',('plot')); |
&Apache::lonxml::register('Apache::lonplot',('gnuplot')); |
| } |
} |
| |
|
| ## |
## |
|
Line 113 my $words_test = sub {$_[0]=~s/\s+/
|
Line 113 my $words_test = sub {$_[0]=~s/\s+/
|
| ## Attribute metadata ## |
## Attribute metadata ## |
| ## ## |
## ## |
| ################################################################### |
################################################################### |
| my @plot_edit_order = |
my @gnuplot_edit_order = |
| qw/bgcolor fgcolor height width font transparent grid border align/; |
qw/bgcolor fgcolor height width font transparent grid border align/; |
| my %plot_defaults = |
|
| |
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> |
| |
ENDPLOTHELP |
| |
|
| |
my %gnuplot_defaults = |
| ( |
( |
| height => { |
height => { |
| default => 200, |
default => 200, |
|
Line 149 my %plot_defaults =
|
Line 180 my %plot_defaults =
|
| default => 'off', |
default => 'off', |
| test => $onoff_test, |
test => $onoff_test, |
| description => 'Transparent image', |
description => 'Transparent image', |
| edit_type => 'on_off' |
edit_type => 'onoff' |
| }, |
}, |
| grid => { |
grid => { |
| default => 'off', |
default => 'off', |
| test => $onoff_test, |
test => $onoff_test, |
| description => 'Display grid', |
description => 'Display grid', |
| edit_type => 'on_off' |
edit_type => 'onoff' |
| }, |
}, |
| border => { |
border => { |
| default => 'on', |
default => 'on', |
| test => $onoff_test, |
test => $onoff_test, |
| description => 'Draw border around plot', |
description => 'Draw border around plot', |
| edit_type => 'on_off' |
edit_type => 'onoff' |
| }, |
}, |
| font => { |
font => { |
| default => 'medium', |
default => 'medium', |
|
Line 192 my %key_defaults =
|
Line 223 my %key_defaults =
|
| default => 'off', |
default => 'off', |
| test => $onoff_test, |
test => $onoff_test, |
| description => 'Draw a box around the key?', |
description => 'Draw a box around the key?', |
| edit_type => 'on_off' |
edit_type => 'onoff' |
| }, |
}, |
| pos => { |
pos => { |
| default => 'top right', |
default => 'top right', |
|
Line 229 my %label_defaults =
|
Line 260 my %label_defaults =
|
| } |
} |
| ); |
); |
| |
|
| |
my @tic_edit_order = ('location','mirror','start','increment','end'); |
| |
my %tic_defaults = |
| |
( |
| |
location => { |
| |
default => 'border', |
| |
test => sub {$_[0]=~/^(border|axis)$/}, |
| |
description => 'Location of tick marks', |
| |
edit_type => 'choice', |
| |
choices => ['border','axis'] |
| |
}, |
| |
mirror => { |
| |
default => 'on', |
| |
test => $onoff_test, |
| |
description => 'mirror ticks on opposite axis?', |
| |
edit_type => 'onoff' |
| |
}, |
| |
start => { |
| |
default => '-10.0', |
| |
test => $real_test, |
| |
description => 'Start ticks at', |
| |
edit_type => 'entry', |
| |
size => '10' |
| |
}, |
| |
increment => { |
| |
default => '1.0', |
| |
test => $real_test, |
| |
description => 'Place a tick every', |
| |
edit_type => 'entry', |
| |
size => '10' |
| |
}, |
| |
end => { |
| |
default => ' 10.0', |
| |
test => $real_test, |
| |
description => 'Stop ticks at ', |
| |
edit_type => 'entry', |
| |
size => '10' |
| |
}, |
| |
); |
| |
|
| my %axis_defaults = |
my %axis_defaults = |
| ( |
( |
| color => { |
color => { |
|
Line 268 my %axis_defaults =
|
Line 338 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. Be careful using this |
| |
tag - 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_defaults = |
my %curve_defaults = |
| ( |
( |
| color => { |
color => { |
|
Line 298 my %curve_defaults =
|
Line 399 my %curve_defaults =
|
| ## parsing and edit rendering ## |
## parsing and edit rendering ## |
| ## ## |
## ## |
| ################################################################### |
################################################################### |
| my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves); |
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics); |
| |
|
| sub start_plot { |
sub start_gnuplot { |
| %plot = (); %key = (); %axis = (); |
%plot = (); %key = (); %axis = (); |
| $title = undef; $xlabel = undef; $ylabel = undef; |
$title = undef; $xlabel = undef; $ylabel = undef; |
| $#labels = -1; $#curves = -1; |
$#labels = -1; $#curves = -1; |
| |
%xtics = (); %ytics = (); |
| # |
# |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| &Apache::lonxml::register('Apache::lonplot', |
&Apache::lonxml::register('Apache::lonplot', |
| ('title','xlabel','ylabel','key','axis','label','curve')); |
('title','xlabel','ylabel','key','axis','label','curve', |
| |
'xtics','ytics')); |
| push (@Apache::lonxml::namespace,'lonplot'); |
push (@Apache::lonxml::namespace,'lonplot'); |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]); |
my $inside = &Apache::lonxml::get_all_text("/gnuplot",$$parser[-1]); |
| $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
| &Apache::lonxml::newparser($parser,\$inside); |
&Apache::lonxml::newparser($parser,\$inside); |
| &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval, |
&get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval, |
| $tagstack->[-1]); |
$tagstack->[-1]); |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result .= &Apache::edit::tag_start($target,$token,'Plot'); |
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); |
| $result .= &edit_attributes($target,$token,\%plot_defaults, |
$result .= &make_javascript(); |
| \@plot_edit_order); |
$result .= &help_win($gnuplot_help_text); |
| |
$result .= &edit_attributes($target,$token,\%gnuplot_defaults, |
| |
\@gnuplot_edit_order); |
| } elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
| my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
| ($token,$parstack,$safeeval,keys(%plot_defaults)); |
($token,$parstack,$safeeval,keys(%gnuplot_defaults)); |
| if ($constructtag) { |
if ($constructtag) { |
| $result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
| } |
} |
|
Line 330 sub start_plot {
|
Line 435 sub start_plot {
|
| return $result; |
return $result; |
| } |
} |
| |
|
| sub end_plot { |
sub end_gnuplot { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| |
|
| pop @Apache::lonxml::namespace; |
pop @Apache::lonxml::namespace; |
| &Apache::lonxml::deregister('Apache::lonplot', |
&Apache::lonxml::deregister('Apache::lonplot', |
| ('title','xlabel','ylabel','key','axis','label','curve')); |
('title','xlabel','ylabel','key','axis','label','curve')); |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| &check_inputs(); # Make sure we have all the data we need |
&check_inputs(); # Make sure we have all the data we need |
| ## |
## |
| ## Determine filename |
## Determine filename |
|
Line 345 sub end_plot {
|
Line 449 sub end_plot {
|
| my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}. |
my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}. |
| '_'.time.'_'.$$.int(rand(1000)).'_plot.data'; |
'_'.time.'_'.$$.int(rand(1000)).'_plot.data'; |
| ## Write the plot description to the file |
## Write the plot description to the file |
| &write_gnuplot_file($tmpdir,$filename); |
&write_gnuplot_file($tmpdir,$filename,$target); |
| ## return image tag for the plot |
## return image tag for the plot |
| $result .= <<"ENDIMAGE"; |
if ($target eq 'web') { |
| |
$result .= <<"ENDIMAGE"; |
| <img src = "/cgi-bin/plot.gif?$filename" |
<img src = "/cgi-bin/plot.gif?$filename" |
| width = "$plot{'width'}" |
width = "$plot{'width'}" |
| height = "$plot{'height'}" |
height = "$plot{'height'}" |
| align = "$plot{'align'}" |
align = "$plot{'align'}" |
| alt = "/cgi-bin/plot.gif?$filename" /> |
alt = "image should be /cgi-bin/plot.gif?$filename" /> |
| ENDIMAGE |
ENDIMAGE |
| |
} elsif ($target eq 'tex') { |
| |
$result = "$filename.eps"; |
| |
} |
| |
} elsif ($target eq 'edit') { |
| |
$result.=&Apache::edit::tag_end($target,$token); |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
|
| |
##--------------------------------------------------------------- xtics |
| |
sub start_xtics { |
| |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| |
my $result=''; |
| |
if ($target eq 'web' || $target eq 'tex') { |
| |
&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval, |
| |
$tagstack->[-1]); |
| |
} elsif ($target eq 'edit') { |
| |
$result .= &Apache::edit::tag_start($target,$token,'xtics'); |
| |
$result .= &edit_attributes($target,$token,\%tic_defaults, |
| |
\@tic_edit_order); |
| |
} elsif ($target eq 'modified') { |
| |
my $constructtag=&Apache::edit::get_new_args |
| |
($token,$parstack,$safeeval,keys(%tic_defaults)); |
| |
if ($constructtag) { |
| |
$result = &Apache::edit::rebuild_tag($token); |
| |
} |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
sub end_xtics { |
| |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| |
my $result = ''; |
| |
if ($target eq 'web' || $target eq 'tex') { |
| |
} elsif ($target eq 'edit') { |
| |
$result.=&Apache::edit::tag_end($target,$token); |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
##--------------------------------------------------------------- ytics |
| |
sub start_ytics { |
| |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| |
my $result=''; |
| |
if ($target eq 'web' || $target eq 'tex') { |
| |
&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval, |
| |
$tagstack->[-1]); |
| |
} elsif ($target eq 'edit') { |
| |
$result .= &Apache::edit::tag_start($target,$token,'ytics'); |
| |
$result .= &edit_attributes($target,$token,\%tic_defaults, |
| |
\@tic_edit_order); |
| |
} elsif ($target eq 'modified') { |
| |
my $constructtag=&Apache::edit::get_new_args |
| |
($token,$parstack,$safeeval,keys(%tic_defaults)); |
| |
if ($constructtag) { |
| |
$result = &Apache::edit::rebuild_tag($token); |
| |
} |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
sub end_ytics { |
| |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| |
my $result = ''; |
| |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
| return $result; |
return $result; |
| } |
} |
| |
|
| |
|
| ##----------------------------------------------------------------- key |
##----------------------------------------------------------------- key |
| sub start_key { |
sub start_key { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| &get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
| $tagstack->[-1]); |
$tagstack->[-1]); |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
Line 383 sub start_key {
|
Line 555 sub start_key {
|
| sub end_key { |
sub end_key { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
|
Line 394 sub end_key {
|
Line 566 sub end_key {
|
| sub start_title { |
sub start_title { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
| |
$title =~ s/\n/ /g; |
| 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); |
| } |
} |
|
Line 416 sub start_title {
|
Line 589 sub start_title {
|
| sub end_title { |
sub end_title { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
|
Line 426 sub end_title {
|
Line 599 sub end_title {
|
| sub start_xlabel { |
sub start_xlabel { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
| |
$xlabel =~ s/\n/ /g; |
| 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); |
| } |
} |
|
Line 448 sub start_xlabel {
|
Line 622 sub start_xlabel {
|
| sub end_xlabel { |
sub end_xlabel { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
|
Line 459 sub end_xlabel {
|
Line 633 sub end_xlabel {
|
| sub start_ylabel { |
sub start_ylabel { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
| |
$ylabel =~ s/\n/ /g; |
| 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); |
| } |
} |
|
Line 481 sub start_ylabel {
|
Line 656 sub start_ylabel {
|
| sub end_ylabel { |
sub end_ylabel { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
|
Line 492 sub end_ylabel {
|
Line 667 sub end_ylabel {
|
| sub start_label { |
sub start_label { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| my %label; |
my %label; |
| &get_attributes(\%label,\%label_defaults,$parstack,$safeeval, |
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval, |
| $tagstack->[-1]); |
$tagstack->[-1]); |
| my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
| |
$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'} = $text; |
| push(@labels,\%label); |
push(@labels,\%label); |
|
Line 520 sub start_label {
|
Line 696 sub start_label {
|
| sub end_label { |
sub end_label { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
|
Line 533 sub start_curve {
|
Line 709 sub start_curve {
|
| my $result=''; |
my $result=''; |
| &Apache::lonxml::register('Apache::lonplot',('function','data')); |
&Apache::lonxml::register('Apache::lonplot',('function','data')); |
| push (@Apache::lonxml::namespace,'curve'); |
push (@Apache::lonxml::namespace,'curve'); |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| my %curve; |
my %curve; |
| &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, |
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, |
| $tagstack->[-1]); |
$tagstack->[-1]); |
| push (@curves,\%curve); |
push (@curves,\%curve); |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result .= &Apache::edit::tag_start($target,$token,'Curve'); |
$result .= &Apache::edit::tag_start($target,$token,'Curve'); |
| |
$result .= &help_win($curve_help_text); |
| $result .= &edit_attributes($target,$token,\%curve_defaults); |
$result .= &edit_attributes($target,$token,\%curve_defaults); |
| } elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
| my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
|
Line 557 sub end_curve {
|
Line 734 sub end_curve {
|
| my $result = ''; |
my $result = ''; |
| pop @Apache::lonxml::namespace; |
pop @Apache::lonxml::namespace; |
| &Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
&Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } |
} |
|
Line 568 sub end_curve {
|
Line 745 sub end_curve {
|
| sub start_function { |
sub start_function { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| if (exists($curves[-1]->{'data'})) { |
if (exists($curves[-1]->{'data'})) { |
| &Apache::lonxml::warning('Use of <function> precludes use of <data>. The <data> will be omitted in favor of the <function> declaration.'); |
&Apache::lonxml::warning('Use of <function> precludes use of <data>. The <data> will be omitted in favor of the <function> declaration.'); |
| delete $curves[-1]->{'data'} ; |
delete $curves[-1]->{'data'} ; |
|
Line 592 sub start_function {
|
Line 769 sub start_function {
|
| sub end_function { |
sub end_function { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result .= &Apache::edit::end_table(); |
$result .= &Apache::edit::end_table(); |
| } |
} |
|
Line 603 sub end_function {
|
Line 780 sub end_function {
|
| sub start_data { |
sub start_data { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| if (exists($curves[-1]->{'function'})) { |
if (exists($curves[-1]->{'function'})) { |
| &Apache::lonxml::warning('Use of <data> precludes use of .'. |
&Apache::lonxml::warning('Use of <data> precludes use of .'. |
| '<function>. The <function> will be omitted in favor of '. |
'<function>. The <function> will be omitted in favor of '. |
|
Line 616 sub start_data {
|
Line 793 sub start_data {
|
| $datatext = &Apache::run::run('return "'.$datatext.'"', |
$datatext = &Apache::run::run('return "'.$datatext.'"', |
| $safeeval,1); |
$safeeval,1); |
| } |
} |
| $datatext =~ s/\s+/ /g; |
$datatext =~ s/\s+/ /g; |
| # Need to do some error checking on the @data array - |
# Need to do some error checking on the @data array - |
| # make sure it's all numbers and make sure each array |
# make sure it's all numbers and make sure each array |
| # is of the same length. |
# is of the same length. |
|
Line 667 sub start_data {
|
Line 844 sub start_data {
|
| sub end_data { |
sub end_data { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result .= &Apache::edit::end_table(); |
$result .= &Apache::edit::end_table(); |
| } |
} |
|
Line 678 sub end_data {
|
Line 855 sub end_data {
|
| sub start_axis { |
sub start_axis { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result=''; |
my $result=''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
| $tagstack->[-1]); |
$tagstack->[-1]); |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
Line 697 sub start_axis {
|
Line 874 sub start_axis {
|
| sub end_axis { |
sub end_axis { |
| my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
| my $result = ''; |
my $result = ''; |
| if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'tex') { |
| } elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
| $result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
| } elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
|
Line 743 sub get_attributes{
|
Line 920 sub get_attributes{
|
| |
|
| ##------------------------------------------------------- write_gnuplot_file |
##------------------------------------------------------- write_gnuplot_file |
| sub write_gnuplot_file { |
sub write_gnuplot_file { |
| my ($tmpdir,$filename)= @_; |
my ($tmpdir,$filename,$target)= @_; |
| my $gnuplot_input = ''; |
my $gnuplot_input = ''; |
| my $curve; |
my $curve; |
| # Collect all the colors |
# Collect all the colors |
|
Line 757 sub write_gnuplot_file {
|
Line 934 sub write_gnuplot_file {
|
| $plot{'fgcolor'} ); |
$plot{'fgcolor'} ); |
| } |
} |
| # set term |
# set term |
| $gnuplot_input .= 'set term gif '; |
if ($target eq 'web') { |
| $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on'); |
$gnuplot_input .= 'set term gif '; |
| $gnuplot_input .= $plot{'font'} . ' '; |
$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on'); |
| $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' '; |
$gnuplot_input .= $plot{'font'} . ' '; |
| $gnuplot_input .= "@Colors\n"; |
$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' '; |
| |
$gnuplot_input .= "@Colors\n"; |
| |
# set output |
| |
$gnuplot_input .= "set output\n"; |
| |
} elsif ($target eq 'tex') { |
| |
$gnuplot_input .= "set term postscript eps monochrome\n"; |
| |
$gnuplot_input .= "set output \"$filename.eps\"\n"; |
| |
} |
| # grid |
# grid |
| $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on'); |
$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on'); |
| # border |
# border |
| $gnuplot_input .= ($plot{'border'} eq 'on'? |
$gnuplot_input .= ($plot{'border'} eq 'on'? |
| 'set border'.$/ : |
'set border'.$/ : |
| 'set noborder'.$/ ); # title, xlabel, ylabel |
'set noborder'.$/ ); # title, xlabel, ylabel |
| $gnuplot_input .= "set output\n"; |
# titles |
| $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\"\n" if (defined($xlabel)); |
| $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel)); |
| |
# tics |
| |
if (%xtics) { |
| |
$gnuplot_input .= "set xtics $xtics{'location'} "; |
| |
$gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror "); |
| |
$gnuplot_input .= "$xtics{'start'}, "; |
| |
$gnuplot_input .= "$xtics{'increment'}, "; |
| |
$gnuplot_input .= "$xtics{'end'}\n"; |
| |
} |
| |
if (%ytics) { |
| |
$gnuplot_input .= "set ytics $ytics{'location'} "; |
| |
$gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror "); |
| |
$gnuplot_input .= "$ytics{'start'}, "; |
| |
$gnuplot_input .= "$ytics{'increment'}, "; |
| |
$gnuplot_input .= "$ytics{'end'}\n"; |
| |
} |
| |
# axis |
| if (%axis) { |
if (%axis) { |
| $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n"; |
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n"; |
| $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n"; |
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n"; |
|
Line 839 sub write_gnuplot_file {
|
Line 1039 sub write_gnuplot_file {
|
| sub check_inputs { |
sub check_inputs { |
| ## Note: no inputs, no outputs - this acts only on global variables. |
## Note: no inputs, no outputs - this acts only on global variables. |
| ## Make sure we have all the input we need: |
## Make sure we have all the input we need: |
| if (! %plot) { &set_defaults(\%plot,\%plot_defaults); } |
if (! %plot) { &set_defaults(\%plot,\%gnuplot_defaults); } |
| if (! %key ) {} # No key for this plot, thats okay |
if (! %key ) {} # No key for this plot, thats okay |
| # if (! %axis) { &set_defaults(\%axis,\%axis_defaults); } |
# if (! %axis) { &set_defaults(\%axis,\%axis_defaults); } |
| if (! defined($title )) {} # No title for this plot, thats okay |
if (! defined($title )) {} # No title for this plot, thats okay |
|
Line 879 sub edit_attributes {
|
Line 1079 sub edit_attributes {
|
| } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
| $result .= &Apache::edit::select_arg |
$result .= &Apache::edit::select_arg |
| ($description,$attr,$defaults->{$attr}->{'choices'},$token); |
($description,$attr,$defaults->{$attr}->{'choices'},$token); |
| } elsif ($defaults->{$attr}->{'edit_type'} eq 'on_off') { |
} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') { |
| $result .= &Apache::edit::select_arg |
$result .= &Apache::edit::select_arg |
| ($description,$attr,['on','off'],$token); |
($description,$attr,['on','off'],$token); |
| } |
} |
|
Line 895 sub edit_attributes {
|
Line 1095 sub edit_attributes {
|
| ## ## |
## ## |
| ################################################################### |
################################################################### |
| |
|
| #------------------------------------------------ insert_xxxxxxx |
sub insert_gnuplot { |
| sub insert_plot { |
|
| my $result = ''; |
my $result = ''; |
| # plot attributes |
# plot attributes |
| $result .= "<plot \n"; |
$result .= "<gnuplot \n"; |
| foreach my $attr (keys(%plot_defaults)) { |
foreach my $attr (keys(%gnuplot_defaults)) { |
| $result .= " $attr=\"$plot_defaults{$attr}->{'default'}\"\n"; |
$result .= " $attr=\"$gnuplot_defaults{$attr}->{'default'}\"\n"; |
| } |
} |
| $result .= ">\n"; |
$result .= ">\n"; |
| # Add the components |
# Add the components (most are commented out for simplicity) |
| $result .= &insert_key(); |
# $result .= &insert_key(); |
| $result .= &insert_axis(); |
# $result .= &insert_axis(); |
| $result .= &insert_title(); |
# $result .= &insert_title(); |
| $result .= &insert_xlabel(); |
# $result .= &insert_xlabel(); |
| $result .= &insert_ylabel(); |
# $result .= &insert_ylabel(); |
| $result .= &insert_curve(); |
$result .= &insert_curve(); |
| # close up the <plot> |
# close up the <gnuplot> |
| $result .= "</plot>\n"; |
$result .= "</gnuplot>\n"; |
| |
return $result; |
| |
} |
| |
|
| |
sub insert_tics { |
| |
my $result; |
| |
$result .= &insert_xtics() . &insert_ytics; |
| |
return $result; |
| |
} |
| |
|
| |
sub insert_xtics { |
| |
my $result; |
| |
$result .= "\n <xtics "; |
| |
foreach my $attr (keys(%tic_defaults)) { |
| |
$result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" "; |
| |
} |
| |
$result .= "/>\n"; |
| |
return $result; |
| |
} |
| |
|
| |
sub insert_ytics { |
| |
my $result; |
| |
$result .= "\n <ytics "; |
| |
foreach my $attr (keys(%tic_defaults)) { |
| |
$result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" "; |
| |
} |
| |
$result .= "/>\n"; |
| return $result; |
return $result; |
| } |
} |
| |
|
| sub insert_key { |
sub insert_key { |
| my $result; |
my $result; |
| $result .= " <key \n"; |
$result .= "\n <key \n"; |
| foreach my $attr (keys(%key_defaults)) { |
foreach my $attr (keys(%key_defaults)) { |
| $result .= " $attr=\"$key_defaults{$attr}->{'default'}\"\n"; |
$result .= " $attr=\"$key_defaults{$attr}->{'default'}\"\n"; |
| } |
} |
|
Line 928 sub insert_key {
|
Line 1153 sub insert_key {
|
| |
|
| sub insert_axis{ |
sub insert_axis{ |
| my $result; |
my $result; |
| $result .= ' <axis '; |
$result .= "\n <axis "; |
| foreach my $attr (keys(%axis_defaults)) { |
foreach my $attr (keys(%axis_defaults)) { |
| $result .= " $attr=\"$axis_defaults{$attr}->{'default'}\"\n"; |
$result .= " $attr=\"$axis_defaults{$attr}->{'default'}\"\n"; |
| } |
} |
|
Line 936 sub insert_axis{
|
Line 1161 sub insert_axis{
|
| return $result; |
return $result; |
| } |
} |
| |
|
| sub insert_title { return " <title></title>\n"; } |
sub insert_title { return "\n <title></title>\n"; } |
| sub insert_xlabel { return " <xlabel></xlabel>\n"; } |
sub insert_xlabel { return "\n <xlabel></xlabel>\n"; } |
| sub insert_ylabel { return " <ylabel></ylabel>\n"; } |
sub insert_ylabel { return "\n <ylabel></ylabel>\n"; } |
| |
|
| sub insert_label { |
sub insert_label { |
| my $result; |
my $result; |
| $result .= ' <label '; |
$result .= "\n <label "; |
| foreach my $attr (keys(%label_defaults)) { |
foreach my $attr (keys(%label_defaults)) { |
| $result .= ' '.$attr.'="'. |
$result .= ' '.$attr.'="'. |
| $label_defaults{$attr}->{'default'}."\"\n"; |
$label_defaults{$attr}->{'default'}."\"\n"; |
|
Line 975 sub insert_data {
|
Line 1200 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; |
1; |
| __END__ |
__END__ |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to lonplot.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / xml