--- loncom/xml/lonplot.pm 2001/12/21 15:27:29 1.13 +++ loncom/xml/lonplot.pm 2001/12/21 21:39:51 1.16 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.13 2001/12/21 15:27:29 matthew Exp $ +# $Id: lonplot.pm,v 1.16 2001/12/21 21:39:51 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,7 +26,7 @@ # http://www.lon-capa.org/ # # 12/15/01 Matthew -# 12/18 12/19 12/20 Matthew +# 12/17 12/18 12/19 12/20 12/21 Matthew package Apache::lonplot; use strict; @@ -56,9 +56,9 @@ sub BEGIN { ## ## @labels: $labels[$i] = \%label ## %label: text, xpos, ypos, justify -## +## ## @curves: $curves[$i] = \%curve -## %curve: name, linestyle, ( function | data ) +## %curve: name, linestyle, ( function | data ) ## ## $curves[$i]->{'data'} = [ [x1,x2,x3,x4], ## [y1,y2,y3,y4] ] @@ -71,10 +71,10 @@ my $int_test = sub {$_[0]=~s/\s+// 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 $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,8 @@ 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 => $words_test } ); my %key_defaults = @@ -111,7 +112,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 = @@ -158,13 +160,23 @@ sub end_plot { ## ## Make sure we have all the input we need: if (! defined(%plot )) { &set_defaults(\%plot,\%plot_defaults); } - if (! defined(%key )) {} # No key for this plot + if (! defined(%key )) {} # No key for this plot if (! defined(%axis )) { &set_defaults(\%axis,\%axis_defaults); } - if (! defined($title )) {} # No title for this plot - if (! defined($xlabel)) {} # No xlabel for this plot - if (! defined($ylabel)) {} # No ylabel for this plot + if (! defined($title )) {} # No title for this plot + if (! defined($xlabel)) {} # No xlabel for this plot + if (! defined($ylabel)) {} # No ylabel for this plot if ($#labels < 0) { } # No labels for this plot - if ($#curves < 0) { } # This is an error + if ($#curves < 0) { + &Apache::lonxml::warning("No curves specified for plot!!!!"); + return ''; + } + my $curve; + foreach $curve (@curves) { + if (!defined($curve->{'function'})&&!defined($curve->{'data'})){ + &Apache::lonxml::warning("One of the curves specified did not contain any or declarations\n"); + return ''; + } + } ## ## Determine filename my $tmpdir = '/home/httpd/perl/tmp/'; @@ -172,14 +184,15 @@ sub end_plot { '_'.time.'_'.$$.'_plot.data'; ## Write the plot description to the file my $fh=Apache::File->new(">$tmpdir$filename"); - $result .= '
';
-	$result .= $filename.$/;
 	print $fh &write_gnuplot_file();
-	$result .= '
'.$/; + close($fh); ## return image tag for the plot $result .= <<"ENDIMAGE"; -/cgi-bin/plot.gif?$filename +/cgi-bin/plot.gif?$filename ENDIMAGE } return $result; @@ -351,7 +364,7 @@ sub start_data { delete($curves[-1]->{'function'}); } my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]); - $datatext =~ s/\s+//g; # No whitespace, numbers must be seperated + $datatext =~ s/\s+/ /g; # No whitespace, numbers must be seperated # by commas if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) { &Apache::lonxml::warning('Malformed data: '.$datatext); @@ -360,7 +373,12 @@ sub start_data { # 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; + 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 # Check that it's a number @@ -424,7 +442,7 @@ sub get_attributes{ my $attr; foreach $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; @@ -439,7 +457,7 @@ sub get_attributes{ } return ; } - +##------------------------------------------------------- write_gnuplot_file sub write_gnuplot_file { my $gnuplot_input = ''; my $curve; @@ -448,7 +466,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'} :