--- loncom/xml/lonplot.pm	2001/12/27 19:47:02	1.19
+++ loncom/xml/lonplot.pm	2001/12/27 22:30:01	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.19 2001/12/27 19:47:02 matthew Exp $
+# $Id: lonplot.pm,v 1.20 2001/12/27 22:30:01 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,13 +26,14 @@
 # http://www.lon-capa.org/
 #
 # 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 Matthew
+# 12/17 12/18 12/19 12/20 12/21 12/27 Matthew
 package Apache::lonplot;
 
 use strict;
 use Apache::File;
 use Apache::response;
 use Apache::lonxml;
+use Apache::edit;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::lonplot',('plot'));
@@ -76,52 +77,177 @@ my $sml_test       = sub {$_[0]=~/^(smal
 my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};
 my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w\(\)]+ ?)+$/};
 ##
-## Default values for attributes of elements
+## Attribute metadata
 ##
 my %plot_defaults = 
     (
-     height       => {default => 200,       test => $int_test   },
-     width        => {default => 200,       test => $int_test   },
-     bgcolor      => {default => 'xffffff', test => $color_test },
-     fgcolor      => {default => 'x000000', test => $color_test },
-     transparent  => {default => 'off',     test => $onoff_test },
-     grid         => {default => 'off',     test => $onoff_test },
-     border       => {default => 'on',      test => $onoff_test },
-     font         => {default => 'medium',  test => $sml_test   },
-     align        => {default => 'left',    test => 
-			  sub {$_[0]=~/^(left|right|center)$/} }
+     height       => {
+	 default     => 200,
+	 test        => $int_test,
+	 description => 'vertical size of image (pixels)',
+	 edit_type   => 'entry' 
+	 },
+     width        => {
+	 default     => 200,
+	 test        => $int_test,
+	 description => 'horizontal size of image (pixels)',
+	 edit_type   => 'entry'
+	 },
+     bgcolor      => {
+	 default     => 'xffffff',
+	 test        => $color_test, 
+	 description => 'background color of image (xffffff)',
+	 edit_type   => 'entry'
+	 },
+     fgcolor      => {
+	 default     => 'x000000',
+	 test        => $color_test,
+	 description => 'foreground color of image (x000000)',
+	 edit_type   => 'entry' 
+	 },
+     transparent  => {
+	 default     => 'off',
+	 test        => $onoff_test, 
+	 description => '',
+	 edit_type   => 'on_off'
+	 },
+     grid         => {
+	 default     => 'off',
+	 test        => $onoff_test, 
+	 description => '',
+	 edit_type   => 'on_off'
+	 },
+     border       => {
+	 default     => 'on',
+	 test        => $onoff_test, 
+	 description => '',
+	 edit_type   => 'on_off'
+	 },
+     font         => {
+	 default     => 'medium',
+	 test        => $sml_test,
+	 description => 'Size of font to use',
+	 edit_type   => 'choice',
+	 choices     => ['small','medium','large']
+	 },
+     align        => {
+	 default     => 'left',
+	 test        => sub {$_[0]=~/^(left|right|center)$/},
+	 description => 'alignment for image in html',
+	 edit_type   => 'choice',
+	 choices     => ['left','right','center']
+	 } 
      );
 
 my %key_defaults = 
     (
-     title => { default => '',          test => $words_test   },
-     box   => { default => 'off',       test => $onoff_test   },
-     pos   => { default => 'top right', test => $key_pos_test }
+     title => { 
+	 default => '',
+	 test => $words_test,
+	 description => 'Title of key',
+	 edit_type   => 'entry'
+	 },
+     box   => { 
+	 default => 'off',
+	 test => $onoff_test,
+	 description => 'Draw a box around the key?',
+	 edit_type   => 'on_off'
+	 },
+     pos   => { 
+	 default => 'top right', 
+	 test => $key_pos_test, 
+	 description => 'position of the key on the plot',
+	 edit_type   => 'choice',
+	 choices     => ['top left','top right','bottom left','bottom right',
+			 'outside','below']
+	 }
      );
 
 my %label_defaults = 
     (
-     xpos    => {default => 0,         test => $real_test     },
-     ypos    => {default => 0,         test => $real_test     },
-     justify => {default => 'left',    
-                 test => sub {$_[0]=~/^(left|right|center)$/} }
+     xpos    => {
+	 default => 0,
+	 test => $real_test,
+	 description => 'x position of label (graph coordinates)',
+	 edit_type   => 'entry'
+	 },
+     ypos    => {
+	 default => 0, 
+	 test => $real_test,
+	 description => 'y position of label (graph coordinates)',
+	 edit_type   => 'entry'
+	 },
+     justify => {
+	 default => 'left',    
+	 test => sub {$_[0]=~/^(left|right|center)$/},
+	 description => 'justification of the label text on the plot',
+	 edit_type   => 'choice',
+	 choices     => ['left','right','center']
+     }
      );
 
 my %axis_defaults = 
     (
-     color     => {default => 'x000000', test => $color_test},
-     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 },
-     linestyle => {default => 'points',  test => $linestyle_test}
+     color     => {
+	 default => 'x000000', 
+	 test => $color_test,
+	 description => 'color of axes (x000000)',
+	 edit_type   => 'entry'
+	 },
+     xmin      => {
+	 default => '-10.0',
+	 test => $real_test,
+	 description => 'minimum x-value shown in plot',
+	 edit_type   => 'entry'
+	 },
+     xmax      => {
+	 default => ' 10.0',
+	 test => $real_test,
+	 description => 'maximum x-value shown in plot',	 
+	 edit_type   => 'entry'
+	 },
+     ymin      => {
+	 default => '-10.0',
+	 test => $real_test,
+	 description => 'minimum y-value shown in plot',	 
+	 edit_type   => 'entry'
+	 },
+     ymax      => {
+	 default => ' 10.0',
+	 test => $real_test,
+	 description => 'maximum y-value shown in plot',	 
+	 edit_type   => 'entry'
+	 },
+     linestyle => {
+	 default => 'points',
+	 test => $linestyle_test,
+	 description => 'Style of the axis lines',
+	 edit_type   => 'choice',
+	 choices     => ['lines','linespoints','dots','points']
+	 }
      );
 
 my %curve_defaults = 
     (
-     color     => {default => 'x000000', test => $color_test     },
-     name      => {default => '',        test => $words_test     },
-     linestyle => {default => 'lines',   test => $linestyle_test }
+     color     => {
+	 default => 'x000000',
+	 test => $color_test,
+	 description => 'color of curve (x000000)',
+	 edit_type   => 'entry'
+	 },
+     name      => {
+	 default => '',
+	 test => $words_test,
+	 description => 'name of curve to appear in key',
+	 edit_type   => 'entry'
+	 },
+     linestyle => {
+	 default => 'lines',
+	 test => $linestyle_test,
+	 description => 'Style of the axis lines',
+	 edit_type   => 'choice',
+	 choices     => ['lines','linespoints','dots','points','steps']
+	 }
      );
 
 ##
@@ -147,6 +273,14 @@ sub start_plot {
 	##-------------------------------------------------------
 	&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
 			$tagstack->[-1]);
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys %plot_defaults);
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
     }
     return '';
 }
@@ -195,6 +329,8 @@ sub end_plot {
      align  = "$plot{'align'}"
      alt    = "/cgi-bin/plot.gif?$filename" />
 ENDIMAGE
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -206,7 +342,14 @@ sub start_key {
     if ($target eq 'web') {
 	&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
 		    $tagstack->[-1]);
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys %key_defaults);
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
     }
     return $result;
 }
@@ -215,7 +358,8 @@ sub end_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -225,7 +369,8 @@ sub start_title {
     my $result='';
     if ($target eq 'web') {
 	$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -234,7 +379,8 @@ sub end_title {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -244,7 +390,8 @@ sub start_xlabel {
     my $result='';
     if ($target eq 'web') {
 	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -253,7 +400,8 @@ sub end_xlabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -263,7 +411,8 @@ sub start_ylabel {
     my $result='';
     if ($target eq 'web') {
 	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -272,7 +421,8 @@ sub end_ylabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -290,8 +440,15 @@ sub start_label {
 	    $label{'text'} = 'Illegal text';
 	}
 	push(@labels,\%label);
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys %label_defaults);
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
     }
-    # This routine should never return anything.
     return $result;
 }
 
@@ -299,7 +456,8 @@ sub end_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -315,7 +473,14 @@ sub start_curve {
 	push (@curves,\%curve);
 	&Apache::lonxml::register('Apache::lonplot',('function','data'));
 	push (@Apache::lonxml::namespace,'curve');
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys %label_defaults);
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
     }
     return $result;
 }
@@ -326,7 +491,8 @@ sub end_curve {
     if ($target eq 'web') {
 	pop @Apache::lonxml::namespace;
 	&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -341,7 +507,16 @@ sub start_function {
 	}
 	$curves[-1]->{'function'} = 
 	    &Apache::lonxml::get_all_text("/function",$$parser[-1]);
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_start($target,$token);
+	my $text=&Apache::lonxml::get_all_text("/function",$$parser[-1]);
+	$result.='</td></tr><tr><td colspan="3">'.
+	    &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");
+	$result.=&Apache::edit::modifiedfield($token);
     }
     return $result;
 }
@@ -350,7 +525,8 @@ sub end_function {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -393,7 +569,8 @@ sub start_data {
 	    }
 	}
 	push  @{$curves[-1]->{'data'}},\@data;
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -402,7 +579,8 @@ sub end_data {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -414,7 +592,8 @@ sub start_axis {
     if ($target eq 'web') {
 	&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
 			$tagstack->[-1]);
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -423,7 +602,14 @@ sub end_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ($target eq 'web') {
-	# This routine should never return anything.
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys %axis_defaults);
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.= &Apache::edit::handle_insert();
+	}
     }
     return $result;
 }
@@ -542,11 +728,111 @@ sub write_gnuplot_file {
     $gnuplot_input .= $/.$datatext;
     return $gnuplot_input;
 }
+#------------------------------------------------ make_edit
+sub edit_attributes {
+    my $target    = shift;
+    my $token     = shift;
+    my $defaults  = shift;
+    my $result;
+    foreach my $attr (%{$token->[2]}) {
+	if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
+	    $result .= &Apache::edit::text_arg(
+                 $defaults->{$attr}->{'description'},
+		 $attr,
+		 $token);
+	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
+	    $result .= &Apache::edit::select_arg(
+		 $defaults->{$attr}->{'description'},
+		 $attr,
+		 $defaults->{$attr}->{'choices'},
+		 $token);
+	}
+    }
+    return $result;
+}
 
-1;
-__END__
+#------------------------------------------------ insert_xxxxxxx
+sub insert_plot {
+    my $result;
+    #  plot attributes
+    $result .= '<plot ';
+    foreach my $attr (%plot_defaults) {
+	$result .= '     '.$attr.' "'.$plot_defaults{$attr}->{'default'}.
+	    "\"\n";
+    }
+    $result .= ">\n";
+    # Add the components
+    $result .= &insert_key();
+    $result .= &insert_axis();
+    $result .= &insert_label();    
+    $result .= &insert_curve();
+    $result .= &insert_function();    
+    $result .= "</curve>\n";
+    $result .= &insert_curve();
+    $result .= &insert_data();    
+    $result .= "</curve>\n";
+    # close up the <plot>
+    $result .= "</plot>\n";
+    return $result;
+}
 
+sub insert_key {
+    my $result;
+    $result .= '    <key ';
+    foreach my $attr (%key_defaults) {
+	$result .= '         '.$attr.' "'.$key_defaults{$attr}->{'default'}.
+	    "\"\n";
+    }
+    $result .= "   />\n";
+    return $result;
+}
 
+sub insert_axis{
+    my $result;
+    $result .= '    <axis ';
+    foreach my $attr (%axis_defaults) {
+	$result .= '         '.$attr.' "'.$axis_defaults{$attr}->{'default'}.
+	    "\"\n";
+    }
+    $result .= "   />\n";
+    return $result;
+}
+
+sub insert_label {
+    my $result;
+    $result .= '    <label ';
+    foreach my $attr (%label_defaults) {
+	$result .= '         '.$attr.' "'.
+	    $label_defaults{$attr}->{'default'}."\"\n";
+    }
+    $result .= "   ></label>\n";
+    return $result;
+}
+
+sub insert_curve {
+    my $result;
+    $result .= '    <curve ';
+    foreach my $attr (%curve_defaults) {
+	$result .= '         '.$attr.' "'.
+	    $curve_defaults{$attr}->{'default'}."\"\n";
+    }
+    $result .= "    >\n";
+}
 
+sub insert_function {
+    my $result;
+    $result .= "<function></function>\n";
+    return $result;
+}
+
+sub insert_data {
+    my $result;
+    $result .= "     <data></data>\n";
+    $result .= "     <data></data>\n";
+    return $result;
+}
+
+1;
+__END__