[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.159

version 1.149, 2008/11/24 17:17:52 version 1.159, 2012/07/09 11:11:47
Line 98  BEGIN { Line 98  BEGIN {
 my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text  my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                          # is longer than this, it will be truncated.                           # is longer than this, it will be truncated.
   
 my %linetypes =  my %linetypes = # For png use these linetypes.
     (      (
      solid          => 1,       solid          => 1,
      dashed         => 0       dashed         => 0
     );      );
   my %ps_linetypes = # For ps the line types are different!
      (
       solid          => 0,
       dashed         => 7
      );
   
 my %linestyles =   my %linestyles = 
     (      (
Line 176  my %gnuplot_defaults = Line 181  my %gnuplot_defaults =
  test        => $color_test,    test        => $color_test, 
  description => 'Background color of image (xffffff)',   description => 'Background color of image (xffffff)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
            class       => 'colorchooser'
  },   },
      fgcolor      => {       fgcolor      => {
  default     => 'x000000',   default     => 'x000000',
  test        => $color_test,   test        => $color_test,
  description => 'Foreground color of image (x000000)',   description => 'Foreground color of image (x000000)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
            class       => 'colorchooser'
  },   },
      transparent  => {       transparent  => {
  default     => 'off',   default     => 'off',
Line 455  my %tic_defaults = Line 462  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 463  my %axis_defaults = Line 470  my %axis_defaults =
  test => $color_test,   test => $color_test,
  description => 'Color of grid lines (x000000)',   description => 'Color of grid lines (x000000)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
            class       => 'colorchooser'
  },   },
      xmin      => {       xmin      => {
  default => '-10.0',   default => '-10.0',
Line 503  my %axis_defaults = Line 511  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 519  my %curve_defaults = Line 542  my %curve_defaults =
  test => $color_test,   test => $color_test,
  description => 'Color of curve (x000000)',   description => 'Color of curve (x000000)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
    class       => 'colorchooser'
  },   },
      name      => {       name      => {
  default => '',   default => '',
Line 605  sub start_gnuplot { Line 629  sub start_gnuplot {
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args   my $constructtag=&Apache::edit::get_new_args
     ($token,$parstack,$safeeval,keys(%gnuplot_defaults));      ($token,$parstack,$safeeval,keys(%gnuplot_defaults));
   
  if ($constructtag) {   if ($constructtag) {
       #
       # The color chooser does not prepent x to the color values
       # Do that here:
       #
       foreach my $attribute ('bgcolor', 'fgcolor') {
    my $value = $token->[2]{$attribute};
    if (defined $value && !($value =~ /^x/)) {
       $token->[2]{$attribute} = 'x' . $value;
    }
       }
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
     }      }
Line 619  sub end_gnuplot { Line 654  sub end_gnuplot {
  ('title','xlabel','ylabel','key','axis','label','curve'));   ('title','xlabel','ylabel','key','axis','label','curve'));
     my $result = '';      my $result = '';
     my $randnumber;      my $randnumber;
       my $tmpdir =LONCAPA::tempdir(); # Where temporary files live:
   
     # need to call rand everytime start_script would evaluate, as the      # need to call rand everytime start_script would evaluate, as the
     # safe space rand number generator and the global rand generator       # safe space rand number generator and the global rand generator 
     # are not separate      # are not separate
Line 630  sub end_gnuplot { Line 667  sub end_gnuplot {
  &check_inputs(); # Make sure we have all the data we need   &check_inputs(); # Make sure we have all the data we need
  ##   ##
  ## Determine filename   ## Determine filename
  my $tmpdir = '/home/httpd/perl/tmp/';  
  my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.   my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
     '_'.time.'_'.$$.$randnumber.'_plot';      '_'.time.'_'.$$.$randnumber.'_plot';
  ## Write the plot description to the file   ## Write the plot description to the file
Line 651  ENDIMAGE Line 687  ENDIMAGE
     #might be inside the safe space, register the URL for later      #might be inside the safe space, register the URL for later
     &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");      &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  = "%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}';      $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 1335  sub start_curve { Line 1371  sub start_curve {
  my $constructtag=&Apache::edit::get_new_args   my $constructtag=&Apache::edit::get_new_args
     ($token,$parstack,$safeeval,keys(%curve_defaults));      ($token,$parstack,$safeeval,keys(%curve_defaults));
  if ($constructtag) {   if ($constructtag) {
       #
       # Fix up the color attribute as jcolor does not prepend an x
       #
       my $value = $token->[2]{'color'};
       if (defined $value && !($value =~ /^x/)) {
    $token->[2]{'color'} = 'x' . $value;
       }
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
     }      }
Line 1440  sub start_data { Line 1483  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 1481  sub start_axis { Line 1524  sub start_axis {
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args   my $constructtag=&Apache::edit::get_new_args
     ($token,$parstack,$safeeval,keys(%axis_defaults));      ($token,$parstack,$safeeval,keys(%axis_defaults));
   
  if ($constructtag) {   if ($constructtag) {
       #
       #  Fix up the color attribute since jchooser does not
       #  prepend an x to the color:
       #
       my $value = $token->[2]{'color'};
       if (defined $value && !($value =~ /^x/)) {
    $token->[2]{'color'} = 'x' . $value;
       }
   
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
     }      }
Line 1574  sub write_gnuplot_file { Line 1627  sub write_gnuplot_file {
        $curve->{'color'}       :          $curve->{'color'}       : 
        $Apache::lonplot::plot{'fgcolor'}        );         $Apache::lonplot::plot{'fgcolor'}        );
     }      }
       
     # set term      # set term
     if ($target eq 'web') {      if ($target eq 'web') {
  $gnuplot_input .= 'set terminal png enhanced nocrop ';   $gnuplot_input .= 'set terminal png enhanced nocrop ';
Line 1586  sub write_gnuplot_file { Line 1640  sub write_gnuplot_file {
  # set output   # set output
  $gnuplot_input .= "set output\n";   $gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid ";   $gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} dash ";
  if (!$font_properties->{'tex_no_file'}) {   if (!$font_properties->{'tex_no_file'}) {
     $gnuplot_input .=      $gnuplot_input .=
  'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.   'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
Line 1594  sub write_gnuplot_file { Line 1648  sub write_gnuplot_file {
  }   }
  $gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';   $gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';
  $gnuplot_input .= $fontsize;   $gnuplot_input .= $fontsize;
  $gnuplot_input .= "\nset output \"/home/httpd/perl/tmp/".   $gnuplot_input .= "\nset output \"".$tmpdir.
     &unescape($filename).".eps\"\n";      &unescape($filename).".eps\"\n";
  $gnuplot_input .= "set encoding iso_8859_1\n"; # Get access to extended font.   $gnuplot_input .= "set encoding iso_8859_1\n"; # Get access to extended font.
   
     }      }
       $gnuplot_input .= "set encoding utf8\n";
     # cartesian or polar plot?      # 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'.$/;
Line 1735  sub write_gnuplot_file { Line 1790  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) {
Line 1766  sub write_gnuplot_file { Line 1841  sub write_gnuplot_file {
         $gnuplot_input .="\n";          $gnuplot_input .="\n";
     }      }
     # curves      # curves
     $gnuplot_input .= 'plot ';      #
       # Each curve will have its very own linestyle.
       # (This should work just fine in web rendition I think).
       #  The line_xxx variables will hold the elements of the line style.
       #  type (solid/dashed), color, width
       #
       my $linestyle_index = 50;
       my $line_width   = '';
   
       my $plot_command;
       my $plot_type;
   
     for (my $i = 0;$i<=$#curves;$i++) {      for (my $i = 0;$i<=$#curves;$i++) {
  $curve = $curves[$i];   $curve = $curves[$i];
  $gnuplot_input.= ', ' if ($i > 0);   $plot_command.= ', ' if ($i > 0);
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $curve->{'linewidth'} *= 2;      $curve->{'linewidth'} *= 2;
  }   }
    $line_width = $curve->{'linewidth'};
  if (exists($curve->{'function'})) {   if (exists($curve->{'function'})) {
     $gnuplot_input.=       $plot_type    = 
  $curve->{'function'}.' title "'.   $curve->{'function'}.' title "'.
  $curve->{'name'}.'" with '.   $curve->{'name'}.'" with '.
                 $curve->{'linestyle'};                  $curve->{'linestyle'};
   
             if (($curve->{'linestyle'} eq 'points')      ||  
                 ($curve->{'linestyle'} eq 'linespoints') ||  
                 ($curve->{'linestyle'} eq 'errorbars')   ||  
                 ($curve->{'linestyle'} eq 'xerrorbars')  ||  
                 ($curve->{'linestyle'} eq 'yerrorbars')  ||  
                 ($curve->{'linestyle'} eq 'xyerrorbars')) {  
                 $gnuplot_input.=' pointtype '.$curve->{'pointtype'};  
                 $gnuplot_input.=' pointsize '.$curve->{'pointsize'};  
             } elsif ($curve->{'linestyle'} eq 'filledcurves') {   
                 $gnuplot_input.= ' '.$curve->{'limit'};  
             } elsif ($curve->{'linetype'} ne '' &&  
                      $curve->{'linestyle'} eq 'lines') {  
                 $gnuplot_input.= ' linetype ';  
                 $gnuplot_input.= $linetypes{$curve->{'linetype'}};  
                 $gnuplot_input.= ' linecolor rgb "';  
                 # convert color from xaaaaaa to #aaaaaa  
                 $curve->{'color'} =~ s/^x/#/;  
                 $gnuplot_input.= $curve->{'color'}.'"';  
             }  
             $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};  
   
  } elsif (exists($curve->{'data'})) {   } elsif (exists($curve->{'data'})) {
     # Store data values in $datatext      # Store data values in $datatext
     my $datatext = '';      my $datatext = '';
Line 1820  sub write_gnuplot_file { Line 1885  sub write_gnuplot_file {
     print $fh $datatext;      print $fh $datatext;
     close($fh);      close($fh);
     #   generate gnuplot text      #   generate gnuplot text
     $gnuplot_input.= '"'.$datafilename.'" title "'.      $plot_type = '"'.$datafilename.'" title "'.
  $curve->{'name'}.'" with '.   $curve->{'name'}.'" with '.
  $curve->{'linestyle'};   $curve->{'linestyle'};
             if (($curve->{'linestyle'} eq 'points')      ||  
                 ($curve->{'linestyle'} eq 'linespoints') ||  
                 ($curve->{'linestyle'} eq 'errorbars')   ||  
                 ($curve->{'linestyle'} eq 'xerrorbars')  ||  
                 ($curve->{'linestyle'} eq 'yerrorbars')  ||  
                 ($curve->{'linestyle'} eq 'xyerrorbars')) {  
                 $gnuplot_input.=' pointtype '.$curve->{'pointtype'};  
                 $gnuplot_input.=' pointsize '.$curve->{'pointsize'};  
             } elsif ($curve->{'linestyle'} eq 'filledcurves') {   
                 $gnuplot_input.= ' '.$curve->{'limit'};  
             } elsif ($curve->{'linetype'} ne '' &&  
                      $curve->{'linestyle'} eq 'lines') {  
                 $gnuplot_input.= ' linetype ';  
                 $gnuplot_input.= $linetypes{$curve->{'linetype'}};  
                 $gnuplot_input.= ' linecolor rgb "';  
                 # convert color from xaaaaaa to #aaaaaa  
                 $curve->{'color'} =~ s/^x/#/;  
                 $gnuplot_input.= $curve->{'color'}.'"';  
             }  
                 $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};   
  }   }
    my $pointtype = '';
    my $pointsize = '';
   
    if (($curve->{'linestyle'} eq 'points')      ||
       ($curve->{'linestyle'} eq 'linespoints') ||
       ($curve->{'linestyle'} eq 'errorbars')   ||
       ($curve->{'linestyle'} eq 'xerrorbars')  ||
       ($curve->{'linestyle'} eq 'yerrorbars')  ||
       ($curve->{'linestyle'} eq 'xyerrorbars')) {
       
       $pointtype =' pointtype '.$curve->{'pointtype'};
       $pointsize =' pointsize '.$curve->{'pointsize'};
    } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
       $plot_command.= ' '.$curve->{'limit'};
    } 
   
   
    # Figure out the linestyle:
   
    my $lt = $curve->{'linetype'} ne '' ? $curve->{'linetype'} 
                   : 'solid'; # Line type defaults to solid.
    # The mapping of lt -> the actual gnuplot line type depends on the target:
   
    if ($target eq 'tex') {
       $lt = $ps_linetypes{$lt};
    } else {
       $lt = $linetypes{$lt}
    }
   
    my $color = $curve->{'color'};
    $color =~ s/^x/#/;        # Convert xhex color -> #hex color.   
   
    my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n";
    $gnuplot_input .= $style_command;
   
    $plot_command.= " ls $linestyle_index";
    $gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n";
    $linestyle_index++; # Each curve get a unique linestyle.
     }      }
     # Write the output to a file.      # Write the output to a file.
     open (my $fh,">$tmpdir$filename.data");      open (my $fh,">$tmpdir$filename.data");
     binmode($fh, ":utf8");      # binmode($fh, ":utf8");
     print $fh $gnuplot_input;      print $fh $gnuplot_input;
     close($fh);      close($fh);
     # That's all folks.      # That's all folks.
Line 1894  sub edit_attributes { Line 1977  sub edit_attributes {
  if ($defaults->{$attr}->{'edit_type'} eq 'entry') {   if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
     $result .= &Apache::edit::text_arg      $result .= &Apache::edit::text_arg
  ($description,$attr,$token,   ($description,$attr,$token,
  $defaults->{$attr}->{'size'});   $defaults->{$attr}->{'size'},
    $defaults->{$attr}->{'class'});
  } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {   } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
     $result .= &Apache::edit::select_or_text_arg      $result .= &Apache::edit::select_or_text_arg
  ($description,$attr,$defaults->{$attr}->{'choices'},$token);   ($description,$attr,$defaults->{$attr}->{'choices'},$token);
Removed from v.1.149  
changed lines
  Added in v.1.159

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