--- loncom/xml/lonplot.pm	2002/01/06 02:19:25	1.33
+++ loncom/xml/lonplot.pm	2002/01/08 21:41:20	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.33 2002/01/06 02:19:25 harris41 Exp $
+# $Id: lonplot.pm,v 1.34 2002/01/08 21:41:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,7 +28,7 @@
 # 12/15/01 Matthew
 # 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
 # 01/01/02 Matthew
-# 01/02 01/03 Matthew
+# 01/02 01/03 01/04 Matthew
 package Apache::lonplot;
 
 use strict;
@@ -84,15 +84,15 @@ my %linestyles =
      steps	    => 2,     # now there are more important things 
      fsteps	    => 2,     # for me to deal with.
      histeps        => 2,
-     errorbars	    => 2,
-     xerrorbars	    => 2,
-     yerrorbars	    => 2,
-     xyerrorbars    => 2,
-     boxes          => 2,
-     boxerrorbars   => 2,
-     boxxyerrorbars => 2,
-     financebars    => 2,
-     candlesticks   => 2,
+     errorbars	    => 3,
+     xerrorbars	    => [3,4],
+     yerrorbars	    => [3,4],
+     xyerrorbars    => [4,6,7],
+     boxes          => 3,
+     boxerrorbars   => [3,4,5],
+     boxxyerrorbars => [4,6,7],
+     financebars    => 5,
+     candlesticks   => 5,
      vector	    => 2
     );		    
 
@@ -111,6 +111,8 @@ my $words_test     = sub {$_[0]=~s/\s+/
 ##                      Attribute metadata                       ##
 ##                                                               ##
 ###################################################################
+my @plot_edit_order = 
+    qw/bgcolor fgcolor height width font transparent grid border/;
 my %plot_defaults = 
     (
      height       => {
@@ -140,19 +142,19 @@ my %plot_defaults =
      transparent  => {
 	 default     => 'off',
 	 test        => $onoff_test, 
-	 description => '',
+	 description => 'Transparent image',
 	 edit_type   => 'on_off'
 	 },
      grid         => {
 	 default     => 'off',
 	 test        => $onoff_test, 
-	 description => '',
+	 description => 'Display grid',
 	 edit_type   => 'on_off'
 	 },
      border       => {
 	 default     => 'on',
 	 test        => $onoff_test, 
-	 description => '',
+	 description => 'Draw border around plot',
 	 edit_type   => 'on_off'
 	 },
      font         => {
@@ -304,7 +306,8 @@ sub start_plot {
 			$tagstack->[-1]);
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'Plot');
-	$result .= &edit_attributes($target,$token,\%plot_defaults);
+	$result .= &edit_attributes($target,$token,\%plot_defaults,
+				    \@plot_edit_order);
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%plot_defaults));
@@ -798,7 +801,7 @@ sub check_inputs {
     ## Make sure we have all the input we need:
     if (! %plot) { &set_defaults(\%plot,\%plot_defaults); }
     if (! %key ) {} # No key for this plot, thats okay
-    if (! %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($xlabel)) {} # No xlabel for this plot, thats okay
     if (! defined($ylabel)) {} # No ylabel for this plot, thats okay
@@ -818,9 +821,14 @@ sub check_inputs {
 
 #------------------------------------------------ make_edit
 sub edit_attributes {
-    my ($target,$token,$defaults) = @_;
-    my $result;
-    foreach my $attr (sort keys(%$defaults)) {
+    my ($target,$token,$defaults,$keys) = @_;
+    my ($result,@keys);
+    if ($keys && ref($keys) eq 'ARRAY') {
+        @keys = @$keys;
+    } else {
+	@keys = sort(keys(%$defaults));
+    }
+    foreach my $attr (@keys) {
 	if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
 	    $result .= &Apache::edit::text_arg(
                  $defaults->{$attr}->{'description'},
@@ -832,6 +840,12 @@ sub edit_attributes {
 		 $attr,
 		 $defaults->{$attr}->{'choices'},
 		 $token);
+	} elsif ($defaults->{$attr}->{'edit_type'} eq 'on_off') {
+	    $result .= &Apache::edit::select_arg(
+		 $defaults->{$attr}->{'description'},
+		 $attr,
+		 ['on','off'],
+		 $token);
 	}
 	$result .= '<br />';
     }