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.145 and 1.149

-version 1.145, 2008/06/03 10:49:00
+version 1.149, 2008/11/24 17:17:52
  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 757  sub get_font {
+ Line 764  sub get_font {
  	$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
      }
      if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
+ #	$selected_font = $font_properties{'classic'};
  	$size = $Apache::lonplot::plot{'texfont'};
      }
      return ($size, $selected_font);
- Line 1361  sub start_function {
+ Line 1369  sub start_function {
          my $function = &Apache::lonxml::get_all_text("/function",$parser,
  						     $style);
  	$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
+         $function=~s/\^/\*\*/gs;
  	$curves[-1]->{'function'} = $function;
      } elsif ($target eq 'edit') {
  	$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
- Line 1675  sub write_gnuplot_file {
+ Line 1684  sub write_gnuplot_file {
  	$gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
  	$gnuplot_input .= "$xtics{'start'}, ";
  	$gnuplot_input .= "$xtics{'increment'}, ";
- 	$gnuplot_input .= "$xtics{'end'}\n";
+ 	$gnuplot_input .= "$xtics{'end'} ";
+ 	if ($target eq 'tex') {
+ 	    $gnuplot_input .= 'font "Helvetica,22"';     # Needed in iso 8859-1 enc.
+ 	}
+ 	$gnuplot_input .= "\n";
          if ($xtics{'minorfreq'} != 0) {
              $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
          }
+     } else {
+ 	if ($target eq 'tex') {
+ 	    $gnuplot_input .= 'set xtics font "Helvetica,22"'."\n"; # needed in iso 8859-1 enc
+ 	}
      }
      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";
+         $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";
          }
+     } else {
+ 	if ($target eq 'tex') {
+ 	    $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.
+ 	}
      }
      # axis
      if (%axis) {
- Line 1998  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.145
changed lines
	Added in v.1.149