--- loncom/xml/lonplot.pm 2001/12/28 15:49:38 1.21
+++ loncom/xml/lonplot.pm 2001/12/28 21:09:57 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.21 2001/12/28 15:49:38 matthew Exp $
+# $Id: lonplot.pm,v 1.24 2001/12/28 21:09:57 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,7 +26,7 @@
# http://www.lon-capa.org/
#
# 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 12/27 Matthew
+# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 Matthew
package Apache::lonplot;
use strict;
@@ -263,7 +263,7 @@ my %curve_defaults =
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves);
sub start_plot {
- %plot = undef; %key = undef; %axis = undef;
+ %plot = (); %key = (); %axis = ();
$title = undef; $xlabel = undef; $ylabel = undef;
$#labels = -1; $#curves = -1;
#
@@ -285,7 +285,7 @@ sub start_plot {
$result .= &edit_attributes($target,$token,\%plot_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %plot_defaults);
+ ($token,$parstack,$safeeval,keys(%plot_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -337,7 +337,7 @@ sub start_key {
$result .= &edit_attributes($target,$token,\%key_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %key_defaults);
+ ($token,$parstack,$safeeval,keys(%key_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -363,6 +363,11 @@ sub start_title {
if ($target eq 'web') {
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
} elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
+ $result.='| '.
+ &Apache::edit::editfield('',$text,'',20,1).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/function");
$result.=&Apache::edit::modifiedfield($token);
@@ -385,6 +390,11 @@ sub start_xlabel {
if ($target eq 'web') {
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
} elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
+ $result.=' |
| '.
+ &Apache::edit::editfield('',$text,'',20,1).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/function");
$result.=&Apache::edit::modifiedfield($token);
@@ -408,6 +418,11 @@ sub start_ylabel {
if ($target eq 'web') {
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
} elsif ($target eq 'edit') {
+ $result .= &Apache::edit::tag_start($target,$token);
+ my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
+ $result .= ' |
| '.
+ &Apache::edit::editfield('',$text,'',20,1).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/function");
$result.=&Apache::edit::modifiedfield($token);
@@ -441,14 +456,18 @@ sub start_label {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token);
$result .= &edit_attributes($target,$token,\%label_defaults);
+ my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
+ $result .= ' |
| '.
+ &Apache::edit::editfield('',$text,'',20,1).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %label_defaults);
+ ($token,$parstack,$safeeval,keys(%label_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
}
- my $text=$$parser[-1]->get_text("/function");
+ my $text=$$parser[-1]->get_text("/label");
$result.=&Apache::edit::modifiedfield($token);
}
return $result;
@@ -480,7 +499,7 @@ sub start_curve {
$result .= &edit_attributes($target,$token,\%curve_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %label_defaults);
+ ($token,$parstack,$safeeval,keys(%label_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -513,11 +532,12 @@ sub start_function {
$curves[-1]->{'function'} =
&Apache::lonxml::get_all_text("/function",$$parser[-1]);
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_start($target,$token);
- my $text=&Apache::lonxml::get_all_text("/function",$$parser[-1]);
- $result.=' |
| '.
+ $result .= &Apache::edit::tag_start($target,$token);
+ my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
+ $result .= ' |
| '.
&Apache::edit::editfield('',$text,'',20,1).
&Apache::edit::end_table();
+
} elsif ($target eq 'modified') {
# Why do I do this?
my $text=$$parser[-1]->get_text("/function");
@@ -575,6 +595,11 @@ sub start_data {
}
push @{$curves[-1]->{'data'}},\@data;
} elsif ($target eq 'edit') {
+ $result .= &Apache::edit::tag_start($target,$token);
+ my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
+ $result .= ' |
| '.
+ &Apache::edit::editfield('',$text,'',20,1).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/data");
$result.=&Apache::edit::modifiedfield($token);
@@ -614,7 +639,7 @@ sub end_axis {
$result.=&Apache::edit::tag_end($target,$token);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %axis_defaults);
+ ($token,$parstack,$safeeval,keys(%axis_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -633,7 +658,7 @@ sub end_axis {
sub set_defaults {
my ($var,$defaults) = @_;
my $key;
- foreach $key (keys %$defaults) {
+ foreach $key (keys(%$defaults)) {
$var->{$key} = $defaults->{$key}->{'default'};
}
}
@@ -641,7 +666,7 @@ sub set_defaults {
##------------------------------------------------------------------- misc
sub get_attributes{
my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
- foreach my $attr (keys %{$defaults}) {
+ foreach my $attr (keys(%{$defaults})) {
$values->{$attr} =
&Apache::lonxml::get_param($attr,$parstack,$safeeval);
if ($values->{$attr} eq '' | !defined($values->{$attr})) {
@@ -688,12 +713,12 @@ sub write_gnuplot_file {
$gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ;
$gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
$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 yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
}
# Key
- if (defined(%key)) {
+ if (%key) {
$gnuplot_input .= 'set key '.$key{'pos'}.' ';
if ($key{'title'} ne '') {
$gnuplot_input .= 'title "'.$key{'title'}.'" ';
@@ -743,9 +768,9 @@ sub write_gnuplot_file {
sub check_inputs {
## Note: no inputs, no outputs - this acts only on global variables.
## 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, thats okay
- if (! defined(%axis )) { &set_defaults(\%axis,\%axis_defaults); }
+ if (! %plot) { &set_defaults(\%plot,\%plot_defaults); }
+ if (! %key ) {} # No key for this plot, thats okay
+ if (! %axis) { &set_defaults(\%axis,\%axis_defaults); }
if (! defined($title )) {} # No title 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
|