version 1.14, 2001/12/21 16:59:01
|
version 1.20, 2001/12/27 22:30:01
|
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 Matthew |
# 12/17 12/18 12/19 12/20 12/21 12/27 Matthew |
package Apache::lonplot; |
package Apache::lonplot; |
|
|
use strict; |
use strict; |
use Apache::File; |
use Apache::File; |
use Apache::response; |
use Apache::response; |
use Apache::lonxml; |
use Apache::lonxml; |
|
use Apache::edit; |
use Digest::MD5 qw(md5_base64); |
|
|
|
sub BEGIN { |
sub BEGIN { |
&Apache::lonxml::register('Apache::lonplot',('plot')); |
&Apache::lonxml::register('Apache::lonplot',('plot')); |
Line 53 sub BEGIN {
|
Line 52 sub BEGIN {
|
## grid |
## grid |
## border |
## border |
## font |
## font |
|
## align |
## |
## |
## @labels: $labels[$i] = \%label |
## @labels: $labels[$i] = \%label |
## %label: text, xpos, ypos, justify |
## %label: text, xpos, ypos, justify |
Line 68 sub BEGIN {
|
Line 68 sub BEGIN {
|
## Tests used in checking the validitity of input |
## Tests used in checking the validitity of input |
## |
## |
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/}; |
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/}; |
my $real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*$/}; |
my $real_test = |
|
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/}; |
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/}; |
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/}; |
my $onoff_test = sub {$_[0]=~/^(on|off)$/}; |
my $onoff_test = sub {$_[0]=~/^(on|off)$/}; |
my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below)+$/}; |
my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/}; |
my $sml_test = sub {$_[0]=~/^(small|medium|large)$/}; |
my $sml_test = sub {$_[0]=~/^(small|medium|large)$/}; |
my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/}; |
my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/}; |
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^(\w+ ?)+$/}; |
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w\(\)]+ ?)+$/}; |
## |
## |
## Default values for attributes of elements |
## Attribute metadata |
## |
## |
my %plot_defaults = |
my %plot_defaults = |
( |
( |
height => {default => 200, test => $int_test }, |
height => { |
width => {default => 200, test => $int_test }, |
default => 200, |
bgcolor => {default => 'xffffff', test => $color_test }, |
test => $int_test, |
fgcolor => {default => 'x000000', test => $color_test }, |
description => 'vertical size of image (pixels)', |
transparent => {default => 'off', test => $onoff_test }, |
edit_type => 'entry' |
grid => {default => 'off', test => $onoff_test }, |
}, |
border => {default => 'on', test => $onoff_test }, |
width => { |
font => {default => 'medium', test => $sml_test } |
default => 200, |
|
test => $int_test, |
|
description => 'horizontal size of image (pixels)', |
|
edit_type => 'entry' |
|
}, |
|
bgcolor => { |
|
default => 'xffffff', |
|
test => $color_test, |
|
description => 'background color of image (xffffff)', |
|
edit_type => 'entry' |
|
}, |
|
fgcolor => { |
|
default => 'x000000', |
|
test => $color_test, |
|
description => 'foreground color of image (x000000)', |
|
edit_type => 'entry' |
|
}, |
|
transparent => { |
|
default => 'off', |
|
test => $onoff_test, |
|
description => '', |
|
edit_type => 'on_off' |
|
}, |
|
grid => { |
|
default => 'off', |
|
test => $onoff_test, |
|
description => '', |
|
edit_type => 'on_off' |
|
}, |
|
border => { |
|
default => 'on', |
|
test => $onoff_test, |
|
description => '', |
|
edit_type => 'on_off' |
|
}, |
|
font => { |
|
default => 'medium', |
|
test => $sml_test, |
|
description => 'Size of font to use', |
|
edit_type => 'choice', |
|
choices => ['small','medium','large'] |
|
}, |
|
align => { |
|
default => 'left', |
|
test => sub {$_[0]=~/^(left|right|center)$/}, |
|
description => 'alignment for image in html', |
|
edit_type => 'choice', |
|
choices => ['left','right','center'] |
|
} |
); |
); |
|
|
my %key_defaults = |
my %key_defaults = |
( |
( |
title => { default => '', test => $words_test }, |
title => { |
box => { default => 'off', test => $onoff_test }, |
default => '', |
pos => { default => 'top right', test => $key_pos_test } |
test => $words_test, |
|
description => 'Title of key', |
|
edit_type => 'entry' |
|
}, |
|
box => { |
|
default => 'off', |
|
test => $onoff_test, |
|
description => 'Draw a box around the key?', |
|
edit_type => 'on_off' |
|
}, |
|
pos => { |
|
default => 'top right', |
|
test => $key_pos_test, |
|
description => 'position of the key on the plot', |
|
edit_type => 'choice', |
|
choices => ['top left','top right','bottom left','bottom right', |
|
'outside','below'] |
|
} |
); |
); |
|
|
my %label_defaults = |
my %label_defaults = |
( |
( |
xpos => {default => 0, test => $real_test }, |
xpos => { |
ypos => {default => 0, test => $real_test }, |
default => 0, |
justify => {default => 'left', |
test => $real_test, |
test => sub {$_[0]=~/^(left|right|center)$/} } |
description => 'x position of label (graph coordinates)', |
|
edit_type => 'entry' |
|
}, |
|
ypos => { |
|
default => 0, |
|
test => $real_test, |
|
description => 'y position of label (graph coordinates)', |
|
edit_type => 'entry' |
|
}, |
|
justify => { |
|
default => 'left', |
|
test => sub {$_[0]=~/^(left|right|center)$/}, |
|
description => 'justification of the label text on the plot', |
|
edit_type => 'choice', |
|
choices => ['left','right','center'] |
|
} |
); |
); |
|
|
my %axis_defaults = |
my %axis_defaults = |
( |
( |
color => {default => 'x000000', test => $color_test}, |
color => { |
xmin => {default => '-10.0', test => $real_test }, |
default => 'x000000', |
xmax => {default => ' 10.0', test => $real_test }, |
test => $color_test, |
ymin => {default => '-10.0', test => $real_test }, |
description => 'color of axes (x000000)', |
ymax => {default => ' 10.0', test => $real_test } |
edit_type => 'entry' |
|
}, |
|
xmin => { |
|
default => '-10.0', |
|
test => $real_test, |
|
description => 'minimum x-value shown in plot', |
|
edit_type => 'entry' |
|
}, |
|
xmax => { |
|
default => ' 10.0', |
|
test => $real_test, |
|
description => 'maximum x-value shown in plot', |
|
edit_type => 'entry' |
|
}, |
|
ymin => { |
|
default => '-10.0', |
|
test => $real_test, |
|
description => 'minimum y-value shown in plot', |
|
edit_type => 'entry' |
|
}, |
|
ymax => { |
|
default => ' 10.0', |
|
test => $real_test, |
|
description => 'maximum y-value shown in plot', |
|
edit_type => 'entry' |
|
}, |
|
linestyle => { |
|
default => 'points', |
|
test => $linestyle_test, |
|
description => 'Style of the axis lines', |
|
edit_type => 'choice', |
|
choices => ['lines','linespoints','dots','points'] |
|
} |
); |
); |
|
|
my %curve_defaults = |
my %curve_defaults = |
( |
( |
color => {default => 'x000000', test => $color_test }, |
color => { |
name => {default => '', test => $words_test }, |
default => 'x000000', |
linestyle => {default => 'lines', test => $linestyle_test } |
test => $color_test, |
|
description => 'color of curve (x000000)', |
|
edit_type => 'entry' |
|
}, |
|
name => { |
|
default => '', |
|
test => $words_test, |
|
description => 'name of curve to appear in key', |
|
edit_type => 'entry' |
|
}, |
|
linestyle => { |
|
default => 'lines', |
|
test => $linestyle_test, |
|
description => 'Style of the axis lines', |
|
edit_type => 'choice', |
|
choices => ['lines','linespoints','dots','points','steps'] |
|
} |
); |
); |
|
|
## |
## |
Line 133 sub start_plot {
|
Line 262 sub start_plot {
|
# |
# |
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', |
|
('title','xlabel','ylabel','key','axis','label','curve')); |
|
push (@Apache::lonxml::namespace,'plot'); |
|
## Always evaluate the insides of the <plot></plot> tags |
|
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]); |
|
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
|
&Apache::lonxml::newparser($parser,\$inside); |
|
##------------------------------------------------------- |
|
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
|
&Apache::lonxml::register('Apache::lonplot', |
|
('title','xlabel','ylabel','key','axis','label','curve')); |
|
push (@Apache::lonxml::namespace,'plot'); |
|
## Always evaluate the insides of the <plot></plot> tags |
|
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]); |
|
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
|
&Apache::lonxml::newparser($parser,\$inside); |
|
##------------------------------------------------------- |
|
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args |
|
($token,$parstack,$safeeval,keys %plot_defaults); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
return ''; |
return ''; |
} |
} |
Line 186 sub end_plot {
|
Line 323 sub end_plot {
|
close($fh); |
close($fh); |
## return image tag for the plot |
## return image tag for the plot |
$result .= <<"ENDIMAGE"; |
$result .= <<"ENDIMAGE"; |
<img src = "/cgi-bin/plot.gif?$filename" |
<img src = "/cgi-bin/plot.gif?$filename" |
alt = "/cgi-bin/plot.gif?$filename" /> |
width = "$plot{'width'}" |
|
height = "$plot{'height'}" |
|
align = "$plot{'align'}" |
|
alt = "/cgi-bin/plot.gif?$filename" /> |
ENDIMAGE |
ENDIMAGE |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 197 ENDIMAGE
|
Line 339 ENDIMAGE
|
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=''; |
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args |
|
($token,$parstack,$safeeval,keys %key_defaults); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 209 sub end_key {
|
Line 358 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
##------------------------------------------------------------------- title |
##------------------------------------------------------------------- title |
sub start_title { |
sub start_title { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
|
my $result=''; |
my $result=''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 228 sub end_title {
|
Line 379 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 236 sub end_title {
|
Line 388 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=''; |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 247 sub end_xlabel {
|
Line 400 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 255 sub end_xlabel {
|
Line 409 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=''; |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 266 sub end_ylabel {
|
Line 421 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 274 sub end_ylabel {
|
Line 430 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=''; |
my %label; |
|
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
$label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
|
if (! &$words_test($label{'text'})) { |
|
# I should probably warn about it, too. |
|
$label{'text'} = 'Illegal text'; |
|
} |
|
push(@labels,\%label); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
my %label; |
|
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
$label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
|
if (! &$words_test($label{'text'})) { |
|
# I should probably warn about it, too. |
|
$label{'text'} = 'Illegal text'; |
|
} |
|
push(@labels,\%label); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args |
|
($token,$parstack,$safeeval,keys %label_defaults); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 293 sub end_label {
|
Line 456 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 302 sub end_label {
|
Line 466 sub end_label {
|
sub start_curve { |
sub start_curve { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my %curve; |
|
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
push (@curves,\%curve); |
|
&Apache::lonxml::register('Apache::lonplot',('function','data')); |
|
push (@Apache::lonxml::namespace,'curve'); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
my %curve; |
|
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
push (@curves,\%curve); |
|
&Apache::lonxml::register('Apache::lonplot',('function','data')); |
|
push (@Apache::lonxml::namespace,'curve'); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args |
|
($token,$parstack,$safeeval,keys %label_defaults); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 317 sub start_curve {
|
Line 488 sub start_curve {
|
sub end_curve { |
sub end_curve { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result = ''; |
my $result = ''; |
pop @Apache::lonxml::namespace; |
|
&Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
pop @Apache::lonxml::namespace; |
|
&Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 328 sub end_curve {
|
Line 500 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 (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.'); |
|
delete $curves[-1]->{'data'} ; |
|
} |
|
$curves[-1]->{'function'} = |
|
&Apache::lonxml::get_all_text("/function",$$parser[-1]); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
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.'); |
|
delete $curves[-1]->{'data'} ; |
|
} |
|
$curves[-1]->{'function'} = |
|
&Apache::lonxml::get_all_text("/function",$$parser[-1]); |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
my $text=&Apache::lonxml::get_all_text("/function",$$parser[-1]); |
|
$result.='</td></tr><tr><td colspan="3">'. |
|
&Apache::edit::editfield('',$text,'',20,1). |
|
&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
|
# Why do I do this? |
|
my $text=$$parser[-1]->get_text("/function"); |
|
$result.=&Apache::edit::modifiedfield($token); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 344 sub end_function {
|
Line 525 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 352 sub end_function {
|
Line 534 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 (exists($curves[-1]->{'function'})) { |
|
&Apache::lonxml::warning('Use of <data> precludes use of <function>.'. |
|
' The <function> will be omitted in favor of the <data>'. |
|
' declaration.'); |
|
delete($curves[-1]->{'function'}); |
|
} |
|
my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]); |
|
$datatext =~ s/\s+//g; # No whitespace, numbers must be seperated |
|
# by commas |
|
if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) { |
|
&Apache::lonxml::warning('Malformed data: '.$datatext); |
|
$datatext = ''; |
|
} |
|
# Need to do some error checking on the @data array - |
|
# make sure it's all numbers and make sure each array |
|
# is of the same length. |
|
my @data = split /,/,$datatext; |
|
for (my $i=0;$i<=$#data;$i++) { |
|
# Check that it's non-empty |
|
# Check that it's a number |
|
# Maybe I need a 'debug=on' switch to list the data set |
|
# out in a warning? |
|
} |
|
push @{$curves[-1]->{'data'}},\@data; |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
if (exists($curves[-1]->{'function'})) { |
|
&Apache::lonxml::warning('Use of <data> precludes use of .'. |
|
'<function>. The <function> will be omitted in favor of '. |
|
'the <data> declaration.'); |
|
delete($curves[-1]->{'function'}); |
|
} |
|
my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]); |
|
$datatext =~ s/\s+/ /g; |
|
# Need to do some error checking on the @data array - |
|
# make sure it's all numbers and make sure each array |
|
# is of the same length. |
|
my @data; |
|
if ($datatext =~ /,/) { |
|
@data = split /,/,$datatext; |
|
} else { # Assume it's space seperated. |
|
@data = split / /,$datatext; |
|
} |
|
for (my $i=0;$i<=$#data;$i++) { |
|
# Check that it's non-empty |
|
if (! defined($data[$i])) { |
|
&Apache::lonxml::warning( |
|
'undefined <data> value. Replacing with '. |
|
' pi/e = 1.15572734979092'); |
|
$data[$i] = 1.15572734979092; |
|
} |
|
# Check that it's a number |
|
if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) { |
|
&Apache::lonxml::warning( |
|
'Bad <data> value of '.$data[$i].' Replacing with '. |
|
' pi/e = 1.15572734979092'); |
|
$data[$i] = 1.15572734979092; |
|
} |
|
} |
|
push @{$curves[-1]->{'data'}},\@data; |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 386 sub end_data {
|
Line 579 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 395 sub end_data {
|
Line 589 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=''; |
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
if ($target eq 'web') { |
if ($target eq 'web') { |
# This routine should never return anything. |
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
|
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
} |
} |
return $result; |
return $result; |
} |
} |
Line 407 sub end_axis {
|
Line 602 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') { |
# This routine should never return anything. |
} elsif ($target eq 'edit') { |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args |
|
($token,$parstack,$safeeval,keys %axis_defaults); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 429 sub get_attributes{
|
Line 631 sub get_attributes{
|
my $parstack = shift; |
my $parstack = shift; |
my $safeeval = shift; |
my $safeeval = shift; |
my $tag = shift; |
my $tag = shift; |
my $attr; |
foreach my $attr (keys %{$defaults}) { |
foreach $attr (keys %{$defaults}) { |
|
$values->{$attr} = |
$values->{$attr} = |
&Apache::lonxml::get_param($attr,$parstack,$safeeval); |
&Apache::lonxml::get_param($attr,$parstack,$safeeval); |
if ($values->{$attr} eq '' | !defined($values->{$attr})) { |
if ($values->{$attr} eq '' | !defined($values->{$attr})) { |
$values->{$attr} = $defaults->{$attr}->{'default'}; |
$values->{$attr} = $defaults->{$attr}->{'default'}; |
next; |
next; |
Line 447 sub get_attributes{
|
Line 648 sub get_attributes{
|
} |
} |
return ; |
return ; |
} |
} |
|
##------------------------------------------------------- write_gnuplot_file |
sub write_gnuplot_file { |
sub write_gnuplot_file { |
my $gnuplot_input = ''; |
my $gnuplot_input = ''; |
my $curve; |
my $curve; |
Line 456 sub write_gnuplot_file {
|
Line 657 sub write_gnuplot_file {
|
push @Colors, $plot{'bgcolor'}; |
push @Colors, $plot{'bgcolor'}; |
push @Colors, $plot{'fgcolor'}; |
push @Colors, $plot{'fgcolor'}; |
push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'}); |
push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'}); |
push @Colors, $Colors[-1]; # Redundancy |
|
foreach $curve (@curves) { |
foreach $curve (@curves) { |
push @Colors, ($curve->{'color'} ne '' ? |
push @Colors, ($curve->{'color'} ne '' ? |
$curve->{'color'} : |
$curve->{'color'} : |
Line 528 sub write_gnuplot_file {
|
Line 728 sub write_gnuplot_file {
|
$gnuplot_input .= $/.$datatext; |
$gnuplot_input .= $/.$datatext; |
return $gnuplot_input; |
return $gnuplot_input; |
} |
} |
|
#------------------------------------------------ make_edit |
|
sub edit_attributes { |
|
my $target = shift; |
|
my $token = shift; |
|
my $defaults = shift; |
|
my $result; |
|
foreach my $attr (%{$token->[2]}) { |
|
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
|
$result .= &Apache::edit::text_arg( |
|
$defaults->{$attr}->{'description'}, |
|
$attr, |
|
$token); |
|
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
|
$result .= &Apache::edit::select_arg( |
|
$defaults->{$attr}->{'description'}, |
|
$attr, |
|
$defaults->{$attr}->{'choices'}, |
|
$token); |
|
} |
|
} |
|
return $result; |
|
} |
|
|
1; |
#------------------------------------------------ insert_xxxxxxx |
__END__ |
sub insert_plot { |
|
my $result; |
|
# plot attributes |
|
$result .= '<plot '; |
|
foreach my $attr (%plot_defaults) { |
|
$result .= ' '.$attr.' "'.$plot_defaults{$attr}->{'default'}. |
|
"\"\n"; |
|
} |
|
$result .= ">\n"; |
|
# Add the components |
|
$result .= &insert_key(); |
|
$result .= &insert_axis(); |
|
$result .= &insert_label(); |
|
$result .= &insert_curve(); |
|
$result .= &insert_function(); |
|
$result .= "</curve>\n"; |
|
$result .= &insert_curve(); |
|
$result .= &insert_data(); |
|
$result .= "</curve>\n"; |
|
# close up the <plot> |
|
$result .= "</plot>\n"; |
|
return $result; |
|
} |
|
|
|
sub insert_key { |
|
my $result; |
|
$result .= ' <key '; |
|
foreach my $attr (%key_defaults) { |
|
$result .= ' '.$attr.' "'.$key_defaults{$attr}->{'default'}. |
|
"\"\n"; |
|
} |
|
$result .= " />\n"; |
|
return $result; |
|
} |
|
|
|
sub insert_axis{ |
|
my $result; |
|
$result .= ' <axis '; |
|
foreach my $attr (%axis_defaults) { |
|
$result .= ' '.$attr.' "'.$axis_defaults{$attr}->{'default'}. |
|
"\"\n"; |
|
} |
|
$result .= " />\n"; |
|
return $result; |
|
} |
|
|
|
sub insert_label { |
|
my $result; |
|
$result .= ' <label '; |
|
foreach my $attr (%label_defaults) { |
|
$result .= ' '.$attr.' "'. |
|
$label_defaults{$attr}->{'default'}."\"\n"; |
|
} |
|
$result .= " ></label>\n"; |
|
return $result; |
|
} |
|
|
|
sub insert_curve { |
|
my $result; |
|
$result .= ' <curve '; |
|
foreach my $attr (%curve_defaults) { |
|
$result .= ' '.$attr.' "'. |
|
$curve_defaults{$attr}->{'default'}."\"\n"; |
|
} |
|
$result .= " >\n"; |
|
} |
|
|
|
sub insert_function { |
|
my $result; |
|
$result .= "<function></function>\n"; |
|
return $result; |
|
} |
|
|
|
sub insert_data { |
|
my $result; |
|
$result .= " <data></data>\n"; |
|
$result .= " <data></data>\n"; |
|
return $result; |
|
} |
|
|
|
1; |
|
__END__ |
|
|
|
|