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

Diff for /loncom/xml/lonplot.pm between versions 1.156 and 1.157

version 1.156, 2012/07/03 11:29:57 version 1.157, 2012/07/04 11:06:57
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 1842  sub write_gnuplot_file { Line 1847  sub write_gnuplot_file {
     #  type (solid/dashed), color, width      #  type (solid/dashed), color, width
     #      #
     my $linestyle_index = 50;      my $linestyle_index = 50;
     my $line_type    = '';       
     my $line_color   = '';  
     my $line_width   = '';      my $line_width   = '';
   
     my $plot_command;      my $plot_command;
Line 1855  sub write_gnuplot_file { Line 1858  sub write_gnuplot_file {
  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'})) {
     $plot_type    =       $plot_type    = 
  $curve->{'function'}.' title "'.   $curve->{'function'}.' title "'.
Line 1884  sub write_gnuplot_file { Line 1888  sub write_gnuplot_file {
  $curve->{'name'}.'" with '.   $curve->{'name'}.'" with '.
  $curve->{'linestyle'};   $curve->{'linestyle'};
  }   }
    my $pointtype = '';
    my $pointsize = '';
   
  if (($curve->{'linestyle'} eq 'points')      ||   if (($curve->{'linestyle'} eq 'points')      ||
     ($curve->{'linestyle'} eq 'linespoints') ||      ($curve->{'linestyle'} eq 'linespoints') ||
     ($curve->{'linestyle'} eq 'errorbars')   ||      ($curve->{'linestyle'} eq 'errorbars')   ||
     ($curve->{'linestyle'} eq 'xerrorbars')  ||      ($curve->{'linestyle'} eq 'xerrorbars')  ||
     ($curve->{'linestyle'} eq 'yerrorbars')  ||      ($curve->{'linestyle'} eq 'yerrorbars')  ||
     ($curve->{'linestyle'} eq 'xyerrorbars')) {      ($curve->{'linestyle'} eq 'xyerrorbars')) {
     $plot_command.=' pointtype '.$curve->{'pointtype'};      
     $plot_command.=' pointsize '.$curve->{'pointsize'};      $pointtype =' pointtype '.$curve->{'pointtype'};
       $pointsize =' pointsize '.$curve->{'pointsize'};
  } elsif ($curve->{'linestyle'} eq 'filledcurves') {    } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
     $plot_command.= ' '.$curve->{'limit'};      $plot_command.= ' '.$curve->{'limit'};
  } elsif ($curve->{'linetype'} ne '' &&   } 
  $curve->{'linestyle'} eq 'lines') {  
     $plot_command.= ' linetype ';  #elsif ($curve->{'linetype'} ne '' &&
     $plot_command.= $linetypes{$curve->{'linetype'}};  # $curve->{'linestyle'} eq 'lines') 
     $plot_command.= ' linecolor rgb "';  #
     # convert color from xaaaaaa to #aaaaaa  #
     $curve->{'color'} =~ s/^x/#/;  #    $plot_command.= ' linetype ';
     $plot_command.= $curve->{'color'}.'"';  #    $plot_command.= $linetypes{$curve->{'linetype'}};
   #    $plot_command.= ' linecolor rgb "';
   #    # convert color from xaaaaaa to #aaaaaa
   #    $curve->{'color'} =~ s/^x/#/;
   #    $plot_command.= $curve->{'color'}.'"';
   # }
   
    # 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}
  }   }
  $plot_command.= ' linewidth '.$curve->{'linewidth'};  
    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";   $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");
Removed from v.1.156  
changed lines
  Added in v.1.157

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