mirror of
https://github.com/dkogan/feedgnuplot.git
synced 2025-09-18 19:18:06 +08:00
Compare commits
113 Commits
stir_noper
...
debian/1.3
Author | SHA1 | Date | |
---|---|---|---|
![]() |
e064c29daa | ||
![]() |
3d85dba82a | ||
![]() |
fa7082b242 | ||
![]() |
c61e58da0a | ||
![]() |
f6a20cf8d8 | ||
![]() |
9497e9d751 | ||
![]() |
c19dc4aa2a | ||
![]() |
f9174031cc | ||
![]() |
ab26e54e20 | ||
![]() |
238a0c1943 | ||
![]() |
42a8218fbe | ||
![]() |
4cfcf0fc35 | ||
![]() |
0e7f51f3f7 | ||
![]() |
01971c2434 | ||
![]() |
104accdd0d | ||
![]() |
605158b391 | ||
![]() |
9d98b84546 | ||
![]() |
5609773b5b | ||
![]() |
ac06d5410a | ||
![]() |
199796d874 | ||
![]() |
a9d1b533fb | ||
![]() |
0f0e51a159 | ||
![]() |
73ed9b545a | ||
![]() |
10987c5187 | ||
![]() |
9ae728805d | ||
![]() |
f790ac4683 | ||
![]() |
af94ddf457 | ||
![]() |
abc37bfa1e | ||
![]() |
19c56ae041 | ||
![]() |
417ceb2bcc | ||
![]() |
a374e71fae | ||
![]() |
0551483616 | ||
![]() |
48fb730f0b | ||
![]() |
2fbc8f62d3 | ||
![]() |
670a5b84f9 | ||
![]() |
b92093464b | ||
![]() |
516077cbd0 | ||
![]() |
f8e69778a2 | ||
![]() |
7dca5c31bf | ||
![]() |
a6fef8c9f4 | ||
![]() |
987b7d90be | ||
![]() |
d7e30ac655 | ||
![]() |
ece4b29a2a | ||
![]() |
bbd2a44bf9 | ||
![]() |
d2613db253 | ||
![]() |
2217a1a1ba | ||
![]() |
184102a420 | ||
![]() |
1cca6c8eb4 | ||
![]() |
78368597c8 | ||
![]() |
4de5984551 | ||
![]() |
512d515ff6 | ||
![]() |
1d1b5e6808 | ||
![]() |
40b18cf8f9 | ||
![]() |
5283810abe | ||
![]() |
9ab429e618 | ||
![]() |
14a39b6fd2 | ||
![]() |
d705699459 | ||
![]() |
8867cf54f0 | ||
![]() |
52b9024320 | ||
![]() |
6809545a16 | ||
![]() |
a66e45adb5 | ||
![]() |
8557cd4870 | ||
![]() |
88fbd90a28 | ||
![]() |
d9906d8e88 | ||
![]() |
186b7a3ae0 | ||
![]() |
62eb5f17bb | ||
![]() |
a164c4ff29 | ||
![]() |
30d5b10fd6 | ||
![]() |
f2d4b7d78b | ||
![]() |
00d2f0d6a6 | ||
![]() |
0ccffde918 | ||
![]() |
805060ba92 | ||
![]() |
6ba7fc053c | ||
![]() |
21c38efc2d | ||
![]() |
7833e63c32 | ||
![]() |
d9e5067f20 | ||
![]() |
44a81e153d | ||
![]() |
458367883a | ||
![]() |
d4997cbba7 | ||
![]() |
5dcffaa62d | ||
![]() |
5cf323a97c | ||
![]() |
229c08582d | ||
![]() |
04876fa72e | ||
![]() |
e61e831ef2 | ||
![]() |
e5973e4fd6 | ||
![]() |
df2c78a85e | ||
![]() |
472520fdd8 | ||
![]() |
54f7f17558 | ||
![]() |
a8dc63c472 | ||
![]() |
10a4d35e97 | ||
![]() |
70946c92c2 | ||
![]() |
a8f5b99c23 | ||
![]() |
5cb7e3616a | ||
![]() |
b9ce0ea175 | ||
![]() |
d6381c747b | ||
![]() |
a054645a71 | ||
![]() |
0ce0f8a3f0 | ||
![]() |
3171f272fc | ||
![]() |
1cced9a621 | ||
![]() |
3132b76caa | ||
![]() |
b90e783f69 | ||
![]() |
9b0bc07ae4 | ||
![]() |
7bcb3920a1 | ||
![]() |
0ec6cb3d6d | ||
![]() |
9edb99d4cd | ||
![]() |
a1fac377a8 | ||
![]() |
80a5fac5f2 | ||
![]() |
f6fc00f3f2 | ||
![]() |
02d3f2bc92 | ||
![]() |
f682fa0816 | ||
![]() |
1e63a87a3d | ||
![]() |
47846ea562 | ||
![]() |
36d1db13a3 |
20
Changes
20
Changes
@@ -1,3 +1,23 @@
|
|||||||
|
feedgnuplot (1.36)
|
||||||
|
|
||||||
|
* Added --equation to plot symbolic equations
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 13 Nov 2015 11:08:26 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.35)
|
||||||
|
|
||||||
|
* replaced a 'say' with 'print'. Should work better with ancient perls
|
||||||
|
* an "exit" command now has effect even with triggered-only replotting
|
||||||
|
|
||||||
|
* More sophisticated handling of termination conditions:
|
||||||
|
- Without --exit, we always end up with an interactive plot when the
|
||||||
|
input data is exhausted or when the user sends a ^C to the pipeline
|
||||||
|
- When streaming, the first ^C does not kill feedgnuplot
|
||||||
|
|
||||||
|
* Removed threading
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sun, 01 Nov 2015 12:50:33 -0800
|
||||||
|
|
||||||
feedgnuplot (1.34)
|
feedgnuplot (1.34)
|
||||||
|
|
||||||
* Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey
|
* Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey
|
||||||
|
416
bin/feedgnuplot
416
bin/feedgnuplot
@@ -7,16 +7,14 @@ use warnings;
|
|||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
use Time::HiRes qw( usleep gettimeofday tv_interval );
|
use Time::HiRes qw( usleep gettimeofday tv_interval );
|
||||||
use IO::Handle;
|
use IO::Handle;
|
||||||
|
use IO::Select;
|
||||||
use List::Util qw( first );
|
use List::Util qw( first );
|
||||||
use Scalar::Util qw( looks_like_number );
|
use Scalar::Util qw( looks_like_number );
|
||||||
use Text::ParseWords;
|
use Text::ParseWords; # for shellwords
|
||||||
use threads;
|
|
||||||
use threads::shared;
|
|
||||||
use Thread::Queue;
|
|
||||||
use Pod::Usage;
|
use Pod::Usage;
|
||||||
use Time::Piece;
|
use Time::Piece;
|
||||||
|
|
||||||
my $VERSION = 1.34;
|
my $VERSION = 1.36;
|
||||||
|
|
||||||
my %options;
|
my %options;
|
||||||
interpretCommandline();
|
interpretCommandline();
|
||||||
@@ -29,16 +27,11 @@ interpretCommandline();
|
|||||||
# with --xlen, the offsets are preserved by using $curve->{datastring_offset} to
|
# with --xlen, the offsets are preserved by using $curve->{datastring_offset} to
|
||||||
# represent the offset IN THE ORIGINAL STRING of the current start of the
|
# represent the offset IN THE ORIGINAL STRING of the current start of the
|
||||||
# datastring
|
# datastring
|
||||||
|
|
||||||
|
|
||||||
my @curves = ();
|
my @curves = ();
|
||||||
|
|
||||||
# list mapping curve names to their indices in the @curves list
|
# list mapping curve names to their indices in the @curves list
|
||||||
my %curveIndices = ();
|
my %curveIndices = ();
|
||||||
|
|
||||||
# now start the data acquisition and plotting threads
|
|
||||||
my $dataQueue;
|
|
||||||
|
|
||||||
# Whether any new data has arrived since the last replot
|
# Whether any new data has arrived since the last replot
|
||||||
my $haveNewData;
|
my $haveNewData;
|
||||||
|
|
||||||
@@ -48,40 +41,16 @@ my $last_replot_time = [gettimeofday];
|
|||||||
# whether the previous replot was timer based
|
# whether the previous replot was timer based
|
||||||
my $last_replot_is_from_timer = 1;
|
my $last_replot_is_from_timer = 1;
|
||||||
|
|
||||||
my $streamingFinished : shared = undef;
|
|
||||||
|
|
||||||
if($options{stream})
|
my $prev_timed_replot_time = [gettimeofday];
|
||||||
{
|
my $this_replot_is_from_timer;
|
||||||
$dataQueue = Thread::Queue->new();
|
my $stdin = IO::Handle->new();
|
||||||
my $addThr = threads->create(\&mainThread);
|
die "Couldn't open STDIN" unless $stdin->fdopen(fileno(STDIN),"r");
|
||||||
|
my $selector = IO::Select->new( $stdin );
|
||||||
|
|
||||||
# spawn the plot updating thread. If I'm replotting from a data trigger, I don't need this
|
|
||||||
my $plotThr = threads->create(\&plotUpdateThread) if $options{stream} > 0;
|
|
||||||
|
|
||||||
while(<>)
|
|
||||||
{
|
|
||||||
chomp;
|
|
||||||
|
|
||||||
last if /^exit/;
|
mainThread();
|
||||||
|
|
||||||
# place every line of input to the queue, so that the plotting thread can process it. if we are
|
|
||||||
# using an implicit domain (x = line number), then we send it on the data queue also, since
|
|
||||||
# $. is not meaningful in the plotting thread
|
|
||||||
if(!$options{domain})
|
|
||||||
{
|
|
||||||
$_ .= " $.";
|
|
||||||
}
|
|
||||||
$dataQueue->enqueue($_);
|
|
||||||
}
|
|
||||||
|
|
||||||
$streamingFinished = 1;
|
|
||||||
$dataQueue->enqueue(undef);
|
|
||||||
|
|
||||||
$plotThr->join() if defined $plotThr;
|
|
||||||
$addThr->join();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{ mainThread(); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -120,6 +89,7 @@ sub interpretCommandline
|
|||||||
$options{extracmds} = [];
|
$options{extracmds} = [];
|
||||||
$options{set} = [];
|
$options{set} = [];
|
||||||
$options{unset} = [];
|
$options{unset} = [];
|
||||||
|
$options{equation} = [];
|
||||||
|
|
||||||
$options{curvestyleall} = '';
|
$options{curvestyleall} = '';
|
||||||
$options{styleall} = '';
|
$options{styleall} = '';
|
||||||
@@ -133,6 +103,7 @@ sub interpretCommandline
|
|||||||
'zmin=f', 'zmax=f', 'y2=s@',
|
'zmin=f', 'zmax=f', 'y2=s@',
|
||||||
'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@',
|
'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@',
|
||||||
'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
|
'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
|
||||||
|
'equation=s@',
|
||||||
'histogram=s@', 'binwidth=f', 'histstyle=s',
|
'histogram=s@', 'binwidth=f', 'histstyle=s',
|
||||||
'terminal=s',
|
'terminal=s',
|
||||||
'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
|
'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
|
||||||
@@ -228,6 +199,9 @@ sub interpretCommandline
|
|||||||
# -1 for triggered replotting
|
# -1 for triggered replotting
|
||||||
# >0 for timed replotting
|
# >0 for timed replotting
|
||||||
# undef if not streaming
|
# undef if not streaming
|
||||||
|
#
|
||||||
|
# Note that '0' is not allowed, so !$options{stream} will do the expected
|
||||||
|
# thing
|
||||||
if(defined $options{stream})
|
if(defined $options{stream})
|
||||||
{
|
{
|
||||||
# if no streaming period is given, default to 1Hz.
|
# if no streaming period is given, default to 1Hz.
|
||||||
@@ -384,7 +358,7 @@ sub interpretCommandline
|
|||||||
{
|
{
|
||||||
if( $options{xlen} - int($options{xlen}) )
|
if( $options{xlen} - int($options{xlen}) )
|
||||||
{
|
{
|
||||||
say STDERR "When streaming --xlen MUST be an integer. Rounding up to the nearest second";
|
print STDERR "When streaming --xlen MUST be an integer. Rounding up to the nearest second\n";
|
||||||
$options{xlen} = 1 + int($options{xlen});
|
$options{xlen} = 1 + int($options{xlen});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -405,17 +379,6 @@ sub getGnuplotVersion
|
|||||||
return $gnuplotVersion;
|
return $gnuplotVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub plotUpdateThread
|
|
||||||
{
|
|
||||||
while(! $streamingFinished)
|
|
||||||
{
|
|
||||||
usleep( $options{stream} * 1e6 );
|
|
||||||
|
|
||||||
# indicate that the timer was the replot source
|
|
||||||
$dataQueue->enqueue('replot timertick');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sub sendRangeCommand
|
sub sendRangeCommand
|
||||||
{
|
{
|
||||||
my ($name, $min, $max) = @_;
|
my ($name, $min, $max) = @_;
|
||||||
@@ -451,16 +414,64 @@ sub makeDomainNumeric
|
|||||||
return $domain0;
|
return $domain0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
sub getNextLine
|
||||||
|
{
|
||||||
|
while(1)
|
||||||
|
{
|
||||||
|
$this_replot_is_from_timer = undef;
|
||||||
|
|
||||||
|
# if we're not streaming, or we're doing triggered-only replotting, simply
|
||||||
|
# do a blocking read
|
||||||
|
return $stdin->getline()
|
||||||
|
if (! $options{stream} || $options{stream} < 0);
|
||||||
|
|
||||||
|
|
||||||
|
my $now = [gettimeofday];
|
||||||
|
my $time_remaining = $options{stream} - tv_interval($prev_timed_replot_time, $now);
|
||||||
|
|
||||||
|
if ( $time_remaining < 0 )
|
||||||
|
{
|
||||||
|
$prev_timed_replot_time = $now;
|
||||||
|
$this_replot_is_from_timer = 1;
|
||||||
|
return 'replot';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($selector->can_read($time_remaining))
|
||||||
|
{
|
||||||
|
return $stdin->getline();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sub mainThread
|
sub mainThread
|
||||||
{
|
{
|
||||||
local *PIPE;
|
local *PIPE;
|
||||||
my $dopersist = '';
|
my $dopersist = '';
|
||||||
|
|
||||||
if( !$options{stream} && getGnuplotVersion() >= 4.3)
|
if( getGnuplotVersion() >= 4.3 && # --persist not available before this
|
||||||
|
|
||||||
|
# --persist is needed for the "half-alive" state (see documentation for
|
||||||
|
# --exit). This state is only used with these options:
|
||||||
|
!$options{stream} && $options{exit})
|
||||||
{
|
{
|
||||||
$dopersist = '--persist';
|
$dopersist = '--persist';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# We trap SIGINT to kill the data input, but keep the plot up. see
|
||||||
|
# documentation for --exit
|
||||||
|
if ($options{stream} && !$options{exit})
|
||||||
|
{
|
||||||
|
$SIG{INT} = sub
|
||||||
|
{
|
||||||
|
print STDERR "$0 received SIGINT. Send again to quit\n";
|
||||||
|
$SIG{INT} = undef;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(exists $options{dump})
|
if(exists $options{dump})
|
||||||
{
|
{
|
||||||
*PIPE = *STDOUT;
|
*PIPE = *STDOUT;
|
||||||
@@ -627,8 +638,7 @@ sub mainThread
|
|||||||
# number of seconds since the UNIX epoch.
|
# number of seconds since the UNIX epoch.
|
||||||
my $domain0_numeric;
|
my $domain0_numeric;
|
||||||
|
|
||||||
# I should be using the // operator, but I'd like to be compatible with perl 5.8
|
while( defined ($_ = getNextLine()) )
|
||||||
while( $_ = (defined $dataQueue ? $dataQueue->dequeue() : <>))
|
|
||||||
{
|
{
|
||||||
next if /^#/o;
|
next if /^#/o;
|
||||||
|
|
||||||
@@ -642,123 +652,104 @@ sub mainThread
|
|||||||
|
|
||||||
if(/^replot/o )
|
if(/^replot/o )
|
||||||
{
|
{
|
||||||
# /timertick/ determines if the timer was the source of the replot
|
replot( $domain0_numeric );
|
||||||
replot( $domain0_numeric, /timertick/ );
|
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
# /exit/ is handled in the data-reading thread
|
last if /^exit/o;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! /^replot/o)
|
# parse the incoming data lines. The format is
|
||||||
|
# x id0 dat0 id1 dat1 ....
|
||||||
|
# where idX is the ID of the curve that datX corresponds to
|
||||||
|
#
|
||||||
|
# $options{domain} indicates whether the initial 'x' is given or not (if not, the line
|
||||||
|
# number is used)
|
||||||
|
# $options{dataid} indicates whether idX is given or not (if not, the point order in the
|
||||||
|
# line is used)
|
||||||
|
# 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x"
|
||||||
|
|
||||||
|
my @fields = split;
|
||||||
|
|
||||||
|
if($options{domain})
|
||||||
{
|
{
|
||||||
# parse the incoming data lines. The format is
|
if( $options{timefmt} )
|
||||||
# x id0 dat0 id1 dat1 ....
|
|
||||||
# where idX is the ID of the curve that datX corresponds to
|
|
||||||
#
|
|
||||||
# $options{domain} indicates whether the initial 'x' is given or not (if not, the line
|
|
||||||
# number is used)
|
|
||||||
# $options{dataid} indicates whether idX is given or not (if not, the point order in the
|
|
||||||
# line is used)
|
|
||||||
# 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x"
|
|
||||||
|
|
||||||
my @fields = split;
|
|
||||||
|
|
||||||
if($options{domain})
|
|
||||||
{
|
{
|
||||||
if( $options{timefmt} )
|
# no point if doing anything unless I have at least the domain and
|
||||||
{
|
# 1 piece of data
|
||||||
# no point if doing anything unless I have at least the domain and
|
next if @fields < $options{timefmt_Ncols}+1;
|
||||||
# 1 piece of data
|
|
||||||
next if @fields < $options{timefmt_Ncols}+1;
|
|
||||||
|
|
||||||
$domain[0] = join (' ', splice( @fields, 0, $options{timefmt_Ncols}) );
|
$domain[0] = join (' ', splice( @fields, 0, $options{timefmt_Ncols}) );
|
||||||
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
||||||
}
|
}
|
||||||
elsif(!$options{'3d'})
|
elsif(!$options{'3d'})
|
||||||
{
|
{
|
||||||
# no point if doing anything unless I have at least the domain and
|
# no point if doing anything unless I have at least the domain and
|
||||||
# 1 piece of data
|
# 1 piece of data
|
||||||
next if @fields < 1+1;
|
next if @fields < 1+1;
|
||||||
|
|
||||||
$domain[0] = $domain0_numeric = shift @fields;
|
$domain[0] = $domain0_numeric = shift @fields;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
# no point if doing anything unless I have at least the domain and
|
|
||||||
# 1 piece of data
|
|
||||||
next if @fields < 2+1;
|
|
||||||
|
|
||||||
@domain = splice(@fields, 0, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if( $options{monotonic} )
|
|
||||||
{
|
|
||||||
if( defined $latestX && $domain0_numeric < $latestX )
|
|
||||||
{
|
|
||||||
# the x-coordinate of the new point is in the past, so I wipe out
|
|
||||||
# all the data and start anew. Before I wipe the old data, I
|
|
||||||
# replot the old data
|
|
||||||
replot( $domain0_numeric );
|
|
||||||
clearCurves();
|
|
||||||
$latestX = undef;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{ $latestX = $domain0_numeric; }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
# since $. is not meaningful in the plotting thread if we're using the data queue, we pass
|
# no point if doing anything unless I have at least the domain and
|
||||||
# $. on the data queue in that case
|
# 1 piece of data
|
||||||
if(defined $dataQueue)
|
next if @fields < 2+1;
|
||||||
|
|
||||||
|
@domain = splice(@fields, 0, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if( $options{monotonic} )
|
||||||
|
{
|
||||||
|
if( defined $latestX && $domain0_numeric < $latestX )
|
||||||
{
|
{
|
||||||
$domain[0] = pop @fields;
|
# the x-coordinate of the new point is in the past, so I wipe out
|
||||||
|
# all the data and start anew. Before I wipe the old data, I
|
||||||
|
# replot the old data
|
||||||
|
replot( $domain0_numeric );
|
||||||
|
clearCurves();
|
||||||
|
$latestX = undef;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{ $latestX = $domain0_numeric; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$domain[0] = $.;
|
||||||
|
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
||||||
|
}
|
||||||
|
|
||||||
|
my $id = -1;
|
||||||
|
|
||||||
|
while(@fields)
|
||||||
|
{
|
||||||
|
if($options{dataid})
|
||||||
|
{
|
||||||
|
$id = shift @fields;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$domain[0] = $.;
|
$id++;
|
||||||
}
|
}
|
||||||
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
|
||||||
}
|
|
||||||
|
|
||||||
my $id = -1;
|
# I'd like to use //, but I guess some people are still on perl 5.8
|
||||||
|
my $rangesize = exists $options{rangesize_hash}{$id} ?
|
||||||
|
$options{rangesize_hash}{$id} :
|
||||||
|
$options{rangesize_default};
|
||||||
|
|
||||||
while(@fields)
|
last if @fields < $rangesize;
|
||||||
{
|
|
||||||
if($options{dataid})
|
|
||||||
{
|
|
||||||
$id = shift @fields;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$id++;
|
|
||||||
}
|
|
||||||
|
|
||||||
# I'd like to use //, but I guess some people are still on perl 5.8
|
pushPoint(getCurve($id),
|
||||||
my $rangesize = exists $options{rangesize_hash}{$id} ?
|
join(' ',
|
||||||
$options{rangesize_hash}{$id} :
|
@domain,
|
||||||
$options{rangesize_default};
|
splice( @fields, 0, $rangesize ) ) . "\n",
|
||||||
|
$domain0_numeric);
|
||||||
last if @fields < $rangesize;
|
|
||||||
|
|
||||||
pushPoint(getCurve($id),
|
|
||||||
join(' ',
|
|
||||||
@domain,
|
|
||||||
splice( @fields, 0, $rangesize ) ) . "\n",
|
|
||||||
$domain0_numeric);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# if we were streaming, we're now done!
|
|
||||||
if( $options{stream} )
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
# finished reading in all. Plot what we have
|
# finished reading in all. Plot what we have
|
||||||
plotStoredData();
|
plotStoredData() unless $options{stream};
|
||||||
|
|
||||||
if ( defined $options{hardcopy})
|
if ( defined $options{hardcopy})
|
||||||
{
|
{
|
||||||
@@ -779,6 +770,13 @@ sub mainThread
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# data exhausted. If we're killed now, then we should peacefully die.
|
||||||
|
if($options{stream} && !$options{exit})
|
||||||
|
{
|
||||||
|
print STDERR "Input data exhausted\n";
|
||||||
|
$SIG{INT} = undef;
|
||||||
|
}
|
||||||
|
|
||||||
# we persist gnuplot, so we shouldn't need this sleep. However, once
|
# we persist gnuplot, so we shouldn't need this sleep. However, once
|
||||||
# gnuplot exits, but the persistent window sticks around, you can no
|
# gnuplot exits, but the persistent window sticks around, you can no
|
||||||
# longer interactively zoom the plot. So we still sleep
|
# longer interactively zoom the plot. So we still sleep
|
||||||
@@ -822,7 +820,9 @@ sub plotStoredData
|
|||||||
my @nonemptyCurves = grep { $_->{datastring} } @curves;
|
my @nonemptyCurves = grep { $_->{datastring} } @curves;
|
||||||
my @extraopts = map {$_->{options}} @nonemptyCurves;
|
my @extraopts = map {$_->{options}} @nonemptyCurves;
|
||||||
|
|
||||||
my $body = join(', ' , map({ "'-' $_" } @extraopts) );
|
my $body = join('', map { "$_," } @{$options{equation}});
|
||||||
|
$body .= join(', ' , map({ "'-' $_" } @extraopts) );
|
||||||
|
|
||||||
if($options{'3d'}) { print PIPE "splot $body\n"; }
|
if($options{'3d'}) { print PIPE "splot $body\n"; }
|
||||||
else { print PIPE "plot $body\n"; }
|
else { print PIPE "plot $body\n"; }
|
||||||
|
|
||||||
@@ -976,7 +976,7 @@ sub replot
|
|||||||
# }
|
# }
|
||||||
|
|
||||||
|
|
||||||
my ($domain0_numeric, $replot_is_from_timer) = @_;
|
my ($domain0_numeric) = @_;
|
||||||
|
|
||||||
my $now = [gettimeofday];
|
my $now = [gettimeofday];
|
||||||
|
|
||||||
@@ -986,7 +986,7 @@ sub replot
|
|||||||
# if the last replot was timer-based, but this one isn't, force a replot.
|
# if the last replot was timer-based, but this one isn't, force a replot.
|
||||||
# This makes sure that a replot happens for a domain rollover shortly
|
# This makes sure that a replot happens for a domain rollover shortly
|
||||||
# after a timer replot
|
# after a timer replot
|
||||||
!$replot_is_from_timer && $last_replot_is_from_timer ||
|
!$this_replot_is_from_timer && $last_replot_is_from_timer ||
|
||||||
|
|
||||||
# if enough time has elapsed since the last replot, it's ok to replot
|
# if enough time has elapsed since the last replot, it's ok to replot
|
||||||
tv_interval ( $last_replot_time, $now ) > 0.8*$options{stream} )
|
tv_interval ( $last_replot_time, $now ) > 0.8*$options{stream} )
|
||||||
@@ -1012,7 +1012,7 @@ sub replot
|
|||||||
|
|
||||||
# update replot state
|
# update replot state
|
||||||
$last_replot_time = $now;
|
$last_replot_time = $now;
|
||||||
$last_replot_is_from_timer = $replot_is_from_timer;
|
$last_replot_is_from_timer = $this_replot_is_from_timer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1614,6 +1614,34 @@ times.
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
|
C<--equation xxx>
|
||||||
|
|
||||||
|
Gnuplot can plot both data and symbolic equations. C<feedgnuplot> generally
|
||||||
|
plots data, but with this option can plot symbolic equations /also/. This is
|
||||||
|
generally intended to augment data plots, since for equation-only plots you
|
||||||
|
don't need C<feedgnuplot>. C<--equation> can be passed multiple times for
|
||||||
|
multiple equations. The given strings are passed to gnuplot directly without any
|
||||||
|
thing added or removed, so styling and such should be applied in the string. A
|
||||||
|
basic example:
|
||||||
|
|
||||||
|
seq 100 | awk '{print $1/10, $1/100}' |
|
||||||
|
feedgnuplot --with 'lines lw 3' --domain --ymax 1
|
||||||
|
--equation 'sin(x)/x' --equation 'cos(x)/x with lines lw 4'
|
||||||
|
|
||||||
|
Here I plot the incoming data (points along a line) with the given style (a line
|
||||||
|
with thickness 3), /and/ I plot two damped sinusoids on the same plot. The
|
||||||
|
sinusoids are not affected by C<feedgnuplot> styling, so their styles are set
|
||||||
|
separately, as in this example. More complicated example:
|
||||||
|
|
||||||
|
seq 360 | perl -nE '$th=$_/360 * 3.14*2; $c=cos($th); $s=sin($th); say "$c $s"' |
|
||||||
|
feedgnuplot --domain --square
|
||||||
|
--set parametric --set "trange [0:2*3.14]" --equation "sin(t),cos(t)"
|
||||||
|
|
||||||
|
Here the data I generate is points along the unit circle. I plot these as
|
||||||
|
points, and I /also/ plot a true circle as a parametric equation.
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
C<--square>
|
C<--square>
|
||||||
|
|
||||||
Plot data with aspect ratio 1. For 3D plots, this controls the aspect ratio for
|
Plot data with aspect ratio 1. For 3D plots, this controls the aspect ratio for
|
||||||
@@ -1699,10 +1727,80 @@ is possible to send the output produced this way to gnuplot directly.
|
|||||||
|
|
||||||
C<--exit>
|
C<--exit>
|
||||||
|
|
||||||
Terminate the feedgnuplot process after passing data to gnuplot. The window will
|
This controls the details of what happens when the input data is exhausted, or
|
||||||
persist but will not be interactive. Without this option feedgnuplot keeps
|
when some part of the C<feedgnuplot> pipeline is killed. This option does
|
||||||
running and must be killed by the user. Note that this option works only with
|
different things depending on whether C<--stream> is active, so read this
|
||||||
later versions of gnuplot and only with some gnuplot terminals.
|
closely.
|
||||||
|
|
||||||
|
With interactive gnuplot terminals (qt, x11, wxt), the plot windows live in a
|
||||||
|
separate process from the main C<gnuplot> process. It is thus possible for the
|
||||||
|
main C<gnuplot> process to exit, while leaving the plot windows up (a caveat is
|
||||||
|
that such decapitated windows aren't interactive). To be clear, there are 3
|
||||||
|
possible states:
|
||||||
|
|
||||||
|
=over
|
||||||
|
|
||||||
|
=item Alive: C<feedgnuplot>, C<gnuplot> alive, plot window process alive, no
|
||||||
|
shell prompt (shell busy with C<feedgnuplot>)
|
||||||
|
|
||||||
|
=item Half-alive: C<feedgnuplot>, C<gnuplot> dead, plot window process alive
|
||||||
|
(but non-interactive), shell prompt available
|
||||||
|
|
||||||
|
=item Dead: C<feedgnuplot>, C<gnuplot> dead, plot window process dead, shell
|
||||||
|
prompt available
|
||||||
|
|
||||||
|
=back
|
||||||
|
|
||||||
|
The C<--exit> option controls the details of this behavior. The possibilities
|
||||||
|
are:
|
||||||
|
|
||||||
|
=over
|
||||||
|
|
||||||
|
=item No C<--stream>, input pipe is exhausted (all data read in)
|
||||||
|
|
||||||
|
=over
|
||||||
|
|
||||||
|
=item default; no C<--exit>
|
||||||
|
|
||||||
|
Alive. Need to Ctrl-C to get back into the shell
|
||||||
|
|
||||||
|
=item C<--exit>
|
||||||
|
|
||||||
|
Half-alive. Non-interactive prompt up, and the shell accepts new commands.
|
||||||
|
Without C<--stream> the goal is to show a plot, so a Dead state is not useful
|
||||||
|
here.
|
||||||
|
|
||||||
|
=back
|
||||||
|
|
||||||
|
=item C<--stream>, input pipe is exhausted (all data read in) or the
|
||||||
|
C<feedgnuplot> process terminated
|
||||||
|
|
||||||
|
=over
|
||||||
|
|
||||||
|
=item default; no C<--exit>
|
||||||
|
|
||||||
|
Alive. Need to Ctrl-C to get back into the shell
|
||||||
|
|
||||||
|
=item C<--exit>
|
||||||
|
|
||||||
|
Dead. No plot is shown, and the shell accepts new commands. With C<--stream> the
|
||||||
|
goal is to show a plot as the data comes in, which we have been doing. Now that
|
||||||
|
we're done, we can clean up everything.
|
||||||
|
|
||||||
|
=back
|
||||||
|
|
||||||
|
=back
|
||||||
|
|
||||||
|
Note that one usually invokes C<feedgnuplot> as a part of a shell pipeline:
|
||||||
|
|
||||||
|
$ write_data | feedgnuplot
|
||||||
|
|
||||||
|
If the user terminates this pipeline with ^C, then I<all> the processes in the
|
||||||
|
pipeline receive SIGINT. This normally kills C<feedgnuplot> and all its
|
||||||
|
C<gnuplot> children, and we let this happen unless C<--stream> and no C<--exit>.
|
||||||
|
If C<--stream> and no C<--exit>, then we ignore the first ^C. The data feeder
|
||||||
|
dies, and we behave as if the input data was exhausted. A second ^C kills us
|
||||||
|
also.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
@@ -1756,10 +1854,12 @@ in a Thinkpad.
|
|||||||
$ while true; do cat /proc/acpi/ibm/thermal | awk '{$1=""; print}' ; sleep 1; done |
|
$ while true; do cat /proc/acpi/ibm/thermal | awk '{$1=""; print}' ; sleep 1; done |
|
||||||
feedgnuplot --stream --xlen 100 --lines --autolegend --ymax 100 --ymin 20 --ylabel 'Temperature (deg C)'
|
feedgnuplot --stream --xlen 100 --lines --autolegend --ymax 100 --ymin 20 --ylabel 'Temperature (deg C)'
|
||||||
|
|
||||||
=head2 Plotting a histogram of file sizes in a directory
|
=head2 Plotting a histogram of file sizes in a directory, granular to 10MB
|
||||||
|
|
||||||
$ ls -l | awk '{print $5/1e6}' |
|
$ ls -l | awk '{print $5/1e6}' |
|
||||||
feedgnuplot --histogram 0 --with boxes --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
|
feedgnuplot --histogram 0 --with boxes
|
||||||
|
--binwidth 10 --set 'style fill solid'
|
||||||
|
--ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
|
||||||
|
|
||||||
=head1 ACKNOWLEDGEMENT
|
=head1 ACKNOWLEDGEMENT
|
||||||
|
|
||||||
|
98
debian/changelog
vendored
Normal file
98
debian/changelog
vendored
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
feedgnuplot (1.36-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update: added --equation to plot symbolic equations
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 13 Nov 2015 11:14:30 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.35-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update: fancier handling of termination conditions, no more
|
||||||
|
threading code
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Mon, 02 Nov 2015 13:55:32 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.34-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Depends now works with the 'gnuplot5' packages
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 10 Oct 2014 14:05:17 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.34-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Very minor upstream update
|
||||||
|
* gnuplot-nox can no satisfy the gnuplot dependency for feedgnuplot
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 06 Aug 2014 15:19:56 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.33-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Upstream update: fixed incorrect plotting of --timefmt --rangesize
|
||||||
|
plots
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Thu, 06 Feb 2014 23:19:02 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.32-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Added --rangesize and --rangesizeall. Different curves can now plot
|
||||||
|
different-size tuples
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 05 Feb 2014 14:00:44 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.30-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* made the VCS links canonical
|
||||||
|
* added --set, --unset, --with, --style, --styleall
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 24 Jan 2014 15:50:03 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.28-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Upstream update:
|
||||||
|
- Removed example debianization
|
||||||
|
- Removed unreliable unit tests from automated testing (Closes: #731080)
|
||||||
|
* gnuplot dependency now favors graphical gnuplot packages
|
||||||
|
* Removed Anton Gladky from the Uploaders
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 04 Dec 2013 02:05:08 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.26-1) unstable; urgency=low
|
||||||
|
|
||||||
|
[ Dima Kogan ]
|
||||||
|
* Minor POD update
|
||||||
|
* Added test suite
|
||||||
|
* Added initial support for --timefmt. Currently time/date data is
|
||||||
|
supported only at the x-axis domain
|
||||||
|
* Added --exit option for force feedgnuplot to return even if gnuplot
|
||||||
|
may not yet be done rendering (patch by Eric Schulte)
|
||||||
|
* Reformatted the documentation
|
||||||
|
* y2-axis curves no longer have a thicker line by default
|
||||||
|
* --hardcopy now handles piped output (gnuplot 'set output |process'
|
||||||
|
syntax)
|
||||||
|
|
||||||
|
[ Anton Gladky ]
|
||||||
|
* Add libipc-run-perl to Build-Depends to execute tests
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Oct 2013 01:19:51 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.24-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Now building the html documentation from the correct POD source
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sun, 28 Apr 2013 17:42:52 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.24-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Fixed regression in --monotonic. This works again now
|
||||||
|
* moved POD back into the main source file. This fixes the broken usage
|
||||||
|
messages
|
||||||
|
* added --version
|
||||||
|
* fixed watchfile to work with newer github pages
|
||||||
|
* priority now optional
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 08 Feb 2013 02:01:32 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.23-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Initial Debian release (Closes: #686413)
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Tue, 30 Oct 2012 11:14:01 -0700
|
1
debian/compat
vendored
Normal file
1
debian/compat
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
9
|
20
debian/control
vendored
Normal file
20
debian/control
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
Source: feedgnuplot
|
||||||
|
Section: science
|
||||||
|
Priority: optional
|
||||||
|
Build-Depends: debhelper (>= 9), libstring-shellquote-perl, perl, gawk, gnuplot, libipc-run-perl
|
||||||
|
Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
|
||||||
|
Uploaders: Dima Kogan <dima@secretsauce.net>
|
||||||
|
Standards-Version: 3.9.4
|
||||||
|
Homepage: https://github.com/dkogan/feedgnuplot
|
||||||
|
Vcs-Git: git://anonscm.debian.org/debian-science/packages/feedgnuplot.git
|
||||||
|
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
|
||||||
|
|
||||||
|
Package: feedgnuplot
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}, ${perl:Depends},
|
||||||
|
gnuplot-qt | gnuplot-x11 | gnuplot-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | gnuplot
|
||||||
|
Description: Pipe-oriented frontend to Gnuplot
|
||||||
|
Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
|
||||||
|
coming in on STDIN or given in a filename passed on the commandline. Various
|
||||||
|
data representations are supported, as is hardcopy output and streaming display
|
||||||
|
of live data.
|
24
debian/copyright
vendored
Normal file
24
debian/copyright
vendored
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
|
Source: https://github.com/dkogan/feedgnuplot
|
||||||
|
Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
|
||||||
|
Upstream-Name: feedgnuplot
|
||||||
|
|
||||||
|
Files: *
|
||||||
|
Copyright: 2011, Dima Kogan <dima@secretsauce.net>
|
||||||
|
License: Artistic or GPL-1+
|
||||||
|
|
||||||
|
License: Artistic
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the Artistic License, which comes with Perl.
|
||||||
|
.
|
||||||
|
On Debian GNU/Linux systems, the complete text of the Artistic License
|
||||||
|
can be found in `/usr/share/common-licenses/Artistic'.
|
||||||
|
|
||||||
|
License: GPL-1+
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 1, or (at your option)
|
||||||
|
any later version.
|
||||||
|
.
|
||||||
|
On Debian GNU/Linux systems, the complete text of version 1 of the
|
||||||
|
General Public License can be found in `/usr/share/common-licenses/GPL-1'.
|
9
debian/feedgnuplot.doc-base
vendored
Normal file
9
debian/feedgnuplot.doc-base
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
Document: feedgnuplot
|
||||||
|
Title: Feedgnuplot Manual
|
||||||
|
Author: Dima Kogan
|
||||||
|
Abstract: Formatted manpage for feedgnuplot
|
||||||
|
Section: Science/Data Analysis
|
||||||
|
|
||||||
|
Format: HTML
|
||||||
|
Index: /usr/share/doc/feedgnuplot/feedgnuplot.html
|
||||||
|
Files: /usr/share/doc/feedgnuplot/feedgnuplot.html
|
1
debian/feedgnuplot.docs
vendored
Normal file
1
debian/feedgnuplot.docs
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
feedgnuplot.html
|
2
debian/feedgnuplot.install
vendored
Normal file
2
debian/feedgnuplot.install
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
completions/bash/feedgnuplot /etc/bash_completion.d/
|
||||||
|
completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions
|
4
debian/gbp.conf
vendored
Normal file
4
debian/gbp.conf
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
debian-branch = debian
|
||||||
|
upstream-tag = v%(version)s
|
||||||
|
pristine-tar = True
|
12
debian/rules
vendored
Executable file
12
debian/rules
vendored
Executable file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
|
%:
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
override_dh_auto_build:
|
||||||
|
dh_auto_build
|
||||||
|
pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
|
||||||
|
|
||||||
|
override_dh_auto_clean:
|
||||||
|
rm -rf feedgnuplot.html pod2htm*
|
||||||
|
dh_auto_clean
|
1
debian/source/format
vendored
Normal file
1
debian/source/format
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
3.0 (quilt)
|
4
debian/watch
vendored
Normal file
4
debian/watch
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
version=3
|
||||||
|
opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
|
||||||
|
https://github.com/dkogan/feedgnuplot/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
|
||||||
|
# Bart Martens <bartm@debian.org> Sat, 22 Dec 2012 12:54:18 +0000
|
Reference in New Issue
Block a user