--- loncom/xml/lonplot.pm 2001/12/21 16:59:01 1.14
+++ loncom/xml/lonplot.pm 2001/12/27 19:47:02 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.14 2001/12/21 16:59:01 matthew Exp $
+# $Id: lonplot.pm,v 1.19 2001/12/27 19:47:02 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,8 +34,6 @@ use Apache::File;
use Apache::response;
use Apache::lonxml;
-use Digest::MD5 qw(md5_base64);
-
sub BEGIN {
&Apache::lonxml::register('Apache::lonplot',('plot'));
}
@@ -53,6 +51,7 @@ sub BEGIN {
## grid
## border
## font
+## align
##
## @labels: $labels[$i] = \%label
## %label: text, xpos, ypos, justify
@@ -68,13 +67,14 @@ sub BEGIN {
## Tests used in checking the validitity of input
##
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 $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 $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
##
@@ -87,7 +87,9 @@ my %plot_defaults =
transparent => {default => 'off', test => $onoff_test },
grid => {default => 'off', 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 =>
+ sub {$_[0]=~/^(left|right|center)$/} }
);
my %key_defaults =
@@ -111,7 +113,8 @@ my %axis_defaults =
xmin => {default => '-10.0', test => $real_test },
xmax => {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 =
@@ -133,17 +136,17 @@ sub start_plot {
#
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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') {
+ &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 '';
}
@@ -186,8 +189,11 @@ sub end_plot {
close($fh);
## return image tag for the plot
$result .= <<"ENDIMAGE";
-<img src = "/cgi-bin/plot.gif?$filename"
- alt = "/cgi-bin/plot.gif?$filename" />
+<img src = "/cgi-bin/plot.gif?$filename"
+ width = "$plot{'width'}"
+ height = "$plot{'height'}"
+ align = "$plot{'align'}"
+ alt = "/cgi-bin/plot.gif?$filename" />
ENDIMAGE
}
return $result;
@@ -197,9 +203,9 @@ ENDIMAGE
sub start_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
- $tagstack->[-1]);
if ($target eq 'web') {
+ &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
+ $tagstack->[-1]);
# This routine should never return anything.
}
return $result;
@@ -216,9 +222,9 @@ sub end_key {
##------------------------------------------------------------------- title
sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
my $result='';
if ($target eq 'web') {
+ $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
# This routine should never return anything.
}
return $result;
@@ -236,8 +242,8 @@ sub end_title {
sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
if ($target eq 'web') {
+ $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
# This routine should never return anything.
}
return $result;
@@ -255,8 +261,8 @@ sub end_xlabel {
sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
if ($target eq 'web') {
+ $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
# This routine should never return anything.
}
return $result;
@@ -274,18 +280,18 @@ sub end_ylabel {
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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') {
- # 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;
}
@@ -302,13 +308,13 @@ sub end_label {
sub start_curve {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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') {
+ 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.
}
return $result;
@@ -317,9 +323,9 @@ sub start_curve {
sub end_curve {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- pop @Apache::lonxml::namespace;
- &Apache::lonxml::deregister('Apache::lonplot',('function','data'));
if ($target eq 'web') {
+ pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::lonplot',('function','data'));
# This routine should never return anything.
}
return $result;
@@ -328,13 +334,13 @@ sub end_curve {
sub start_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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 (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.
}
return $result;
@@ -352,31 +358,41 @@ sub end_function {
sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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 (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;
# This routine should never return anything.
}
return $result;
@@ -395,9 +411,9 @@ sub end_data {
sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
- $tagstack->[-1]);
if ($target eq 'web') {
+ &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
+ $tagstack->[-1]);
# This routine should never return anything.
}
return $result;
@@ -429,10 +445,9 @@ sub get_attributes{
my $parstack = shift;
my $safeeval = shift;
my $tag = shift;
- my $attr;
- foreach $attr (keys %{$defaults}) {
+ foreach my $attr (keys %{$defaults}) {
$values->{$attr} =
- &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+ &Apache::lonxml::get_param($attr,$parstack,$safeeval);
if ($values->{$attr} eq '' | !defined($values->{$attr})) {
$values->{$attr} = $defaults->{$attr}->{'default'};
next;
@@ -447,7 +462,7 @@ sub get_attributes{
}
return ;
}
-
+##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
my $gnuplot_input = '';
my $curve;
@@ -456,7 +471,6 @@ sub write_gnuplot_file {
push @Colors, $plot{'bgcolor'};
push @Colors, $plot{'fgcolor'};
push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
- push @Colors, $Colors[-1]; # Redundancy
foreach $curve (@curves) {
push @Colors, ($curve->{'color'} ne '' ?
$curve->{'color'} :