zhangyiss/feedgnuplot
1
0
Fork 0
mirror of https://github.com/dkogan/feedgnuplot.git synced 2025-05-05 22:11:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

--hardcopy now handles piped output

Browse Source 
If we tell gnuplot to plot to a file whose name starts with '|', gnuplot writes
to a a process, not to a file. This is now supported by feedgnuplot
This commit is contained in:
Dima Kogan 2013-10-19 19:24:57 -07:00
parent 669fb8dee6
commit ffd19b9b87
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bin/feedgnuplot
View File

@ -406,11 +406,15 @@ sub mainThread
my $outputfile;
my $outputfileType;
if( $options{hardcopy})
if( defined $options{hardcopy})
{
$outputfile = $options{hardcopy};
$outputfile =~ /\.(eps|ps|pdf|png|svg)$/i;
$outputfileType = $1 ? lc $1 : '';
if( $outputfile =~ /^[^|] # starts with anything other than |
.* # stuff in the middle
\.(eps|ps|pdf|png|svg)$/ix) # ends with a known extension
{
$outputfileType = lc $1;
}
my %terminalOpts =
( eps => 'postscript solid color enhanced eps',
@ -419,8 +423,12 @@ sub mainThread
png => 'png size 1280,1024',
svg => 'svg');
$options{terminal} ||= $terminalOpts{$outputfileType}
if $terminalOpts{$outputfileType};
if( !defined $options{terminal} &&
defined $outputfileType &&
$terminalOpts{$outputfileType} )
{
$options{terminal} = $terminalOpts{$outputfileType};
}
die "Asked to plot to file '$outputfile', but I don't know which terminal to use, and no --terminal given"
unless $options{terminal};
@ -658,13 +666,20 @@ sub mainThread
# finished reading in all. Plot what we have
plotStoredData();
if ( $options{hardcopy})
if ( defined $options{hardcopy})
{
print PIPE "set output\n";
# sleep until the plot file exists, and it is closed. Sometimes the output is
# still being written at this point
usleep(100_000) until -e $outputfile;
usleep(100_000) until(system("fuser -s \"$outputfile\""));
# sleep until the plot file exists, and it is closed. Sometimes the output
# is still being written at this point. If the output filename starts with
# '|', gnuplot pipes the output to that process, instead of writing to a
# file. In that case I don't make sure the file exists, since there IS not
# file
if( $options{hardcopy} !~ /^\|/ )
{
usleep(100_000) until -e $outputfile;
usleep(100_000) until(system("fuser -s \"$outputfile\""));
}
print "Wrote output to $outputfile\n";
return;