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

Diff for /loncom/xml/lonplot.pm between versions 1.159 and 1.160

version 1.159, 2012/07/09 11:11:47 version 1.160, 2012/07/16 10:09:36
Line 139  my $sml_test       = sub {$_[0]=~/^(\d+| Line 139  my $sml_test       = sub {$_[0]=~/^(\d+|
 my $linestyle_test = sub {exists($linestyles{$_[0]})};  my $linestyle_test = sub {exists($linestyles{$_[0]})};
 my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};  my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};
   
   my $arrowhead_test = sub{$_[0]=~/^(nohead|head|heads| )+$/};
   my $arrowstyle_test= sub{$_[0]=~/^(filled|empty|nofilled)+$/};
   my $degree_test  = sub{&$pos_real_test($_[0]) && ($_[0] <= 360.0)};
   
 ###################################################################  ###################################################################
 ##                                                               ##  ##                                                               ##
 ##                      Attribute metadata                       ##  ##                      Attribute metadata                       ##
Line 533  my %axis_defaults = Line 537  my %axis_defaults =
       },        },
      );       );
   
 my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');  my @curve_edit_order = ('color','name','linestyle','linewidth','linetype',
    'pointtype','pointsize','limit', 'arrowhead', 'arrowstyle', 
    'arrowlength', 'arrowangle', 'arrowbackangle'
       );
   
 my %curve_defaults =   my %curve_defaults = 
     (      (
Line 594  my %curve_defaults = Line 601  my %curve_defaults =
          edit_type   => 'choice',           edit_type   => 'choice',
          choices     => ['above', 'below', 'closed','x1','x2','y1','y2']           choices     => ['above', 'below', 'closed','x1','x2','y1','y2']
          },           },
        arrowhead => {
            default     => 'head',
    test        => $arrowhead_test,
    description => 'Vector arrow head type',
    edit_type   => 'choice',
    choices     => ['nohead', 'head', 'heads']
        },
        arrowstyle => {
    default     => 'filled',
    test        => $arrowstyle_test,
    description => 'Vector arrow head style',
    edit_type   => 'choice',
    choices     => ['filled', 'empty', 'nofilled']
        },
        arrowlength => {
    default     => 0.02,
    test        => $pos_real_test,
    description => "Length of vector arrow (only applies to vector plots)",
    edit_type   => 'entry',
    size        => '5'
        },
        arrowangle  => {
    default      => 10.0,
    test         => $degree_test,
    description  => 'Angle of arrow branches to arrow body (only applies to vector plots)',
    edit_type    => 'entry',
    size         => '5'
        },
   
        arrowbackangle => {
    default    => 90.0,
    test       => $degree_test,
    descripton => 'Angle of arrow back lines to branches.',
    edit_type  => 'entry',
    size       => '5'
        }
   
      );       );
   
 ###################################################################  ###################################################################
Line 1850  sub write_gnuplot_file { Line 1894  sub write_gnuplot_file {
     my $linestyle_index = 50;      my $linestyle_index = 50;
     my $line_width   = '';      my $line_width   = '';
   
       # If arrows are needed there will be an arrow style for each as well:
       #
   
       my $arrow_style_index = 50;
   
     my $plot_command;      my $plot_command;
     my $plot_type;      my $plot_type;
   
Line 1892  sub write_gnuplot_file { Line 1941  sub write_gnuplot_file {
  my $pointtype = '';   my $pointtype = '';
  my $pointsize = '';   my $pointsize = '';
   
    # 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;
   
   
   
  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')   ||
Line 1903  sub write_gnuplot_file { Line 1972  sub write_gnuplot_file {
     $pointsize =' pointsize '.$curve->{'pointsize'};      $pointsize =' pointsize '.$curve->{'pointsize'};
  } elsif ($curve->{'linestyle'} eq 'filledcurves') {    } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
     $plot_command.= ' '.$curve->{'limit'};      $plot_command.= ' '.$curve->{'limit'};
  }    } elsif ($curve->{'linestyle'} eq 'vector') {
   
       # Create the arrow head style add it to 
       # $gnuplot_input..and ensure it gets
       # Selected in the plot command.
   
  # Figure out the linestyle:      $gnuplot_input .= "set style arrow $arrow_style_index ";
       $gnuplot_input .= ' ' . $curve->{'arrowhead'};
       $gnuplot_input .= ' size ' . $curve->{'arrowlength'};
       $gnuplot_input .= ','.$curve->{'arrowangle'};
       $gnuplot_input .= ',' . $curve->{'arrowbackangle'}; 
       $gnuplot_input .=  ' ' . $curve->{'arrowstyle'} . " ls $linestyle_index\n";
   
  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') {      $plot_command  .= "  arrowstyle $arrow_style_index ";
     $lt = $ps_linetypes{$lt};      $arrow_style_index++;
  } 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";  
    # The condition below is because gnuplot lumps the linestyle in with the 
    # arrowstyle _sigh_.
   
    if ($curve->{'linestyle'} ne 'vector') {
       $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.   $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");  
     print $fh $gnuplot_input;      print $fh $gnuplot_input;
     close($fh);      close($fh);
     # That's all folks.      # That's all folks.
Removed from v.1.159  
changed lines
  Added in v.1.160

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