[LON-CAPA-cvs] cvs: loncom /xml lonplot.pm

[raeburn]

raeburn		Wed Dec  5 19:30:29 2012 EDT

  Modified files:              
    /loncom/xml	lonplot.pm 
  Log:
  - Re-instate support for printing of multiple curves on a single plot,
    following changes (rev 1.156) to address bug 6588.
  - Setting of $style_command delayed until after values have been retrieved 
    for $pointtype and $pointsize.
  
  
Index: loncom/xml/lonplot.pm
diff -u loncom/xml/lonplot.pm:1.169 loncom/xml/lonplot.pm:1.170
--- loncom/xml/lonplot.pm:1.169	Wed Dec  5 01:04:03 2012
+++ loncom/xml/lonplot.pm	Wed Dec  5 19:30:28 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.169 2012/12/05 01:04:03 raeburn Exp $
+# $Id: lonplot.pm,v 1.170 2012/12/05 19:30:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1984,24 +1984,23 @@
     #
     my $linestyle_index = 50;
     my $line_width   = '';
+    my $plots;
 
     # If arrows are needed there will be an arrow style for each as well:
     #
 
     my $arrow_style_index = 50;
 
-    my $plot_command;
-    my $plot_type;
-
     for (my $i = 0;$i<=$#curves;$i++) {
 	$curve = $curves[$i];
-	$plot_command.= ', ' if ($i > 0);
+	my $plot_command;
+	my $plot_type = ', ' if ($i > 0);
 	if ($target eq 'tex') {
 	    $curve->{'linewidth'} *= 2;
 	}
 	$line_width = $curve->{'linewidth'};
 	if (exists($curve->{'function'})) {
-	    $plot_type    = 
+	    $plot_type  .= 
 		$curve->{'function'}.' title "'.
 		$curve->{'name'}.'" with '.
                 $curve->{'linestyle'};
@@ -2025,7 +2024,7 @@
 	    print $fh $datatext;
 	    close($fh);
 	    #   generate gnuplot text
-	    $plot_type = '"'.$datafilename.'" title "'.
+	    $plot_type .= '"'.$datafilename.'" title "'.
 		$curve->{'name'}.'" with '.
 		$curve->{'linestyle'};
 	}
@@ -2047,10 +2046,6 @@
 	my $color = $curve->{'color'};
 	$color =~ s/^x/#/;	        # Convert xhex color -> #hex color.   
 
-	my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n";
-	$gnuplot_input .= $style_command;
-
-
 
 	if (($curve->{'linestyle'} eq 'points')      ||
 	    ($curve->{'linestyle'} eq 'linespoints') ||
@@ -2081,8 +2076,8 @@
 	    $arrow_style_index++;
 	}
 
-
-
+        my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n";
+        $gnuplot_input .= $style_command;
 
 	# The condition below is because gnuplot lumps the linestyle in with the 
 	# arrowstyle _sigh_.
@@ -2091,9 +2086,10 @@
 	    $plot_command.= " ls $linestyle_index";
 	}
 
-	$gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n";
+	$plots .= $plot_type . ' ' . $plot_command;
 	$linestyle_index++;	# Each curve get a unique linestyle.
     }
+    $gnuplot_input .= 'plot '.$plots;
     # Write the output to a file.
 
     # &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input.