--- loncom/xml/lonplot.pm	2008/11/24 17:17:52	1.149
+++ loncom/xml/lonplot.pm	2012/07/04 11:06:57	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.149 2008/11/24 17:17:52 jms Exp $
+# $Id: lonplot.pm,v 1.157 2012/07/04 11:06:57 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,11 +98,16 @@ BEGIN {
 my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                          # is longer than this, it will be truncated.
 
-my %linetypes =
+my %linetypes =			# For png use these linetypes.
     (
      solid          => 1,
      dashed         => 0
     );
+my %ps_linetypes = 		# For ps the line types are different!
+   (
+    solid          => 0,
+    dashed         => 7
+   );
 
 my %linestyles = 
     (
@@ -176,14 +181,16 @@ my %gnuplot_defaults =
 	 test        => $color_test, 
 	 description => 'Background color of image (xffffff)',
 	 edit_type   => 'entry',
-	 size        => '10'
+	 size        => '10',
+         class       => 'colorchooser'
 	 },
      fgcolor      => {
 	 default     => 'x000000',
 	 test        => $color_test,
 	 description => 'Foreground color of image (x000000)',
 	 edit_type   => 'entry',
-	 size        => '10'
+	 size        => '10',
+         class       => 'colorchooser'
 	 },
      transparent  => {
 	 default     => 'off',
@@ -455,7 +462,7 @@ my %tic_defaults =
 	 },         
      );
 
-my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat');
+my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero');
 my %axis_defaults = 
     (
      color   => {
@@ -463,7 +470,8 @@ my %axis_defaults =
 	 test => $color_test,
 	 description => 'Color of grid lines (x000000)',
 	 edit_type   => 'entry',
-	 size        => '10'
+	 size        => '10',
+         class       => 'colorchooser'
 	 },
      xmin      => {
 	 default => '-10.0',
@@ -503,11 +511,26 @@ my %axis_defaults =
      yformat      => {
          default     => 'on',
          test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
-         description => 'X-axis number formatting',
+         description => 'Y-axis number formatting',
          edit_type   => 'choice',
          choices     => ['on', 'off', '2e', '2f'],
          },
-
+     
+     xzero => {
+     	default => 'off',
+     	test	=> sub {$_[0]=~/^(off|line|thick-line|dotted)$/},
+     	description => 'Show x-zero (y=0) axis',
+     	edit_type  => 'choice',
+     	choices	=> ['off', 'line', 'thick-line', 'dotted'],
+     	},
+     
+     yzero => {
+     	default => 'off',
+     	test	=> sub {$_[0]=~/^(off|line|thick-line|dotted)$/},
+     	description => 'Show y-zero (x=0) axis',
+     	edit_type  => 'choice',
+     	choices	=> ['off', 'line', 'thick-line', 'dotted'],
+     	},
      );
 
 my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
@@ -519,7 +542,8 @@ my %curve_defaults =
 	 test => $color_test,
 	 description => 'Color of curve (x000000)',
 	 edit_type   => 'entry',
-	 size        => '10'
+	 size        => '10',
+	 class       => 'colorchooser'
 	 },
      name      => {
 	 default => '',
@@ -605,7 +629,18 @@ sub start_gnuplot {
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%gnuplot_defaults));
+
 	if ($constructtag) {
+	    #
+	    # The color chooser does not prepent x to the color values
+	    # Do that here:
+	    #
+	    foreach my $attribute ('bgcolor', 'fgcolor') {
+		my $value = $token->[2]{$attribute};
+		if (defined $value && !($value =~ /^x/)) {
+		    $token->[2]{$attribute} = 'x' . $value;
+		}
+	    }
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
     }
@@ -619,6 +654,8 @@ sub end_gnuplot {
 	('title','xlabel','ylabel','key','axis','label','curve'));
     my $result = '';
     my $randnumber;
+    my $tmpdir =LONCAPA::tempdir(); # Where temporary files live:
+
     # need to call rand everytime start_script would evaluate, as the
     # safe space rand number generator and the global rand generator 
     # are not separate
@@ -630,7 +667,6 @@ sub end_gnuplot {
 	&check_inputs(); # Make sure we have all the data we need
 	##
 	## Determine filename
-	my $tmpdir = '/home/httpd/perl/tmp/';
 	my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
 	    '_'.time.'_'.$$.$randnumber.'_plot';
 	## Write the plot description to the file
@@ -651,7 +687,7 @@ ENDIMAGE
 	    #might be inside the safe space, register the URL for later
 	    &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
 	    $result  = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";
-	    $result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";
+	    $result .= '\graphicspath{{'.$tmpdir.'}}'."\n";
 	    $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';
 	}
     } elsif ($target eq 'edit') {
@@ -1335,6 +1371,13 @@ sub start_curve {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%curve_defaults));
 	if ($constructtag) {
+	    #
+	    # Fix up the color attribute as jcolor does not prepend an x
+	    #
+	    my $value = $token->[2]{'color'};
+	    if (defined $value && !($value =~ /^x/)) {
+		$token->[2]{'color'} = 'x' . $value;
+	    }
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
     }
@@ -1440,7 +1483,7 @@ sub start_data {
 	}
 	# complain if the number of data points is not the same as
 	# in previous sets of data.
-	if (($curves[-1]->{'data'}) && ($#data != $#{@{$curves[-1]->{'data'}->[0]}})){
+	if (($curves[-1]->{'data'}) && ($#data != $#{$curves[-1]->{'data'}->[0]})){
 	    &Apache::lonxml::warning
 		('Number of data points is not consistent with previous '.
 		 'number of data points');
@@ -1481,7 +1524,17 @@ sub start_axis {
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%axis_defaults));
+
 	if ($constructtag) {
+	    #
+	    #  Fix up the color attribute since jchooser does not
+	    #  prepend an x to the color:
+	    #
+	    my $value = $token->[2]{'color'};
+	    if (defined $value && !($value =~ /^x/)) {
+		$token->[2]{'color'} = 'x' . $value;
+	    }
+
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
     }
@@ -1574,6 +1627,7 @@ sub write_gnuplot_file {
 		       $curve->{'color'}       : 
 		       $Apache::lonplot::plot{'fgcolor'}        );
     }
+    
     # set term
     if ($target eq 'web') {
 	$gnuplot_input .= 'set terminal png enhanced nocrop ';
@@ -1586,7 +1640,7 @@ sub write_gnuplot_file {
 	# set output
 	$gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {
-	$gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid ";
+	$gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} dash ";
 	if (!$font_properties->{'tex_no_file'}) {
 	    $gnuplot_input .=
 		'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
@@ -1594,7 +1648,7 @@ sub write_gnuplot_file {
 	}
 	$gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';
 	$gnuplot_input .= $fontsize;
-	$gnuplot_input .= "\nset output \"/home/httpd/perl/tmp/".
+	$gnuplot_input .= "\nset output \"".$tmpdir.
 	    &unescape($filename).".eps\"\n";
 	$gnuplot_input .= "set encoding iso_8859_1\n"; # Get access to extended font.
 
@@ -1735,6 +1789,26 @@ sub write_gnuplot_file {
         }
 	$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
 	$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
+		if ($axis{'xzero'} ne 'off') {
+			$gnuplot_input .= "set xzeroaxis ";
+			if ($axis{'xzero'} eq 'line' || $axis{'xzero'} eq 'thick-line') {
+				$gnuplot_input .= "lt -1 ";
+				if ($axis{'xzero'} eq 'thick-line') {
+					$gnuplot_input .= "lw 3 ";
+				}
+			}
+			$gnuplot_input .= "\n";
+		}
+		if ($axis{'yzero'} ne 'off') {
+			$gnuplot_input .= "set yzeroaxis ";
+			if ($axis{'yzero'} eq 'line' || $axis{'yzero'} eq 'thick-line') {
+				$gnuplot_input .= "lt -1 ";
+				if ($axis{'yzero'} eq 'thick-line') {
+					$gnuplot_input .= "lw 3 ";
+				}
+			}
+			$gnuplot_input .= "\n";
+		}
     }
     # Key
     if (%key) {
@@ -1766,40 +1840,30 @@ sub write_gnuplot_file {
         $gnuplot_input .="\n";
     }
     # curves
-    $gnuplot_input .= 'plot ';
+    #
+    # Each curve will have its very own linestyle.
+    # (This should work just fine in web rendition I think).
+    #  The line_xxx variables will hold the elements of the line style.
+    #  type (solid/dashed), color, width
+    #
+    my $linestyle_index = 50;
+    my $line_width   = '';
+
+    my $plot_command;
+    my $plot_type;
+
     for (my $i = 0;$i<=$#curves;$i++) {
 	$curve = $curves[$i];
-	$gnuplot_input.= ', ' if ($i > 0);
+	$plot_command.= ', ' if ($i > 0);
 	if ($target eq 'tex') {
 	    $curve->{'linewidth'} *= 2;
 	}
+	$line_width = $curve->{'linewidth'};
 	if (exists($curve->{'function'})) {
-	    $gnuplot_input.= 
+	    $plot_type    = 
 		$curve->{'function'}.' title "'.
 		$curve->{'name'}.'" with '.
                 $curve->{'linestyle'};
-
-            if (($curve->{'linestyle'} eq 'points')      ||
-                ($curve->{'linestyle'} eq 'linespoints') ||
-                ($curve->{'linestyle'} eq 'errorbars')   ||
-                ($curve->{'linestyle'} eq 'xerrorbars')  ||
-                ($curve->{'linestyle'} eq 'yerrorbars')  ||
-                ($curve->{'linestyle'} eq 'xyerrorbars')) {
-                $gnuplot_input.=' pointtype '.$curve->{'pointtype'};
-                $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
-            } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
-                $gnuplot_input.= ' '.$curve->{'limit'};
-            } elsif ($curve->{'linetype'} ne '' &&
-                     $curve->{'linestyle'} eq 'lines') {
-                $gnuplot_input.= ' linetype ';
-                $gnuplot_input.= $linetypes{$curve->{'linetype'}};
-                $gnuplot_input.= ' linecolor rgb "';
-                # convert color from xaaaaaa to #aaaaaa
-                $curve->{'color'} =~ s/^x/#/;
-                $gnuplot_input.= $curve->{'color'}.'"';
-            }
-            $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
-
 	} elsif (exists($curve->{'data'})) {
 	    # Store data values in $datatext
 	    my $datatext = '';
@@ -1820,30 +1884,59 @@ sub write_gnuplot_file {
 	    print $fh $datatext;
 	    close($fh);
 	    #   generate gnuplot text
-	    $gnuplot_input.= '"'.$datafilename.'" title "'.
+	    $plot_type = '"'.$datafilename.'" title "'.
 		$curve->{'name'}.'" with '.
 		$curve->{'linestyle'};
-            if (($curve->{'linestyle'} eq 'points')      ||
-                ($curve->{'linestyle'} eq 'linespoints') ||
-                ($curve->{'linestyle'} eq 'errorbars')   ||
-                ($curve->{'linestyle'} eq 'xerrorbars')  ||
-                ($curve->{'linestyle'} eq 'yerrorbars')  ||
-                ($curve->{'linestyle'} eq 'xyerrorbars')) {
-                $gnuplot_input.=' pointtype '.$curve->{'pointtype'};
-                $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
-            } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
-                $gnuplot_input.= ' '.$curve->{'limit'};
-            } elsif ($curve->{'linetype'} ne '' &&
-                     $curve->{'linestyle'} eq 'lines') {
-                $gnuplot_input.= ' linetype ';
-                $gnuplot_input.= $linetypes{$curve->{'linetype'}};
-                $gnuplot_input.= ' linecolor rgb "';
-                # convert color from xaaaaaa to #aaaaaa
-                $curve->{'color'} =~ s/^x/#/;
-                $gnuplot_input.= $curve->{'color'}.'"';
-            }
-                $gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; 
 	}
+	my $pointtype = '';
+	my $pointsize = '';
+
+	if (($curve->{'linestyle'} eq 'points')      ||
+	    ($curve->{'linestyle'} eq 'linespoints') ||
+	    ($curve->{'linestyle'} eq 'errorbars')   ||
+	    ($curve->{'linestyle'} eq 'xerrorbars')  ||
+	    ($curve->{'linestyle'} eq 'yerrorbars')  ||
+	    ($curve->{'linestyle'} eq 'xyerrorbars')) {
+	    
+	    $pointtype =' pointtype '.$curve->{'pointtype'};
+	    $pointsize =' pointsize '.$curve->{'pointsize'};
+	} elsif ($curve->{'linestyle'} eq 'filledcurves') { 
+	    $plot_command.= ' '.$curve->{'limit'};
+	} 
+
+#elsif ($curve->{'linetype'} ne '' &&
+#		 $curve->{'linestyle'} eq 'lines') 
+#
+#
+#	    $plot_command.= ' linetype ';
+#	    $plot_command.= $linetypes{$curve->{'linetype'}};
+#	    $plot_command.= ' linecolor rgb "';
+#	    # convert color from xaaaaaa to #aaaaaa
+#	    $curve->{'color'} =~ s/^x/#/;
+#	    $plot_command.= $curve->{'color'}.'"';
+#	}
+
+	# Figure out the linestyle:
+
+	my $lt = $curve->{'linetype'} ne '' ? $curve->{'linetype'} 
+	                : 'solid';	# Line type defaults to solid.
+	# The mapping of lt -> the actual gnuplot line type depends on the target:
+
+	if ($target eq 'tex') {
+	    $lt = $ps_linetypes{$lt};
+	} else {
+	    $lt = $linetypes{$lt}
+	}
+
+	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;
+
+	$plot_command.= " ls $linestyle_index";
+	$gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n";
+	$linestyle_index++;	# Each curve get a unique linestyle.
     }
     # Write the output to a file.
     open (my $fh,">$tmpdir$filename.data");
@@ -1894,7 +1987,8 @@ sub edit_attributes {
 	if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
 	    $result .= &Apache::edit::text_arg
 		($description,$attr,$token,
-		 $defaults->{$attr}->{'size'});
+		 $defaults->{$attr}->{'size'},
+		$defaults->{$attr}->{'class'});
 	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
 	    $result .= &Apache::edit::select_or_text_arg
 		($description,$attr,$defaults->{$attr}->{'choices'},$token);