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

Diff for /loncom/xml/lonplot.pm between versions 1.114 and 1.115

version 1.114, 2006/09/06 19:26:15 version 1.115, 2007/02/21 20:34:58
Line 128  my $words_test     = sub {$_[0]=~s/\s+/ Line 128  my $words_test     = sub {$_[0]=~s/\s+/
 ###################################################################  ###################################################################
 my @gnuplot_edit_order =   my @gnuplot_edit_order = 
     qw/alttag bgcolor fgcolor height width font transparent grid samples       qw/alttag bgcolor fgcolor height width font transparent grid samples 
     border align texwidth texfont plotcolor plottype lmargin rmargin tmargin      border align texwidth texfont plotcolor plottype gridtype lmargin rmargin
     bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle      tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
     pattern solid/;      pattern solid/;
   
 my $margin_choices = ['default',0..20];  my $margin_choices = ['default',0..20];
Line 272  my %gnuplot_defaults = Line 272  my %gnuplot_defaults =
  edit_type   => 'choice',   edit_type   => 'choice',
          choices     => ['Cartesian','Polar']           choices     => ['Cartesian','Polar']
          },           },
        gridtype     => {
    default     => 'Cartesian',
    test        => sub {$_[0]=~/^(Polar|Cartesian)$/},
    description => 'Grid type:',
    edit_type   => 'choice',
            choices     => ['Cartesian','Polar']
            },
      lmargin      => {       lmargin      => {
  default     => 'default',   default     => 'default',
  test        => sub {$_[0]=~/^(default|\d+)$/},   test        => sub {$_[0]=~/^(default|\d+)$/},
Line 1113  sub write_gnuplot_file { Line 1120  sub write_gnuplot_file {
  $gnuplot_input .= "set output \"/home/httpd/perl/tmp/".   $gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
     &unescape($filename).".eps\"\n";      &unescape($filename).".eps\"\n";
     }      }
     # cartesian or polar?      # cartesian or polar plot?
     if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {      if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
         $gnuplot_input .= 'set polar'.$/;          $gnuplot_input .= 'set polar'.$/;
     } else {      } else {
         # Assume Cartesian          # Assume Cartesian
     }      }
       # cartesian or polar grid?
       if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') {
           $gnuplot_input .= 'set grid polar'.$/;
       } else {
           # Assume Cartesian
       }
     # solid or pattern for boxes?      # solid or pattern for boxes?
     if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') {      if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') {
         $gnuplot_input .= 'set style fill solid '.          $gnuplot_input .= 'set style fill solid '.
Removed from v.1.114  
changed lines
  Added in v.1.115

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