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.146 and 1.153

-version 1.146, 2008/06/09 10:07:01
+version 1.153, 2011/07/04 09:25:13
  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 448  my %tic_defaults =
+ Line 455  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   => {
- 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'],
           },
+      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');
- Line 612  sub end_gnuplot {
+ Line 634  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
- Line 623  sub end_gnuplot {
+ Line 647  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
- Line 644  ENDIMAGE
+ Line 667  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') {
- Line 1362  sub start_function {
+ Line 1385  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 1432  sub start_data {
+ Line 1456  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 1586  sub write_gnuplot_file {
+ Line 1610  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.
- Line 1695  sub write_gnuplot_file {
+ Line 1719  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 1728  sub write_gnuplot_file {
+ Line 1751  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) {
- Line 2016  sub insert_data {
+ Line 2059  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.146
changed lines
	Added in v.1.153