version 1.14, 2001/12/21 16:59:01
|
version 1.15, 2001/12/21 20:06:25
|
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 111 my %axis_defaults =
|
Line 111 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 432 sub get_attributes{
|
Line 433 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 448 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 457 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'} : |