loncom/xml/lonplot.pm - diff

Return to lonplot.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.147 and 1.151

-version 1.147, 2008/06/10 12:48:30
+version 1.151, 2009/01/30 03:20:10
  Line 26
  # http://www.lon-capa.org/
  #
  package Apache::lonplot;
  use strict;
- Line 57  BEGIN {
+ Line 60  BEGIN {
  }
+ =pod
  ##
  ## Description of data structures:
  ##
- Line 88  BEGIN {
+ Line 93  BEGIN {
  ##                                                               ##
  ###################################################################
+ =cut
  my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                           # is longer than this, it will be truncated.
- Line 496  my %axis_defaults =
+ Line 503  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'],
           },
- Line 1433  sub start_data {
+ Line 1440  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');
- Line 1696  sub write_gnuplot_file {
+ Line 1703  sub write_gnuplot_file {
  	$gnuplot_input .= "$ytics{'start'}, ";
  	$gnuplot_input .= "$ytics{'increment'}, ";
          $gnuplot_input .= "$ytics{'end'} ";
+         if ($target eq 'tex') {
+             $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding.
+         }
+         $gnuplot_input .= "\n";
          if ($ytics{'minorfreq'} != 0) {
              $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
          }
- 	if ($target eq 'tex') {
- 	    $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding.
- 	}
- 	$gnuplot_input .= "\n";
      } else {
  	if ($target eq 'tex') {
  	    $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.
- Line 2017  sub insert_data {
+ Line 2023  sub insert_data {
  __END__
+ =head1 NAME
+ Apache::lonplot.pm
+ =head1 SYNOPSIS
+ XML-based plotter of graphs
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 SUBROUTINES (parsing and edit rendering)
+ =over
+ =item start_gnuplot()
+ =item end_gnuplot()
+ =item start_xtics()
+ =item end_xtics()
+ =item start_ytics()
+ =item end_ytics()
+ =item get_font()
+ =item start_key()
+ =item end_key()
+ =item parse_label()
+ =item replace_entities()
+ =item start_title()
+ =item end_title()
+ =item start_xlabel()
+ =item end_xlabel()
+ =item start_ylabel()
+ =item end_label()
+ =item start_curve()
+ =item end_curve()
+ =item start_function()
+ =item end_function()
+ =item start_data()
+ =item end_data()
+ =item start_axis()
+ =item end_axis
+ =back
+ =head1 SUBROUTINES (Utility)
+ =over
+ =item set_defaults()
+ =item get_attributes()
+ =item write_gnuplot_file()
+ =item check_inputs()
+ =item edit_attributes()
+ =back
+ =head1 SUBROUTINES (Insertion functions for editing plots)
+ =over
+ =item insert_gnuplot()
+ =item insert_tics()
+ =item insert_xtics()
+ =item insert_key()
+ =item insert_axis()
+ =item insert_title()
+ =item insert_xlabel()
+ =item insert_ylabel()
+ =item insert_label()
+ =item insert_curve()
+ =item insert_function()
+ =item insert_data()
+ =back
+ =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.147
changed lines
	Added in v.1.151