From 1688496f34c7d16e10a1a0331611ec0aecd4555d Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Wed, 28 May 2014 02:34:39 -0700 Subject: [PATCH 1/3] an "exit" command now has effect even with triggered-only replotting --- bin/feedgnuplot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/feedgnuplot b/bin/feedgnuplot index 08e177b..75dd86f 100755 --- a/bin/feedgnuplot +++ b/bin/feedgnuplot @@ -75,6 +75,7 @@ if($options{stream}) } $streamingFinished = 1; + $dataQueue->enqueue(undef); $plotThr->join() if defined $plotThr; $addThr->join(); @@ -413,8 +414,6 @@ sub plotUpdateThread # indicate that the timer was the replot source $dataQueue->enqueue('replot timertick'); } - - $dataQueue->enqueue(undef); } sub sendRangeCommand From 0c32afacfd28e59bf48349f90290a4e75cd5ba2e Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Thu, 7 Aug 2014 12:46:23 -0700 Subject: [PATCH 2/3] fixed typo --- bin/feedgnuplot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/feedgnuplot b/bin/feedgnuplot index 75dd86f..b95ae77 100755 --- a/bin/feedgnuplot +++ b/bin/feedgnuplot @@ -767,7 +767,7 @@ sub mainThread # 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. In that case I don't make sure the file exists, since there IS no # file if( $options{hardcopy} !~ /^\|/ ) { From 8cc51461a327a6c792e81617ab57b7604b1c9187 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 22 Aug 2014 14:54:06 -0700 Subject: [PATCH 3/3] disabling --persist because on our arm board it confuses things with --persist enabled even something basic like seq 5 | feedgnuplot --terminal dumb does not work. feedgnuplot simply sits there doing nothing. This is likely a gnuplot bug. Those boards run an older gnuplot build, and I can't easily install a new one to test. It's possible the newer gnuplots fix this, but it's easier to release a new feedgnuplot instead --- bin/feedgnuplot | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/feedgnuplot b/bin/feedgnuplot index b95ae77..0bd1dea 100755 --- a/bin/feedgnuplot +++ b/bin/feedgnuplot @@ -454,12 +454,6 @@ sub makeDomainNumeric sub mainThread { local *PIPE; - my $dopersist = ''; - - if( !$options{stream} && getGnuplotVersion() >= 4.3) - { - $dopersist = '--persist'; - } if(exists $options{dump}) { @@ -469,7 +463,7 @@ sub mainThread { my $geometry = defined $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;