version 1.22, 2001/12/28 19:04:56
|
version 1.24, 2001/12/28 21:09:57
|
Line 263 my %curve_defaults =
|
Line 263 my %curve_defaults =
|
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves); |
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves); |
|
|
sub start_plot { |
sub start_plot { |
%plot = undef; %key = undef; %axis = undef; |
%plot = (); %key = (); %axis = (); |
$title = undef; $xlabel = undef; $ylabel = undef; |
$title = undef; $xlabel = undef; $ylabel = undef; |
$#labels = -1; $#curves = -1; |
$#labels = -1; $#curves = -1; |
# |
# |
Line 285 sub start_plot {
|
Line 285 sub start_plot {
|
$result .= &edit_attributes($target,$token,\%plot_defaults); |
$result .= &edit_attributes($target,$token,\%plot_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %plot_defaults); |
($token,$parstack,$safeeval,keys(%plot_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 337 sub start_key {
|
Line 337 sub start_key {
|
$result .= &edit_attributes($target,$token,\%key_defaults); |
$result .= &edit_attributes($target,$token,\%key_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %key_defaults); |
($token,$parstack,$safeeval,keys(%key_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 380 sub end_title {
|
Line 380 sub end_title {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 408 sub end_xlabel {
|
Line 407 sub end_xlabel {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 437 sub end_ylabel {
|
Line 435 sub end_ylabel {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 465 sub start_label {
|
Line 462 sub start_label {
|
&Apache::edit::end_table(); |
&Apache::edit::end_table(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %label_defaults); |
($token,$parstack,$safeeval,keys(%label_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 502 sub start_curve {
|
Line 499 sub start_curve {
|
$result .= &edit_attributes($target,$token,\%curve_defaults); |
$result .= &edit_attributes($target,$token,\%curve_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %label_defaults); |
($token,$parstack,$safeeval,keys(%label_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 642 sub end_axis {
|
Line 639 sub end_axis {
|
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %axis_defaults); |
($token,$parstack,$safeeval,keys(%axis_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 661 sub end_axis {
|
Line 658 sub end_axis {
|
sub set_defaults { |
sub set_defaults { |
my ($var,$defaults) = @_; |
my ($var,$defaults) = @_; |
my $key; |
my $key; |
foreach $key (keys %$defaults) { |
foreach $key (keys(%$defaults)) { |
$var->{$key} = $defaults->{$key}->{'default'}; |
$var->{$key} = $defaults->{$key}->{'default'}; |
} |
} |
} |
} |
Line 669 sub set_defaults {
|
Line 666 sub set_defaults {
|
##------------------------------------------------------------------- misc |
##------------------------------------------------------------------- misc |
sub get_attributes{ |
sub get_attributes{ |
my ($values,$defaults,$parstack,$safeeval,$tag) = @_; |
my ($values,$defaults,$parstack,$safeeval,$tag) = @_; |
foreach my $attr (keys %{$defaults}) { |
foreach my $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})) { |
Line 716 sub write_gnuplot_file {
|
Line 713 sub write_gnuplot_file {
|
$gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ; |
$gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ; |
$gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel)); |
$gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel)); |
$gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel)); |
if (defined(%axis)) { |
if (%axis) { |
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n"; |
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n"; |
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n"; |
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n"; |
} |
} |
# Key |
# Key |
if (defined(%key)) { |
if (%key) { |
$gnuplot_input .= 'set key '.$key{'pos'}.' '; |
$gnuplot_input .= 'set key '.$key{'pos'}.' '; |
if ($key{'title'} ne '') { |
if ($key{'title'} ne '') { |
$gnuplot_input .= 'title "'.$key{'title'}.'" '; |
$gnuplot_input .= 'title "'.$key{'title'}.'" '; |
Line 771 sub write_gnuplot_file {
|
Line 768 sub write_gnuplot_file {
|
sub check_inputs { |
sub check_inputs { |
## Note: no inputs, no outputs - this acts only on global variables. |
## Note: no inputs, no outputs - this acts only on global variables. |
## Make sure we have all the input we need: |
## Make sure we have all the input we need: |
if (! defined(%plot )) { &set_defaults(\%plot,\%plot_defaults); } |
if (! %plot) { &set_defaults(\%plot,\%plot_defaults); } |
if (! defined(%key )) {} # No key for this plot, thats okay |
if (! %key ) {} # No key for this plot, thats okay |
if (! defined(%axis )) { &set_defaults(\%axis,\%axis_defaults); } |
if (! %axis) { &set_defaults(\%axis,\%axis_defaults); } |
if (! defined($title )) {} # No title for this plot, thats okay |
if (! defined($title )) {} # No title for this plot, thats okay |
if (! defined($xlabel)) {} # No xlabel for this plot, thats okay |
if (! defined($xlabel)) {} # No xlabel for this plot, thats okay |
if (! defined($ylabel)) {} # No ylabel for this plot, thats okay |
if (! defined($ylabel)) {} # No ylabel for this plot, thats okay |