--- loncom/xml/lonplot.pm	2002/01/11 16:34:06	1.39
+++ loncom/xml/lonplot.pm	2002/01/30 13:27:51	1.46
@@ -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.46 2002/01/30 13:27:51 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;
@@ -154,19 +149,19 @@ my %plot_defaults =
 	 default     => 'off',
 	 test        => $onoff_test, 
 	 description => 'Transparent image',
-	 edit_type   => 'on_off'
+	 edit_type   => 'onoff'
 	 },
      grid         => {
 	 default     => 'off',
 	 test        => $onoff_test, 
 	 description => 'Display grid',
-	 edit_type   => 'on_off'
+	 edit_type   => 'onoff'
 	 },
      border       => {
 	 default     => 'on',
 	 test        => $onoff_test, 
 	 description => 'Draw border around plot',
-	 edit_type   => 'on_off'
+	 edit_type   => 'onoff'
 	 },
      font         => {
 	 default     => 'medium',
@@ -197,7 +192,7 @@ my %key_defaults =
 	 default => 'off',
 	 test => $onoff_test,
 	 description => 'Draw a box around the key?',
-	 edit_type   => 'on_off'
+	 edit_type   => 'onoff'
 	 },
      pos   => { 
 	 default => 'top right', 
@@ -234,6 +229,45 @@ my %label_defaults =
      }
      );
 
+my @tic_edit_order = ('location','mirror','start','increment','end');
+my %tic_defaults =
+    (
+     location => {
+	 default => 'border', 
+	 test => sub {$_[0]=~/^(border|axis)$/},
+	 description => 'Location of tick marks',
+	 edit_type   => 'choice',
+	 choices     => ['border','axis']
+	 },
+     mirror => {
+	 default => 'on', 
+	 test => $onoff_test,
+	 description => 'mirror ticks on opposite axis?',
+	 edit_type   => 'onoff'
+	 },
+     start => {
+	 default => '-10.0',
+	 test => $real_test,
+	 description => 'Start ticks at',
+	 edit_type   => 'entry',
+	 size        => '10'
+	 },
+     increment => {
+	 default => '1.0',
+	 test => $real_test,
+	 description => 'Place a tick every',
+	 edit_type   => 'entry',
+	 size        => '10'
+	 },
+     end => {
+	 default => ' 10.0',
+	 test => $real_test,
+	 description => 'Stop ticks at ',
+	 edit_type   => 'entry',
+	 size        => '10'
+	 },
+     );
+
 my %axis_defaults = 
     (
      color   => {
@@ -303,17 +337,19 @@ my %curve_defaults =
 ##                    parsing and edit rendering                 ##
 ##                                                               ##
 ###################################################################
-my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves);
+my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
 
 sub start_plot {
     %plot    = ();      %key     = ();      %axis   = (); 
     $title   = undef;   $xlabel  = undef;   $ylabel = undef;
     $#labels = -1;      $#curves = -1;
+    %xtics    = ();      %ytics    = ();
     #
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     &Apache::lonxml::register('Apache::lonplot',
-	     ('title','xlabel','ylabel','key','axis','label','curve'));
+	     ('title','xlabel','ylabel','key','axis','label','curve',
+	      'xtics','ytics'));
     push (@Apache::lonxml::namespace,'lonplot');
     if ($target eq 'web') {
 	my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
@@ -350,9 +386,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" 
@@ -367,6 +401,70 @@ ENDIMAGE
     return $result;
 }
 
+
+##--------------------------------------------------------------- xtics
+sub start_xtics {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result='';
+    if ($target eq 'web') {
+	&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
+    } elsif ($target eq 'edit') {
+	$result .= &Apache::edit::tag_start($target,$token,'xtics');
+	$result .= &edit_attributes($target,$token,\%tic_defaults,
+				    \@tic_edit_order);
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys(%tic_defaults));
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	}
+    }
+    return $result;
+}
+
+sub end_xtics {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web') {
+    } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_end($target,$token);
+    }
+    return $result;
+}
+
+##--------------------------------------------------------------- ytics
+sub start_ytics {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result='';
+    if ($target eq 'web') {
+	&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
+    } elsif ($target eq 'edit') {
+	$result .= &Apache::edit::tag_start($target,$token,'ytics');
+	$result .= &edit_attributes($target,$token,\%tic_defaults,
+				    \@tic_edit_order);
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args
+	    ($token,$parstack,$safeeval,keys(%tic_defaults));
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	}
+    }
+    return $result;
+}
+
+sub end_ytics {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web') {
+    } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_end($target,$token);
+    }
+    return $result;
+}
+
+
 ##----------------------------------------------------------------- key
 sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -382,7 +480,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 +512,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 +544,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 +577,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 +613,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 +687,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 +716,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 +762,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 +794,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 +845,10 @@ sub get_attributes{
     }
     return ;
 }
+
 ##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {
+    my ($tmpdir,$filename)= @_;
     my $gnuplot_input = '';
     my $curve;
     # Collect all the colors
@@ -763,16 +867,34 @@ sub write_gnuplot_file {
     $gnuplot_input .= $plot{'font'} . ' ';
     $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
     $gnuplot_input .= "@Colors\n";
+    # set output
+    $gnuplot_input .= "set output\n";
     # grid
     $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
     # border
     $gnuplot_input .= ($plot{'border'} eq 'on'?
 		       'set border'.$/           :
 		       'set noborder'.$/         );    # title, xlabel, ylabel
-    $gnuplot_input .= "set output\n";
+    # titles
     $gnuplot_input .= "set title  \"$title\"\n"  if (defined($title)) ;
     $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
     $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
+    # tics
+    if (%xtics) {    
+	$gnuplot_input .= "set xtics $xtics{'location'} ";
+	$gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
+	$gnuplot_input .= "$xtics{'start'}, ";
+	$gnuplot_input .= "$xtics{'increment'}, ";
+	$gnuplot_input .= "$xtics{'end'}\n";
+    }
+    if (%ytics) {    
+	$gnuplot_input .= "set ytics $ytics{'location'} ";
+	$gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
+	$gnuplot_input .= "$ytics{'start'}, ";
+	$gnuplot_input .= "$ytics{'increment'}, ";
+        $gnuplot_input .= "$ytics{'end'}\n";
+    }
+    # axis
     if (%axis) {
 	$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
 	$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
@@ -781,7 +903,7 @@ sub write_gnuplot_file {
     if (%key) {
 	$gnuplot_input .= 'set key '.$key{'pos'}.' ';
 	if ($key{'title'} ne '') {
-	    $gnuplot_input .= 'title "'.$key{'title'}.'" ';
+	    $gnuplot_input .= 'title " '.$key{'title'}.'" ';
 	} 
 	$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
     } else {
@@ -795,7 +917,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 +926,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 +941,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
@@ -868,7 +1002,7 @@ sub edit_attributes {
 	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
 	    $result .= &Apache::edit::select_arg
 		($description,$attr,$defaults->{$attr}->{'choices'},$token);
-	} elsif ($defaults->{$attr}->{'edit_type'} eq 'on_off') {
+	} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {
 	    $result .= &Apache::edit::select_arg
 		($description,$attr,['on','off'],$token);
 	}
@@ -894,20 +1028,46 @@ sub insert_plot {
     }
     $result .= ">\n";
     # Add the components
-    $result .= &insert_key();
-    $result .= &insert_axis();
-    $result .= &insert_title();    
-    $result .= &insert_xlabel();    
-    $result .= &insert_ylabel();    
+    # $result .= &insert_key();
+    # $result .= &insert_axis();
+    # $result .= &insert_title();    
+    # $result .= &insert_xlabel();    
+    # $result .= &insert_ylabel();    
     $result .= &insert_curve();
     # close up the <plot>
     $result .= "</plot>\n";
     return $result;
 }
 
+sub insert_tics {
+    my $result;
+    $result .= &insert_xtics() . &insert_ytics;
+    return $result;
+}
+
+sub insert_xtics {
+    my $result;
+    $result .= "\n    <xtics ";
+    foreach my $attr (keys(%tic_defaults)) {
+	$result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" ";
+    }
+    $result .= "/>\n";
+    return $result;
+}
+
+sub insert_ytics {
+    my $result;
+    $result .= "\n    <ytics ";
+    foreach my $attr (keys(%tic_defaults)) {
+	$result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" ";
+    }
+    $result .= "/>\n";
+    return $result;
+}
+
 sub insert_key {
     my $result;
-    $result .= "    <key \n";
+    $result .= "\n    <key \n";
     foreach my $attr (keys(%key_defaults)) {
 	$result .= "         $attr=\"$key_defaults{$attr}->{'default'}\"\n";
     }
@@ -917,7 +1077,7 @@ sub insert_key {
 
 sub insert_axis{
     my $result;
-    $result .= '    <axis ';
+    $result .= "\n    <axis ";
    foreach my $attr (keys(%axis_defaults)) {
 	$result .= "         $attr=\"$axis_defaults{$attr}->{'default'}\"\n";
     }
@@ -925,13 +1085,13 @@ sub insert_axis{
     return $result;
 }
 
-sub insert_title { return "    <title></title>\n"; }
-sub insert_xlabel { return "    <xlabel></xlabel>\n"; }
-sub insert_ylabel { return "    <ylabel></ylabel>\n"; }
+sub insert_title { return "\n    <title></title>\n"; }
+sub insert_xlabel { return "\n    <xlabel></xlabel>\n"; }
+sub insert_ylabel { return "\n    <ylabel></ylabel>\n"; }
 
 sub insert_label {
     my $result;
-    $result .= '    <label ';
+    $result .= "\n    <label ";
     foreach my $attr (keys(%label_defaults)) {
 	$result .= '         '.$attr.'="'.
 	    $label_defaults{$attr}->{'default'}."\"\n";
@@ -942,12 +1102,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 {