version 1.30, 2002/01/02 14:33:50
|
version 1.36, 2002/01/09 16:58:18
|
Line 26
|
Line 26
|
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 12/15/01 Matthew |
# 12/15/01 Matthew |
# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 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 |
|
|
|
# Current issues |
|
# 1. Gnuplot is unable to vary the color or linestyle of <data> plots. |
|
# The key does not know this so it is misleading for the user. |
|
# Multiple <function>s can be plotted with varying line styles and |
|
# colors. |
|
# |
package Apache::lonplot; |
package Apache::lonplot; |
|
|
use strict; |
use strict; |
Line 35 use Apache::response;
|
Line 44 use Apache::response;
|
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::edit; |
use Apache::edit; |
|
|
sub BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::lonplot',('plot')); |
&Apache::lonxml::register('Apache::lonplot',('plot')); |
} |
} |
|
|
Line 70 sub BEGIN {
|
Line 79 sub BEGIN {
|
## ## |
## ## |
################################################################### |
################################################################### |
|
|
|
my $max_str_len = 50; # if a label, title, xlabel, or ylabel text |
|
# is longer than this, it will be truncated. |
|
|
my %linestyles = |
my %linestyles = |
( |
( |
lines => 2, # Maybe this will be used in the future |
lines => 2, # Maybe this will be used in the future |
Line 79 my %linestyles =
|
Line 91 my %linestyles =
|
steps => 2, # now there are more important things |
steps => 2, # now there are more important things |
fsteps => 2, # for me to deal with. |
fsteps => 2, # for me to deal with. |
histeps => 2, |
histeps => 2, |
errorbars => 2, |
errorbars => 3, |
xerrorbars => 2, |
xerrorbars => [3,4], |
yerrorbars => 2, |
yerrorbars => [3,4], |
xyerrorbars => 2, |
xyerrorbars => [4,6], |
boxes => 2, |
boxes => 3, |
boxerrorbars => 2, |
# boxerrorbars => [3,4,5], |
boxxyerrorbars => 2, |
# boxxyerrorbars => [4,6,7], |
financebars => 2, |
# financebars => 5, |
candlesticks => 2, |
# candlesticks => 5, |
vector => 2 |
vector => 4 |
); |
); |
|
|
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/}; |
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/}; |
Line 106 my $words_test = sub {$_[0]=~s/\s+/
|
Line 118 my $words_test = sub {$_[0]=~s/\s+/
|
## Attribute metadata ## |
## Attribute metadata ## |
## ## |
## ## |
################################################################### |
################################################################### |
|
my @plot_edit_order = |
|
qw/bgcolor fgcolor height width font transparent grid border/; |
my %plot_defaults = |
my %plot_defaults = |
( |
( |
height => { |
height => { |
Line 135 my %plot_defaults =
|
Line 149 my %plot_defaults =
|
transparent => { |
transparent => { |
default => 'off', |
default => 'off', |
test => $onoff_test, |
test => $onoff_test, |
description => '', |
description => 'Transparent image', |
edit_type => 'on_off' |
edit_type => 'on_off' |
}, |
}, |
grid => { |
grid => { |
default => 'off', |
default => 'off', |
test => $onoff_test, |
test => $onoff_test, |
description => '', |
description => 'Display grid', |
edit_type => 'on_off' |
edit_type => 'on_off' |
}, |
}, |
border => { |
border => { |
default => 'on', |
default => 'on', |
test => $onoff_test, |
test => $onoff_test, |
description => '', |
description => 'Draw border around plot', |
edit_type => 'on_off' |
edit_type => 'on_off' |
}, |
}, |
font => { |
font => { |
Line 264 my %curve_defaults =
|
Line 278 my %curve_defaults =
|
linestyle => { |
linestyle => { |
default => 'lines', |
default => 'lines', |
test => $linestyle_test, |
test => $linestyle_test, |
description => 'Style of the axis lines', |
description => 'Line style', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['lines','linespoints','dots','points','steps', |
choices => ['lines','linespoints','dots','points','steps', |
'fsteps','histeps','errorbars','xerrorbars', |
'fsteps','histeps','errorbars','xerrorbars', |
Line 299 sub start_plot {
|
Line 313 sub start_plot {
|
$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,'Plot'); |
$result .= &edit_attributes($target,$token,\%plot_defaults); |
$result .= &edit_attributes($target,$token,\%plot_defaults, |
|
\@plot_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(%plot_defaults)); |
Line 380 sub start_title {
|
Line 395 sub start_title {
|
my $result=''; |
my $result=''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
|
if (length($title) > $max_str_len) { |
|
$title = substr($title,0,$max_str_len); |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]); |
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]); |
Line 407 sub start_xlabel {
|
Line 425 sub start_xlabel {
|
my $result=''; |
my $result=''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
|
if (length($xlabel) > $max_str_len) { |
|
$xlabel = substr($xlabel,0,$max_str_len); |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
Line 435 sub start_ylabel {
|
Line 456 sub start_ylabel {
|
my $result=''; |
my $result=''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
|
if (length($ylabel) > $max_str_len) { |
|
$ylabel = substr($ylabel,0,$max_str_len); |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
Line 465 sub start_label {
|
Line 489 sub start_label {
|
my %label; |
my %label; |
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval, |
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
$label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
if (! &$words_test($label{'text'})) { |
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len); |
# I should probably warn about it, too. |
$label{'text'} = $text; |
$label{'text'} = 'Illegal text'; |
|
} |
|
push(@labels,\%label); |
push(@labels,\%label); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Plot Label'); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Label'); |
Line 516 sub start_curve {
|
Line 538 sub start_curve {
|
$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 |
($token,$parstack,$safeeval,keys(%label_defaults)); |
($token,$parstack,$safeeval,keys(%curve_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 588 sub start_data {
|
Line 610 sub start_data {
|
# 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. |
my @data; |
my @data; |
if ($datatext =~ /,/) { |
if ($datatext =~ /,/) { # comma deliminated |
@data = split /,/,$datatext; |
@data = split /,/,$datatext; |
} else { # Assume it's space seperated. |
} else { # Assume it's space seperated. |
@data = split / /,$datatext; |
@data = split / /,$datatext; |
Line 609 sub start_data {
|
Line 631 sub start_data {
|
$data[$i] = 1.15572734979092; |
$data[$i] = 1.15572734979092; |
} |
} |
} |
} |
|
# complain if the number of data points is not the same as |
|
# in previous sets of data. |
|
if (($curves[-1]->{'data'}) && ($#data != $#{@{$curves[-1]->{'data'}->[0]}})){ |
|
&Apache::lonxml::warning |
|
('Number of data points is not consistent with previous '. |
|
'number of data points'); |
|
} |
push @{$curves[-1]->{'data'}},\@data; |
push @{$curves[-1]->{'data'}},\@data; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Curve Data'); |
$result .= &Apache::edit::tag_start($target,$token,'Curve Data'); |
Line 786 sub check_inputs {
|
Line 815 sub check_inputs {
|
## 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,\%plot_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 |
if (! defined($xlabel)) {} # No xlabel for this plot, thats okay |
if (! defined($xlabel)) {} # No xlabel for this plot, thats okay |
if (! defined($ylabel)) {} # No ylabel for this plot, thats okay |
if (! defined($ylabel)) {} # No ylabel for this plot, thats okay |
Line 806 sub check_inputs {
|
Line 835 sub check_inputs {
|
|
|
#------------------------------------------------ make_edit |
#------------------------------------------------ make_edit |
sub edit_attributes { |
sub edit_attributes { |
my ($target,$token,$defaults) = @_; |
my ($target,$token,$defaults,$keys) = @_; |
my $result; |
my ($result,@keys); |
foreach my $attr (sort keys(%$defaults)) { |
if ($keys && ref($keys) eq 'ARRAY') { |
|
@keys = @$keys; |
|
} else { |
|
@keys = sort(keys(%$defaults)); |
|
} |
|
foreach my $attr (@keys) { |
|
# append a ' ' to the description if it doesn't have one already. |
|
my $description = $defaults->{$attr}->{'description'}; |
|
$description .= ' ' if ($description !~ / $/); |
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
$result .= &Apache::edit::text_arg( |
$result .= &Apache::edit::text_arg |
$defaults->{$attr}->{'description'}, |
($description,$attr,$token); |
$attr, |
|
$token); |
|
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
$result .= &Apache::edit::select_arg( |
$result .= &Apache::edit::select_arg |
$defaults->{$attr}->{'description'}, |
($description,$attr,$defaults->{$attr}->{'choices'},$token); |
$attr, |
} elsif ($defaults->{$attr}->{'edit_type'} eq 'on_off') { |
$defaults->{$attr}->{'choices'}, |
$result .= &Apache::edit::select_arg |
$token); |
($description,$attr,['on','off'],$token); |
} |
} |
$result .= '<br />'; |
$result .= '<br />'; |
} |
} |