version 1.14, 2001/12/21 16:59:01
|
version 1.17, 2001/12/21 22:45:47
|
Line 71 my $int_test = sub {$_[0]=~s/\s+//
|
Line 71 my $int_test = sub {$_[0]=~s/\s+//
|
my $real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*$/}; |
my $real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\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 |
## Default values for attributes of elements |
## |
## |
Line 87 my %plot_defaults =
|
Line 87 my %plot_defaults =
|
transparent => {default => 'off', test => $onoff_test }, |
transparent => {default => 'off', test => $onoff_test }, |
grid => {default => 'off', test => $onoff_test }, |
grid => {default => 'off', test => $onoff_test }, |
border => {default => 'on', test => $onoff_test }, |
border => {default => 'on', test => $onoff_test }, |
font => {default => 'medium', test => $sml_test } |
font => {default => 'medium', test => $sml_test }, |
|
align => {default => 'left', test => $words_test } |
); |
); |
|
|
my %key_defaults = |
my %key_defaults = |
Line 111 my %axis_defaults =
|
Line 112 my %axis_defaults =
|
xmin => {default => '-10.0', test => $real_test }, |
xmin => {default => '-10.0', test => $real_test }, |
xmax => {default => ' 10.0', test => $real_test }, |
xmax => {default => ' 10.0', test => $real_test }, |
ymin => {default => '-10.0', test => $real_test }, |
ymin => {default => '-10.0', test => $real_test }, |
ymax => {default => ' 10.0', test => $real_test } |
ymax => {default => ' 10.0', test => $real_test }, |
|
linestyle => {default => 'points', test => $linestyle_test} |
); |
); |
|
|
my %curve_defaults = |
my %curve_defaults = |
Line 133 sub start_plot {
|
Line 135 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]); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 186 sub end_plot {
|
Line 188 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 |
} |
} |
return $result; |
return $result; |
Line 197 ENDIMAGE
|
Line 202 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') { |
|
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 216 sub end_key {
|
Line 221 sub end_key {
|
##------------------------------------------------------------------- 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') { |
|
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 236 sub end_title {
|
Line 241 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') { |
|
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 255 sub end_xlabel {
|
Line 260 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') { |
|
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 274 sub end_ylabel {
|
Line 279 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); |
} |
} |
|
# This routine should never return anything. |
return $result; |
return $result; |
} |
} |
|
|
Line 302 sub end_label {
|
Line 307 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') { |
|
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'); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 317 sub start_curve {
|
Line 322 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') { |
|
pop @Apache::lonxml::namespace; |
|
&Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 328 sub end_curve {
|
Line 333 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') { |
|
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]); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 352 sub end_function {
|
Line 357 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') { |
|
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]); |
|
&Apache::lonxml::warning( |
|
' Length of data string: '.length($datatext)); |
|
$datatext =~ s/\s+/ /g; |
|
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; |
|
if ($datatext =~ /,/) { |
|
@data = split /,/,$datatext; |
|
} else { # Assume it's space seperated. |
|
@data = split / /,$datatext; |
|
} |
|
&Apache::lonxml::warning(' Data Points: '.$#data); |
|
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; |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 395 sub end_data {
|
Line 407 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') { |
|
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
|
$tagstack->[-1]); |
# This routine should never return anything. |
# This routine should never return anything. |
} |
} |
return $result; |
return $result; |
Line 432 sub get_attributes{
|
Line 444 sub get_attributes{
|
my $attr; |
my $attr; |
foreach $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 459 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 468 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'} : |