--- loncom/xml/lonplot.pm	2002/01/11 16:34:06	1.39
+++ loncom/xml/lonplot.pm	2002/01/21 16:41:31	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.39 2002/01/11 16:34:06 matthew Exp $
+# $Id: lonplot.pm,v 1.42 2002/01/21 16:41:31 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,13 +29,8 @@
 # 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 01/04 01/07 01/08 01/09 Matthew
+# 01/21 Matthew
 
-# Current issues
-#   1. Gnuplot is unable to vary the color or linestyle of <data> plots.
-#      The key does not know this so it is misleading for the user.
-#      Multiple <function>s can be plotted with varying line styles and
-#      colors.
-#
 package Apache::lonplot;
 
 use strict;
@@ -350,9 +345,7 @@ sub end_plot {
 	my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
 	    '_'.time.'_'.$$.int(rand(1000)).'_plot.data';
 	## Write the plot description to the file
-	my $fh=Apache::File->new(">$tmpdir$filename");
-	print $fh &write_gnuplot_file();
-	close($fh);
+	&write_gnuplot_file($tmpdir,$filename);
 	## return image tag for the plot
 	$result .= <<"ENDIMAGE";
 <img src    = "/cgi-bin/plot.gif?$filename" 
@@ -382,7 +375,6 @@ sub start_key {
 	    ($token,$parstack,$safeeval,keys(%key_defaults));
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.= &Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -415,6 +407,7 @@ sub start_title {
 	    &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/title");
+	$result.=&Apache::edit::rebuild_tag($token);
 	$result.=&Apache::edit::modifiedfield($token);
     }
     return $result;
@@ -446,6 +439,7 @@ sub start_xlabel {
 	    &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/xlabel");
+	$result.=&Apache::edit::rebuild_tag($token);	
 	$result.=&Apache::edit::modifiedfield($token);
     }
     return $result;
@@ -478,6 +472,7 @@ sub start_ylabel {
 	    &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/ylabel");
+	$result.=&Apache::edit::rebuild_tag($token);
 	$result.=&Apache::edit::modifiedfield($token);
     }
     return $result;
@@ -513,12 +508,9 @@ sub start_label {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {
-	my $constructtag=&Apache::edit::get_new_args
+	&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%label_defaults));
-	if ($constructtag) {
-	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.= &Apache::edit::handle_insert();
-	}
+	$result.=&Apache::edit::rebuild_tag($token);
 	my $text=$$parser[-1]->get_text("/label");
 	$result.=&Apache::edit::modifiedfield($token);
     }
@@ -590,7 +582,7 @@ sub start_function {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {
-	# Why do I do this?
+	$result.=&Apache::edit::rebuild_tag($token);
 	my $text=$$parser[-1]->get_text("/function");
 	$result.=&Apache::edit::modifiedfield($token);
     }
@@ -619,6 +611,11 @@ sub start_data {
 	    delete($curves[-1]->{'function'});
 	}
 	my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
+	# Deal with cases where we're given an array...
+	if ($datatext =~ /^\@/) {
+	    $datatext = &Apache::run::run('return "'.$datatext.'"',
+					  $safeeval,1);
+	}
 	$datatext =~ s/\s+/ /g;  
 	# Need to do some error checking on the @data array - 
 	# make sure it's all numbers and make sure each array 
@@ -660,6 +657,7 @@ sub start_data {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {
+	$result.=&Apache::edit::rebuild_tag($token);
 	my $text=$$parser[-1]->get_text("/data");
 	$result.=&Apache::edit::modifiedfield($token);
     }
@@ -691,7 +689,6 @@ sub start_axis {
 	    ($token,$parstack,$safeeval,keys(%axis_defaults));
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.= &Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -743,8 +740,10 @@ sub get_attributes{
     }
     return ;
 }
+
 ##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {
+    my ($tmpdir,$filename)= @_;
     my $gnuplot_input = '';
     my $curve;
     # Collect all the colors
@@ -795,7 +794,6 @@ sub write_gnuplot_file {
     }
     # curves
     $gnuplot_input .= 'plot ';
-    my $datatext = '';
     for (my $i = 0;$i<=$#curves;$i++) {
 	$curve = $curves[$i];
 	$gnuplot_input.= ', ' if ($i > 0);
@@ -805,9 +803,12 @@ sub write_gnuplot_file {
 		$curve->{'name'}.'" with '.
 		$curve->{'linestyle'};
 	} elsif (exists($curve->{'data'})) {
-	    $gnuplot_input.= '\'-\' title "'.
-		$curve->{'name'}.'" with '.
-		$curve->{'linestyle'};
+	    # Store data values in $datatext
+	    my $datatext = '';
+	    #   get new filename
+	    my $datafilename = "$tmpdir/$filename.$i";
+	    my $fh=Apache::File->new(">$datafilename");
+	    # Compile data
 	    my @Data = @{$curve->{'data'}};
 	    my @Data0 = @{$Data[0]};
 	    for (my $i =0; $i<=$#Data0; $i++) {
@@ -817,11 +818,21 @@ sub write_gnuplot_file {
 		}
 		$datatext .= $/;
 	    }
-	    $datatext .=$/;
+	    #   write file
+	    print $fh $datatext;
+	    close ($fh);
+	    #   generate gnuplot text
+	    $gnuplot_input.= '"'.$datafilename.'" title "'.
+		$curve->{'name'}.'" with '.
+		$curve->{'linestyle'};
 	}
     }
-    $gnuplot_input .= $/.$datatext;
-    return $gnuplot_input;
+    # Write the output to a file.
+    my $fh=Apache::File->new(">$tmpdir$filename");
+    print $fh $gnuplot_input;
+    close($fh);
+    # That's all folks.
+    return ;
 }
 
 #---------------------------------------------- check_inputs
@@ -942,12 +953,13 @@ sub insert_label {
 
 sub insert_curve {
     my $result;
-    $result .= '    <curve ';
+    $result .= "\n    <curve ";
     foreach my $attr (keys(%curve_defaults)) {
 	$result .= '         '.$attr.'="'.
 	    $curve_defaults{$attr}->{'default'}."\"\n";
     }
-    $result .= "    ></curve>\n";
+    $result .= "    >\n";
+    $result .= &insert_data().&insert_data()."</curve>\n";
 }
 
 sub insert_function {