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

Merge commit '8cc51461a327a6c792e81617ab57b7604b1c9187' into stir_nopersist

Browse Source
This commit is contained in:
Dima Kogan 2014-08-22 17:26:13 -07:00
commit 62a38826ee
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/feedgnuplot
View File

@ -75,6 +75,7 @@ if($options{stream})
} }
$streamingFinished = 1; $streamingFinished = 1;
$dataQueue->enqueue(undef);
$plotThr->join() if defined $plotThr; $plotThr->join() if defined $plotThr;
$addThr->join(); $addThr->join();
@ -413,8 +414,6 @@ sub plotUpdateThread
# indicate that the timer was the replot source # indicate that the timer was the replot source
$dataQueue->enqueue('replot timertick'); $dataQueue->enqueue('replot timertick');
} }
$dataQueue->enqueue(undef);
} }
sub sendRangeCommand sub sendRangeCommand
@ -455,12 +454,6 @@ sub makeDomainNumeric
sub mainThread sub mainThread
{ {
local *PIPE; local *PIPE;
my $dopersist = '';
if( !$options{stream} && getGnuplotVersion() >= 4.3)
{
$dopersist = '--persist';
}
if(exists $options{dump}) if(exists $options{dump})
{ {
@ -470,7 +463,7 @@ sub mainThread
{ {
my $geometry = defined $options{geometry} ? my $geometry = defined $options{geometry} ?
"-geometry $options{geometry}" : ''; "-geometry $options{geometry}" : '';
open PIPE, "|gnuplot $geometry $dopersist" or die "Can't initialize gnuplot\n"; open PIPE, "|gnuplot $geometry" or die "Can't initialize gnuplot\n";
} }
autoflush PIPE 1; autoflush PIPE 1;
@ -768,7 +761,7 @@ sub mainThread
# sleep until the plot file exists, and it is closed. Sometimes the output # 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 # 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 # '|', 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. In that case I don't make sure the file exists, since there IS no
# file # file
if( $options{hardcopy} !~ /^\|/ ) if( $options{hardcopy} !~ /^\|/ )
{ {