[BACK]Return to lonplot.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.149 and 1.152

version 1.149, 2008/11/24 17:17:52 version 1.152, 2009/11/14 19:13:36
Line 455  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 =   my %axis_defaults = 
     (      (
      color   => {       color   => {
Line 503  my %axis_defaults = Line 503  my %axis_defaults =
      yformat      => {       yformat      => {
          default     => 'on',           default     => 'on',
          test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},           test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
          description => 'X-axis number formatting',           description => 'Y-axis number formatting',
          edit_type   => 'choice',           edit_type   => 'choice',
          choices     => ['on', 'off', '2e', '2f'],           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');  my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
Line 1440  sub start_data { Line 1455  sub start_data {
  }   }
  # complain if the number of data points is not the same as   # complain if the number of data points is not the same as
  # in previous sets of data.   # 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      &Apache::lonxml::warning
  ('Number of data points is not consistent with previous '.   ('Number of data points is not consistent with previous '.
  'number of data points');   'number of data points');
Line 1735  sub write_gnuplot_file { Line 1750  sub write_gnuplot_file {
         }          }
  $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";   $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
  $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\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      # Key
     if (%key) {      if (%key) {
Removed from v.1.149  
changed lines
  Added in v.1.152

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