mirror of
https://github.com/dkogan/feedgnuplot.git
synced 2025-09-19 03:38:08 +08:00
Compare commits
125 Commits
v1.25
...
debian/1.3
Author | SHA1 | Date | |
---|---|---|---|
![]() |
a9d1b533fb | ||
![]() |
0f0e51a159 | ||
![]() |
73ed9b545a | ||
![]() |
498047e785 | ||
![]() |
72adba82f7 | ||
![]() |
539b2035d8 | ||
![]() |
10987c5187 | ||
![]() |
9ae728805d | ||
![]() |
9b3cbc13be | ||
![]() |
a65abc6095 | ||
![]() |
5db86810b5 | ||
![]() |
f790ac4683 | ||
![]() |
af94ddf457 | ||
![]() |
d75b572875 | ||
![]() |
6cb1574e2b | ||
![]() |
4fd1c390ff | ||
![]() |
4163e24956 | ||
![]() |
13268a1fa8 | ||
![]() |
08fa97fdb5 | ||
![]() |
e19bdf51c4 | ||
![]() |
a9af1925e2 | ||
![]() |
abc37bfa1e | ||
![]() |
19c56ae041 | ||
![]() |
9387a85fe6 | ||
![]() |
f38a00bfd1 | ||
![]() |
c21c4d7e70 | ||
![]() |
35901fe6d1 | ||
![]() |
1e3d01edd2 | ||
![]() |
20e9adbae4 | ||
![]() |
2b2bba9ff3 | ||
![]() |
caea1285a9 | ||
![]() |
64bce2a425 | ||
![]() |
417ceb2bcc | ||
![]() |
adbc8393f5 | ||
![]() |
a374e71fae | ||
![]() |
0551483616 | ||
![]() |
235de3d5d1 | ||
![]() |
48fb730f0b | ||
![]() |
2fbc8f62d3 | ||
![]() |
198122431f | ||
![]() |
dd8bc8995d | ||
![]() |
670a5b84f9 | ||
![]() |
cc0b41e270 | ||
![]() |
1f757d1db1 | ||
![]() |
84a8daa56a | ||
![]() |
b92093464b | ||
![]() |
516077cbd0 | ||
![]() |
f8e69778a2 | ||
![]() |
7dca5c31bf | ||
![]() |
a6fef8c9f4 | ||
![]() |
1dad122cb9 | ||
![]() |
ee6b339978 | ||
![]() |
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 |
65
Changes
65
Changes
@@ -1,4 +1,65 @@
|
|||||||
feedgnuplot (1.25) unstable; urgency=low
|
feedgnuplot (1.34)
|
||||||
|
|
||||||
|
* Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey
|
||||||
|
Putkunz
|
||||||
|
|
||||||
|
* Declaring feedgnuplot as a package to let MetaCPAN index this
|
||||||
|
distribution
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 14 May 2014 00:45:24 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.33)
|
||||||
|
|
||||||
|
* fixed incorrect plotting of --timefmt --rangesize plots
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Thu, 06 Feb 2014 23:17:21 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.32)
|
||||||
|
|
||||||
|
* Added --rangesize and --rangesizeall. Different curves can now plot
|
||||||
|
different-size tuples
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 05 Feb 2014 13:57:58 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.31)
|
||||||
|
|
||||||
|
* Test suite requires gawk to get strftime()
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sat, 25 Jan 2014 20:49:38 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.30)
|
||||||
|
|
||||||
|
* Added --with, --set, --unset, --style, --styleall
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 24 Jan 2014 15:38:07 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.29)
|
||||||
|
|
||||||
|
* added CPAN meta-data to require IPC::Run at build time
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 04 Dec 2013 21:12:40 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.28)
|
||||||
|
|
||||||
|
* Minor POD update
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 04 Dec 2013 02:01:05 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.27)
|
||||||
|
|
||||||
|
* Disabled tests that can fail on some arches (can be re-enabled with
|
||||||
|
environment variable)
|
||||||
|
* Removed sample debianization; this program is now in Debian proper
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Tue, 03 Dec 2013 23:37:40 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.26)
|
||||||
|
|
||||||
|
* Minor POD fixes
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Oct 2013 01:17:57 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.25)
|
||||||
|
|
||||||
* Added test suite
|
* Added test suite
|
||||||
* Added initial support for --timefmt. Currently time/date data is
|
* Added initial support for --timefmt. Currently time/date data is
|
||||||
@@ -12,7 +73,7 @@ feedgnuplot (1.25) unstable; urgency=low
|
|||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Oct 2013 00:09:36 -0700
|
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Oct 2013 00:09:36 -0700
|
||||||
|
|
||||||
feedgnuplot (1.24) unstable; urgency=low
|
feedgnuplot (1.24)
|
||||||
|
|
||||||
* Fixed regression in --monotonic. This works again now
|
* Fixed regression in --monotonic. This works again now
|
||||||
* moved POD back into the main source file. This fixes the broken usage
|
* moved POD back into the main source file. This fixes the broken usage
|
||||||
|
12
INSTALL
12
INSTALL
@@ -1,17 +1,9 @@
|
|||||||
If running on a Debian-based OS (this includes Ubuntu), it is highly recommended
|
If running on a Debian-based OS (this includes Ubuntu), it is highly recommended
|
||||||
to install this program as a package. In debian/unstable feedgnuplot is in the
|
to install this program as a package. In Debian and Ubuntu, feedgnuplot is in
|
||||||
official repos, so all you need to do is
|
the official repos, so all you need to do is
|
||||||
|
|
||||||
sudo apt-get install feedgnuplot
|
sudo apt-get install feedgnuplot
|
||||||
|
|
||||||
Otherwise a package can be built with
|
|
||||||
|
|
||||||
ln -fs package_definitions/debian debian
|
|
||||||
dpkg-buildpackage -us -uc -b
|
|
||||||
sudo dpkg -i ../feedgnuplot*.deb
|
|
||||||
|
|
||||||
This builds a debian package and installs it.
|
|
||||||
|
|
||||||
Without a package, an installation can be done with
|
Without a package, an installation can be done with
|
||||||
|
|
||||||
perl Makefile.PL prefix=/usr/local
|
perl Makefile.PL prefix=/usr/local
|
||||||
|
@@ -63,7 +63,8 @@ WriteMakefile
|
|||||||
: ()),
|
: ()),
|
||||||
PL_FILES => {},
|
PL_FILES => {},
|
||||||
EXE_FILES => [ 'bin/feedgnuplot' ],
|
EXE_FILES => [ 'bin/feedgnuplot' ],
|
||||||
BUILD_REQUIRES => { 'String::ShellQuote' => 0},
|
BUILD_REQUIRES => { 'String::ShellQuote' => 0,
|
||||||
|
'IPC::Run' => 0},
|
||||||
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
||||||
clean => { FILES => 'feedgnuplot-*' },
|
clean => { FILES => 'feedgnuplot-*' },
|
||||||
);
|
);
|
||||||
|
575
bin/feedgnuplot
575
bin/feedgnuplot
@@ -1,4 +1,7 @@
|
|||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
package feedgnuplot; # for the metacpan indexer
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
@@ -13,7 +16,7 @@ use Thread::Queue;
|
|||||||
use Pod::Usage;
|
use Pod::Usage;
|
||||||
use Time::Piece;
|
use Time::Piece;
|
||||||
|
|
||||||
my $VERSION = 1.25;
|
my $VERSION = 1.34;
|
||||||
|
|
||||||
my %options;
|
my %options;
|
||||||
interpretCommandline();
|
interpretCommandline();
|
||||||
@@ -107,18 +110,32 @@ sub interpretCommandline
|
|||||||
# syntax, but disregarded the order of the given options. This resulted in arbitrarily ordered
|
# syntax, but disregarded the order of the given options. This resulted in arbitrarily ordered
|
||||||
# curves. I thus make parse these into lists, and then also make hashes, for later use
|
# curves. I thus make parse these into lists, and then also make hashes, for later use
|
||||||
|
|
||||||
# needed for these to be parsed into an array-ref
|
# needed for these to be parsed into an array-ref, these default to []
|
||||||
$options{legend} = [];
|
$options{legend} = [];
|
||||||
$options{curvestyle} = [];
|
$options{curvestyle} = [];
|
||||||
|
$options{style} = [];
|
||||||
$options{histogram} = [];
|
$options{histogram} = [];
|
||||||
|
$options{y2} = [];
|
||||||
|
$options{extracmds} = [];
|
||||||
|
$options{set} = [];
|
||||||
|
$options{unset} = [];
|
||||||
|
|
||||||
|
$options{curvestyleall} = '';
|
||||||
|
$options{styleall} = '';
|
||||||
|
$options{with} = '';
|
||||||
|
|
||||||
|
$options{rangesize} = [];
|
||||||
|
|
||||||
GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', '3d!', 'colormap!', 'lines!', 'points!',
|
GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', '3d!', 'colormap!', 'lines!', 'points!',
|
||||||
'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
|
'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
|
||||||
'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=s', 'xmax=s', 'y2min=f', 'y2max=f',
|
'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=s', 'xmax=s', 'y2min=f', 'y2max=f',
|
||||||
'zmin=f', 'zmax=f', 'y2=s@', 'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=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@',
|
||||||
'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
|
'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
|
||||||
'histogram=s@', 'binwidth=f', 'histstyle=s',
|
'histogram=s@', 'binwidth=f', 'histstyle=s',
|
||||||
'terminal=s',
|
'terminal=s',
|
||||||
'extraValuesPerPoint=i', 'help', 'dump', 'exit', 'version',
|
'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
|
||||||
|
'help', 'dump', 'exit', 'version',
|
||||||
'geometry=s') or pod2usage( -exitval => 1,
|
'geometry=s') or pod2usage( -exitval => 1,
|
||||||
-verbose => 1, # synopsis and args
|
-verbose => 1, # synopsis and args
|
||||||
-output => \*STDERR );
|
-output => \*STDERR );
|
||||||
@@ -138,9 +155,6 @@ sub interpretCommandline
|
|||||||
exit 0;
|
exit 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
# no global style if one isn't given
|
|
||||||
$options{curvestyleall} = '' unless defined $options{curvestyleall};
|
|
||||||
|
|
||||||
# expand options that are given as comma-separated lists
|
# expand options that are given as comma-separated lists
|
||||||
for my $listkey (qw(histogram y2))
|
for my $listkey (qw(histogram y2))
|
||||||
{
|
{
|
||||||
@@ -148,11 +162,27 @@ sub interpretCommandline
|
|||||||
if defined $options{$listkey};
|
if defined $options{$listkey};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# --style and --curvestyle are synonyms, as are --styleall and
|
||||||
|
# --curvestyleall, so fill that in
|
||||||
|
if( $options{styleall} )
|
||||||
|
{
|
||||||
|
if($options{curvestyleall} )
|
||||||
|
{
|
||||||
|
$options{curvestyleall} .= " $options{styleall}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$options{curvestyleall} = $options{styleall};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
push @{$options{curvestyle}}, @{$options{style}};
|
||||||
|
|
||||||
|
|
||||||
# --legend and --curvestyle options are conceptually hashes, but are parsed as
|
# --legend and --curvestyle options are conceptually hashes, but are parsed as
|
||||||
# arrays in order to preserve the ordering. I parse both of these into hashes
|
# arrays in order to preserve the ordering. I parse both of these into hashes
|
||||||
# because those are useful to have later. After this I can access individual
|
# because those are useful to have later. After this I can access individual
|
||||||
# legends with $options{legend_hash}{curveid}
|
# legends with $options{legend_hash}{curveid}
|
||||||
for my $listkey (qw(legend curvestyle))
|
for my $listkey (qw(legend curvestyle rangesize))
|
||||||
{
|
{
|
||||||
$options{"${listkey}_hash"} = {};
|
$options{"${listkey}_hash"} = {};
|
||||||
|
|
||||||
@@ -169,6 +199,29 @@ sub interpretCommandline
|
|||||||
exit -1;
|
exit -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( defined $options{rangesizeall} && defined $options{extraValuesPerPoint} )
|
||||||
|
{
|
||||||
|
print STDERR "Only one of --rangesizeall and --extraValuesPerPoint may be given\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# I now set up the rangesize to always be
|
||||||
|
# $options{rangesize_hash}{$id} // $options{rangesize_default}
|
||||||
|
if ( $options{rangesizeall} )
|
||||||
|
{
|
||||||
|
$options{rangesize_default} = $options{rangesizeall};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$options{rangesize_default} = 1;
|
||||||
|
|
||||||
|
$options{rangesize_default} += $options{extraValuesPerPoint} if ($options{extraValuesPerPoint});
|
||||||
|
$options{rangesize_default}++ if ($options{colormap});
|
||||||
|
$options{rangesize_default}++ if ($options{circles} );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# parse stream option. Allowed only numbers >= 0 or 'trigger'. After this code
|
# parse stream option. Allowed only numbers >= 0 or 'trigger'. After this code
|
||||||
# $options{stream} is
|
# $options{stream} is
|
||||||
# -1 for triggered replotting
|
# -1 for triggered replotting
|
||||||
@@ -203,6 +256,17 @@ sub interpretCommandline
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( $options{curvestyleall} && $options{with} )
|
||||||
|
{
|
||||||
|
print STDERR "--curvestyleall and --with are mutually exclusive. Please just use one.\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
|
if( $options{with} )
|
||||||
|
{
|
||||||
|
$options{curvestyleall} = "with $options{with}";
|
||||||
|
$options{with} = '';
|
||||||
|
}
|
||||||
|
|
||||||
if ($options{colormap})
|
if ($options{colormap})
|
||||||
{
|
{
|
||||||
# colormap styles all curves with palette. Seems like there should be a way to do this with a
|
# colormap styles all curves with palette. Seems like there should be a way to do this with a
|
||||||
@@ -224,7 +288,7 @@ sub interpretCommandline
|
|||||||
exit -1;
|
exit -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( defined $options{y2min} || defined $options{y2max} || defined $options{y2} )
|
if ( defined $options{y2min} || defined $options{y2max} || @{$options{y2}} )
|
||||||
{
|
{
|
||||||
print STDERR "--3d does not make sense with --y2...\n";
|
print STDERR "--3d does not make sense with --y2...\n";
|
||||||
exit -1;
|
exit -1;
|
||||||
@@ -310,10 +374,8 @@ sub interpretCommandline
|
|||||||
$options{timefmt} =~ s/^\s*//;
|
$options{timefmt} =~ s/^\s*//;
|
||||||
$options{timefmt} =~ s/\s*$//;
|
$options{timefmt} =~ s/\s*$//;
|
||||||
|
|
||||||
my $Nfields = scalar split( ' ', $options{timefmt});
|
my $Nfields = () = split /\s+/, $options{timefmt}, -1;
|
||||||
$options{timefmt_Ncols} = $Nfields;
|
$options{timefmt_Ncols} = $Nfields;
|
||||||
my $regex_str = join( '\s+', ('\S+') x $Nfields );
|
|
||||||
$options{timefmt_regex} = qr/$regex_str/;
|
|
||||||
|
|
||||||
# make sure --xlen is an integer. With a timefmt xlen goes through strptime
|
# make sure --xlen is an integer. With a timefmt xlen goes through strptime
|
||||||
# and strftime, and those are integer-only
|
# and strftime, and those are integer-only
|
||||||
@@ -392,11 +454,6 @@ sub makeDomainNumeric
|
|||||||
|
|
||||||
sub mainThread
|
sub mainThread
|
||||||
{
|
{
|
||||||
my $valuesPerPoint = 1;
|
|
||||||
if($options{extraValuesPerPoint}) { $valuesPerPoint += $options{extraValuesPerPoint}; }
|
|
||||||
if($options{colormap}) { $valuesPerPoint++; }
|
|
||||||
if($options{circles} ) { $valuesPerPoint++; }
|
|
||||||
|
|
||||||
local *PIPE;
|
local *PIPE;
|
||||||
my $dopersist = '';
|
my $dopersist = '';
|
||||||
|
|
||||||
@@ -486,7 +543,7 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
# For the specified values, set the legend entries to 'title "blah blah"'
|
# For the specified values, set the legend entries to 'title "blah blah"'
|
||||||
if(defined $options{legend} && @{$options{legend}})
|
if(@{$options{legend}})
|
||||||
{
|
{
|
||||||
# @{$options{legend}} is a list where consecutive pairs are (curveID,
|
# @{$options{legend}} is a list where consecutive pairs are (curveID,
|
||||||
# legend). I use $options{legend} here instead of $options{legend_hash}
|
# legend). I use $options{legend} here instead of $options{legend_hash}
|
||||||
@@ -501,7 +558,7 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
# add the extra curve options
|
# add the extra curve options
|
||||||
if(defined $options{curvestyle} && @{$options{curvestyle}})
|
if(@{$options{curvestyle}})
|
||||||
{
|
{
|
||||||
# @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
|
# @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
|
||||||
# style). I use $options{curvestyle} here instead of
|
# style). I use $options{curvestyle} here instead of
|
||||||
@@ -516,13 +573,7 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
# For the values requested to be printed on the y2 axis, set that
|
# For the values requested to be printed on the y2 axis, set that
|
||||||
if( defined $options{y2} )
|
addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}});
|
||||||
{
|
|
||||||
foreach (@{$options{y2}})
|
|
||||||
{
|
|
||||||
addCurveOption($_, 'axes x1y2');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# timefmt
|
# timefmt
|
||||||
if( $options{timefmt} )
|
if( $options{timefmt} )
|
||||||
@@ -532,43 +583,24 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
# add the extra global options
|
# add the extra global options
|
||||||
if(defined $options{extracmds})
|
print(PIPE "$_\n") foreach (@{$options{extracmds}});
|
||||||
{
|
print(PIPE "set $_\n") foreach (@{$options{set}});
|
||||||
foreach (@{$options{extracmds}})
|
print(PIPE "unset $_\n") foreach (@{$options{unset}});
|
||||||
{
|
|
||||||
print(PIPE "$_\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# set up histograms
|
# set up histograms
|
||||||
if( defined $options{histogram} )
|
$options{binwidth} ||= 1; # if no binwidth given, set it to 1
|
||||||
{
|
print PIPE
|
||||||
$options{binwidth} ||= 1; # if no binwidth given, set it to 1
|
"set boxwidth $options{binwidth}\n" .
|
||||||
print PIPE
|
"histbin(x) = $options{binwidth} * floor(0.5 + x/$options{binwidth})\n";
|
||||||
"set boxwidth $options{binwidth}\n" .
|
|
||||||
"histbin(x) = $options{binwidth} * floor(0.5 + x/$options{binwidth})\n";
|
|
||||||
foreach (@{$options{histogram}})
|
|
||||||
{
|
|
||||||
setCurveAsHistogram( $_ );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# regexp for a possibly floating point, possibly scientific notation number
|
setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
|
||||||
my $numRE = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?';
|
|
||||||
my $domainRE = $options{timefmt_regex} || $numRE;
|
|
||||||
|
|
||||||
|
|
||||||
# a point may be preceded by an id
|
|
||||||
my $pointRE = $options{dataid} ? '(\S+)\s+' : '()';
|
|
||||||
$pointRE .= '(' . join('\s+', ($numRE) x $valuesPerPoint) . ')';
|
|
||||||
$pointRE = qr/$pointRE/;
|
|
||||||
|
|
||||||
# set all the axis ranges
|
# set all the axis ranges
|
||||||
# If a bound isn't given I want to set it to the empty string, so I can communicate it simply to
|
# If a bound isn't given I want to set it to the empty string, so I can communicate it simply to
|
||||||
# gnuplot
|
# gnuplot
|
||||||
print PIPE "set xtics\n";
|
print PIPE "set xtics\n";
|
||||||
|
|
||||||
if($options{y2})
|
if(@{$options{y2}})
|
||||||
{
|
{
|
||||||
print PIPE "set ytics nomirror\n";
|
print PIPE "set ytics nomirror\n";
|
||||||
print PIPE "set y2tics\n";
|
print PIPE "set y2tics\n";
|
||||||
@@ -631,18 +663,37 @@ sub mainThread
|
|||||||
# line is used)
|
# line is used)
|
||||||
# 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x"
|
# 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x"
|
||||||
|
|
||||||
|
my @fields = split;
|
||||||
|
|
||||||
if($options{domain})
|
if($options{domain})
|
||||||
{
|
{
|
||||||
/($domainRE)/go or next;
|
if( $options{timefmt} )
|
||||||
$domain[0] = $1;
|
|
||||||
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
|
||||||
|
|
||||||
if($options{'3d'})
|
|
||||||
{
|
{
|
||||||
/($numRE)/go or next;
|
# no point if doing anything unless I have at least the domain and
|
||||||
$domain[1] = $1;
|
# 1 piece of data
|
||||||
|
next if @fields < $options{timefmt_Ncols}+1;
|
||||||
|
|
||||||
|
$domain[0] = join (' ', splice( @fields, 0, $options{timefmt_Ncols}) );
|
||||||
|
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
||||||
}
|
}
|
||||||
elsif( $options{monotonic} )
|
elsif(!$options{'3d'})
|
||||||
|
{
|
||||||
|
# no point if doing anything unless I have at least the domain and
|
||||||
|
# 1 piece of data
|
||||||
|
next if @fields < 1+1;
|
||||||
|
|
||||||
|
$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 )
|
if( defined $latestX && $domain0_numeric < $latestX )
|
||||||
{
|
{
|
||||||
@@ -656,7 +707,6 @@ sub mainThread
|
|||||||
else
|
else
|
||||||
{ $latestX = $domain0_numeric; }
|
{ $latestX = $domain0_numeric; }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -664,8 +714,7 @@ sub mainThread
|
|||||||
# $. on the data queue in that case
|
# $. on the data queue in that case
|
||||||
if(defined $dataQueue)
|
if(defined $dataQueue)
|
||||||
{
|
{
|
||||||
s/ ([\d]+)$//o;
|
$domain[0] = pop @fields;
|
||||||
$domain[0] = $1;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -675,13 +724,30 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $id = -1;
|
my $id = -1;
|
||||||
while (/$pointRE/go)
|
|
||||||
{
|
|
||||||
if($1 ne '') {$id = $1;}
|
|
||||||
else {$id++; }
|
|
||||||
|
|
||||||
pushPoint(getCurve($id),
|
while(@fields)
|
||||||
"@domain $2\n", $domain0_numeric);
|
{
|
||||||
|
if($options{dataid})
|
||||||
|
{
|
||||||
|
$id = shift @fields;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$id++;
|
||||||
|
}
|
||||||
|
|
||||||
|
# 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};
|
||||||
|
|
||||||
|
last if @fields < $rangesize;
|
||||||
|
|
||||||
|
pushPoint(getCurve($id),
|
||||||
|
join(' ',
|
||||||
|
@domain,
|
||||||
|
splice( @fields, 0, $rangesize ) ) . "\n",
|
||||||
|
$domain0_numeric);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -787,16 +853,36 @@ sub updateCurveOptions
|
|||||||
|
|
||||||
my $titleoption = defined $title ? "title \"$title\"" : "notitle";
|
my $titleoption = defined $title ? "title \"$title\"" : "notitle";
|
||||||
|
|
||||||
my $curvestyleall = '';
|
my ($curvestyleall);
|
||||||
$curvestyleall = $options{curvestyleall}
|
if( defined $options{curvestyle_hash}{$id} )
|
||||||
if defined $options{curvestyleall} && !defined $options{curvestyle_hash}{$id};
|
{
|
||||||
|
# I have a curve-specific style set with --curvestyle. This style lives in
|
||||||
|
# $curve->{extraoptions}, and it overrides the global styles
|
||||||
|
$curvestyleall = '';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$curvestyleall = $options{curvestyleall};
|
||||||
|
}
|
||||||
|
|
||||||
my $histoptions = $curve->{histoptions} || '';
|
my $histoptions = $curve->{histoptions} || '';
|
||||||
|
|
||||||
my $usingoptions = '';
|
my $usingoptions = '';
|
||||||
if( $options{timefmt} )
|
if( $options{timefmt} )
|
||||||
{
|
{
|
||||||
$usingoptions = "using 1:" . ($options{timefmt_Ncols}+1);
|
# with --timefmt I need an explicit 'using' specification. I specify the
|
||||||
|
# columns as 1:2:3..... I need the right number of columns (this is given
|
||||||
|
# as 1 + rangesize). I also need to start the range at the first column
|
||||||
|
# past the timefmt
|
||||||
|
|
||||||
|
# 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};
|
||||||
|
|
||||||
|
my @rest = map {$_ + $options{timefmt_Ncols}} (1..$rangesize);
|
||||||
|
|
||||||
|
$usingoptions = "using 1:" . join(':', @rest);
|
||||||
}
|
}
|
||||||
|
|
||||||
$curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $curvestyleall";
|
$curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $curvestyleall";
|
||||||
@@ -961,6 +1047,47 @@ Simple plotting of piped data:
|
|||||||
|
|
||||||
$ seq 5 | awk '{print 2*$1, $1*$1}' |
|
$ seq 5 | awk '{print 2*$1, $1*$1}' |
|
||||||
feedgnuplot --lines --points --legend 0 "data 0" --title "Test plot" --y2 1
|
feedgnuplot --lines --points --legend 0 "data 0" --title "Test plot" --y2 1
|
||||||
|
--terminal 'dumb 80,40' --exit
|
||||||
|
|
||||||
|
Test plot
|
||||||
|
|
||||||
|
10 ++------+--------+-------+-------+-------+--------+-------+------*A 25
|
||||||
|
+ + + + + + + + **#+
|
||||||
|
| : : : : : : data 0+**A*** |
|
||||||
|
| : : : : : : :** # |
|
||||||
|
9 ++.......................................................**.##....|
|
||||||
|
| : : : : : : ** :# |
|
||||||
|
| : : : : : : ** # |
|
||||||
|
| : : : : : :** ##: ++ 20
|
||||||
|
8 ++................................................A....#..........|
|
||||||
|
| : : : : : **: # : |
|
||||||
|
| : : : : : ** : ## : |
|
||||||
|
| : : : : : ** :# : |
|
||||||
|
| : : : : :** B : |
|
||||||
|
7 ++......................................**......##................|
|
||||||
|
| : : : : ** : ## : : ++ 15
|
||||||
|
| : : : : ** : # : : |
|
||||||
|
| : : : :** : ## : : |
|
||||||
|
6 ++..............................*A.......##.......................|
|
||||||
|
| : : : ** : ##: : : |
|
||||||
|
| : : : ** : # : : : |
|
||||||
|
| : : :** : ## : : : ++ 10
|
||||||
|
5 ++......................**........##..............................|
|
||||||
|
| : : ** : #B : : : |
|
||||||
|
| : : ** : ## : : : : |
|
||||||
|
| : :** : ## : : : : |
|
||||||
|
4 ++...............A.......###......................................|
|
||||||
|
| : **: ##: : : : : |
|
||||||
|
| : ** : ## : : : : : ++ 5
|
||||||
|
| : ** : ## : : : : : |
|
||||||
|
| :** ##B# : : : : : |
|
||||||
|
3 ++.....**..####...................................................|
|
||||||
|
| **#### : : : : : : |
|
||||||
|
| **## : : : : : : : |
|
||||||
|
B** + + + + + + + +
|
||||||
|
2 A+------+--------+-------+-------+-------+--------+-------+------++ 0
|
||||||
|
1 1.5 2 2.5 3 3.5 4 4.5 5
|
||||||
|
|
||||||
|
|
||||||
Simple real-time plotting example: plot how much data is received on the wlan0
|
Simple real-time plotting example: plot how much data is received on the wlan0
|
||||||
network interface in bytes/second (uses bash, awk and Linux):
|
network interface in bytes/second (uses bash, awk and Linux):
|
||||||
@@ -986,14 +1113,21 @@ plotting. Input parsing is flexible; every line need not have the same number of
|
|||||||
points. New curves will be created as needed.
|
points. New curves will be created as needed.
|
||||||
|
|
||||||
The most commonly used functionality of gnuplot is supported directly by the
|
The most commonly used functionality of gnuplot is supported directly by the
|
||||||
script. Anything not directly supported can still be done with the
|
script. Anything not directly supported can still be done with options such as
|
||||||
C<--extracmds> and C<--curvestyle> options. Arbitrary gnuplot commands can be
|
C<--set>, C<--extracmds> C<--style>, etc. Arbitrary gnuplot commands can be
|
||||||
passed in with C<--extracmds>. For example, to turn off the grid, pass in
|
passed in with C<--extracmds>. For example, to turn off the grid, you can pass
|
||||||
C<--extracmds 'unset grid'>. As many of these options as needed can be passed
|
in C<--extracmds 'unset grid'>. Commands C<--set> and C<--unset> exists to
|
||||||
in. To add arbitrary curve styles, use C<--curvestyle curveID extrastyle>. Pass
|
provide nicer syntax, so this is equivalent to passing C<--unset grid>. As many
|
||||||
these more than once to affect more than one curve. To apply an extra style to
|
of these options as needed can be passed in. To add arbitrary curve styles, use
|
||||||
I<all> the curves that lack an explicit C<--curvestyle>, pass in
|
C<--style curveID extrastyle>. Pass these more than once to affect more than one
|
||||||
C<--curvestyleall extrastyle>.
|
curve.
|
||||||
|
|
||||||
|
To apply an extra style to I<all> the curves that lack an explicit C<--style>,
|
||||||
|
pass in C<--styleall extrastyle>. In the most common case, the extra style is
|
||||||
|
C<with something>. To support this more simply, you can pass in C<--with
|
||||||
|
something> instead of C<--styleall 'with something'>. C<--styleall> and
|
||||||
|
C<--with> are mutually exclusive. Furthermore any curve-specific C<--style>
|
||||||
|
overrides the global C<--styleall> or C<--with> setting.
|
||||||
|
|
||||||
=head2 Data formats
|
=head2 Data formats
|
||||||
|
|
||||||
@@ -1009,7 +1143,7 @@ interpreted as the I<X>-value for the rest of the data on that line. Without
|
|||||||
C<--domain> the I<X>-value is the line number, and the first value on a line is
|
C<--domain> the I<X>-value is the line number, and the first value on a line is
|
||||||
a plain data point like the others. Default is C<--nodomain>. Thus the original
|
a plain data point like the others. Default is C<--nodomain>. Thus the original
|
||||||
example above produces 2 curves, with B<1,2,3,4,5> as the I<X>-values. If we run
|
example above produces 2 curves, with B<1,2,3,4,5> as the I<X>-values. If we run
|
||||||
the same command with --domain:
|
the same command with C<--domain>:
|
||||||
|
|
||||||
$ seq 5 | awk '{print 2*$1, $1*$1}' | feedgnuplot --domain
|
$ seq 5 | awk '{print 2*$1, $1*$1}' | feedgnuplot --domain
|
||||||
|
|
||||||
@@ -1036,18 +1170,24 @@ conjunction with C<--dataid>.
|
|||||||
=head3 Multi-value style support
|
=head3 Multi-value style support
|
||||||
|
|
||||||
Depending on how gnuplot is plotting the data, more than one value may be needed
|
Depending on how gnuplot is plotting the data, more than one value may be needed
|
||||||
to represent a single point. For example, the script has support to plot all the
|
to represent the range of a single point. Basic 2D plots have 2 numbers
|
||||||
data with C<--circles>. This requires a radius to be specified for each point in
|
representing each point: 1 domain and 1 range. But if plotting with
|
||||||
addition to the position of the point. Thus, when plotting with C<--circles>, 2
|
C<--circles>, for instance, then there's an extra range value: the radius. A
|
||||||
numbers are read for each data point instead of 1. A similar situation exists
|
similar situation exists with C<--colormap> where each point contains the
|
||||||
with C<--colormap> where each point contains the position I<and> the
|
position I<and> the color. There are other gnuplot styles that require more data
|
||||||
color. There are other gnuplot styles that require more data (such as error
|
(such as error bars), but none of these are directly supported by the script.
|
||||||
bars), but none of these are directly supported by the script. They can still be
|
They can still be used, however, by specifying the specific style with
|
||||||
used, though, by specifying the specific style with C<--curvestyle>, and
|
C<--style>, and specifying how many values are needed for each point with
|
||||||
specifying how many extra values are needed for each point with
|
C<--rangesizeall> or C<--rangesize> or C<--extraValuesPerPoint>. Those options
|
||||||
C<--extraValuesPerPoint extra>. C<--extraValuesPerPoint> is ONLY needed for the
|
that specify the range size are required I<only> for styles not explicitly
|
||||||
styles not explicitly supported; supported styles set that variable
|
supported by feedgnuplot; supported styles do the right thing automatically.
|
||||||
automatically.
|
|
||||||
|
More examples: if making a 2d plot of y error bars where gnuplot expects a
|
||||||
|
(x,y,ydelta) tuple for each point, you want C<--rangesizeall 2> because you have
|
||||||
|
one domain value (x) and 2 range values (y,ydelta). Gnuplot can also plot
|
||||||
|
lopsided y errorbars by giving a tuple (x,y,ylow,yhigh). This is similar as
|
||||||
|
before, but you want C<--rangesizeall 3> instead.
|
||||||
|
|
||||||
|
|
||||||
=head3 3D data
|
=head3 3D data
|
||||||
|
|
||||||
@@ -1063,7 +1203,7 @@ the same way as before.
|
|||||||
If the input data domain is a time/date, this can be interpreted with
|
If the input data domain is a time/date, this can be interpreted with
|
||||||
C<--timefmt>. This option takes a single argument: the format to use to parse
|
C<--timefmt>. This option takes a single argument: the format to use to parse
|
||||||
the data. The format is documented in 'set timefmt' in gnuplot, although the
|
the data. The format is documented in 'set timefmt' in gnuplot, although the
|
||||||
common flags that L<strftime> understands are generally supported. The backslash
|
common flags that C<strftime> understands are generally supported. The backslash
|
||||||
sequences in the format are I<not> supported, so if you want a tab, put in a tab
|
sequences in the format are I<not> supported, so if you want a tab, put in a tab
|
||||||
instead of \t. Whitespace in the format I<is> supported. When this flag is
|
instead of \t. Whitespace in the format I<is> supported. When this flag is
|
||||||
given, some other options act a little bit differently:
|
given, some other options act a little bit differently:
|
||||||
@@ -1082,7 +1222,7 @@ C<--xmin> and C<--xmax> I<must> use the format passed in to C<--timefmt>
|
|||||||
|
|
||||||
Using this option changes both the way the input is parsed I<and> the way the
|
Using this option changes both the way the input is parsed I<and> the way the
|
||||||
x-axis tics are labelled. Gnuplot tries to be intelligent in this labelling, but
|
x-axis tics are labelled. Gnuplot tries to be intelligent in this labelling, but
|
||||||
it doesn't always to what the user wants. The labelling can be controlled with
|
it doesn't always do what the user wants. The labelling can be controlled with
|
||||||
the gnuplot C<set format> command, which takes the same type of format string as
|
the gnuplot C<set format> command, which takes the same type of format string as
|
||||||
C<--timefmt>. Example:
|
C<--timefmt>. Example:
|
||||||
|
|
||||||
@@ -1090,7 +1230,7 @@ C<--timefmt>. Example:
|
|||||||
awk '$1 ~ /..:..:../ && $8 ~/^[0-9\.]*$/ {print $1,$8; fflush()}' |
|
awk '$1 ~ /..:..:../ && $8 ~/^[0-9\.]*$/ {print $1,$8; fflush()}' |
|
||||||
feedgnuplot --stream --domain
|
feedgnuplot --stream --domain
|
||||||
--lines --timefmt '%H:%M:%S'
|
--lines --timefmt '%H:%M:%S'
|
||||||
--extracmds 'set format x "%H:%M:%S"'
|
--set 'format x "%H:%M:%S"'
|
||||||
|
|
||||||
This plots the 'idle' CPU consumption against time.
|
This plots the 'idle' CPU consumption against time.
|
||||||
|
|
||||||
@@ -1107,7 +1247,7 @@ used. To refresh at specific intervals indicated by the data, set the
|
|||||||
refreshperiod to 0 or to 'trigger'. The plot will then I<only> be refreshed when
|
refreshperiod to 0 or to 'trigger'. The plot will then I<only> be refreshed when
|
||||||
a data line 'replot' is received. This 'replot' command works in both triggered
|
a data line 'replot' is received. This 'replot' command works in both triggered
|
||||||
and timed modes, but in triggered mode, it's the only way to replot. Look in
|
and timed modes, but in triggered mode, it's the only way to replot. Look in
|
||||||
L<Special data commands> for more information.
|
L</"Special data commands"> for more information.
|
||||||
|
|
||||||
To plot only the most recent data (instead of I<all> the data), C<--xlen
|
To plot only the most recent data (instead of I<all> the data), C<--xlen
|
||||||
windowsize> can be given. This will create an constantly-updating, scrolling
|
windowsize> can be given. This will create an constantly-updating, scrolling
|
||||||
@@ -1181,10 +1321,10 @@ data file can be plotted simply with
|
|||||||
|
|
||||||
$ ./data
|
$ ./data
|
||||||
|
|
||||||
The caveats here are that on Linux the whole #! line is limited to 127 charaters
|
The caveats here are that on Linux the whole #! line is limited to 127
|
||||||
and that the full path to feedgnuplot must be given. The 127 character limit is
|
characters and that the full path to feedgnuplot must be given. The 127
|
||||||
a serious limitation, but this can likely be resolved with a kernel patch. I
|
character limit is a serious limitation, but this can likely be resolved with a
|
||||||
have only tried on Linux 2.6.
|
kernel patch. I have only tried on Linux 2.6.
|
||||||
|
|
||||||
=head3 Self-plotting data with perl inline data
|
=head3 Self-plotting data with perl inline data
|
||||||
|
|
||||||
@@ -1230,14 +1370,14 @@ it to the plotter.
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--[no]domain
|
--C<[no]domain>
|
||||||
|
|
||||||
If enabled, the first element of each line is the domain variable. If not, the
|
If enabled, the first element of each line is the domain variable. If not, the
|
||||||
point index is used
|
point index is used
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--[no]dataid
|
--C<[no]dataid>
|
||||||
|
|
||||||
If enabled, each data point is preceded by the ID of the data set that point
|
If enabled, each data point is preceded by the ID of the data set that point
|
||||||
corresponds to. This ID is interpreted as a string, NOT as just a number. If not
|
corresponds to. This ID is interpreted as a string, NOT as just a number. If not
|
||||||
@@ -1249,23 +1389,23 @@ As an example, if line 3 of the input is "0 9 1 20" then
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
'--nodomain --nodataid' would parse the 4 numbers as points in 4 different
|
C<--nodomain --nodataid> would parse the 4 numbers as points in 4 different
|
||||||
curves at x=3
|
curves at x=3
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
'--domain --nodataid' would parse the 4 numbers as points in 3 different
|
C<--domain --nodataid> would parse the 4 numbers as points in 3 different
|
||||||
curves at x=0. Here, 0 is the x-variable and 9,1,20 are the data values
|
curves at x=0. Here, 0 is the x-variable and 9,1,20 are the data values
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
'--nodomain --dataid' would parse the 4 numbers as points in 2 different
|
C<--nodomain --dataid> would parse the 4 numbers as points in 2 different
|
||||||
curves at x=3. Here 0 and 1 are the data IDs and 9 and 20 are the
|
curves at x=3. Here 0 and 1 are the data IDs and 9 and 20 are the
|
||||||
data values
|
data values
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
'--domain --dataid' would parse the 4 numbers as a single point at
|
C<--domain --dataid> would parse the 4 numbers as a single point at
|
||||||
x=0. Here 9 is the data ID and 1 is the data value. 20 is an extra
|
x=0. Here 9 is the data ID and 1 is the data value. 20 is an extra
|
||||||
value, so it is ignored. If another value followed 20, we'd get another
|
value, so it is ignored. If another value followed 20, we'd get another
|
||||||
point in curve ID 20
|
point in curve ID 20
|
||||||
@@ -1274,85 +1414,83 @@ point in curve ID 20
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--[no]3d
|
C<--[no]3d>
|
||||||
|
|
||||||
Do [not] plot in 3D. This only makes sense with --domain. Each domain here is an
|
Do [not] plot in 3D. This only makes sense with C<--domain>. Each domain here is
|
||||||
(x,y) tuple
|
an (x,y) tuple
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--timefmt [format]
|
--C<timefmt [format]>
|
||||||
|
|
||||||
Interpret the X data as a time/date, parsed with the given format
|
Interpret the X data as a time/date, parsed with the given format
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--colormap
|
C<--colormap>
|
||||||
|
|
||||||
Show a colormapped xy plot. Requires extra data for the color. zmin/zmax can be
|
Show a colormapped xy plot. Requires extra data for the color. zmin/zmax can be
|
||||||
used to set the extents of the colors. Automatically increments
|
used to set the extents of the colors. Automatically sets the C<--rangesize>.
|
||||||
C<--extraValuesPerPoint>
|
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--stream [period]
|
C<--stream [period]>
|
||||||
|
|
||||||
Plot the data as it comes in, in realtime. If period is given, replot every
|
Plot the data as it comes in, in realtime. If period is given, replot every
|
||||||
period seconds. If no period is given, replot at 1Hz. If the period is given as
|
period seconds. If no period is given, replot at 1Hz. If the period is given as
|
||||||
0 or 'trigger', replot I<only> when the incoming data dictates this. See the
|
0 or 'trigger', replot I<only> when the incoming data dictates this. See the
|
||||||
L<Real-time streaming data> section of the man page.
|
L</"Real-time streaming data"> section of the man page.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--[no]lines
|
C<--[no]lines>
|
||||||
|
|
||||||
Do [not] draw lines to connect consecutive points
|
Do [not] draw lines to connect consecutive points
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--[no]points
|
C<--[no]points>
|
||||||
|
|
||||||
Do [not] draw points
|
Do [not] draw points
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--circles
|
C<--circles>
|
||||||
|
|
||||||
Plot with circles. This requires a radius be specified for each point.
|
Plot with circles. This requires a radius be specified for each point.
|
||||||
Automatically increments C<--extraValuesPerPoint). C<Not> supported for 3d
|
Automatically sets the C<--rangesize>. C<Not> supported for 3d plots.
|
||||||
plots.
|
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--title xxx
|
C<--title xxx>
|
||||||
|
|
||||||
Set the title of the plot
|
Set the title of the plot
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--legend curveID legend
|
C<--legend curveID legend>
|
||||||
|
|
||||||
Set the label for a curve plot. Use this option multiple times for multiple
|
Set the label for a curve plot. Use this option multiple times for multiple
|
||||||
curves. With --dataid, curveID is the ID. Otherwise, it's the index of the
|
curves. With C<--dataid>, curveID is the ID. Otherwise, it's the index of the
|
||||||
curve, starting at 0
|
curve, starting at 0
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--autolegend
|
C<--autolegend>
|
||||||
|
|
||||||
Use the curve IDs for the legend. Titles given with --legend override these
|
Use the curve IDs for the legend. Titles given with C<--legend> override these
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--xlen xxx
|
C<--xlen xxx>
|
||||||
|
|
||||||
When using --stream, sets the size of the x-window to plot. Omit this or set it
|
When using C<--stream>, sets the size of the x-window to plot. Omit this or set
|
||||||
to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
|
it to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
|
||||||
--monotonic
|
C<--monotonic>
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx
|
C<--xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx>
|
||||||
|
|
||||||
Set the range for the given axis. These x-axis bounds are ignored in a streaming
|
Set the range for the given axis. These x-axis bounds are ignored in a streaming
|
||||||
plot. The y2-axis bound do not apply in 3d plots. The z-axis bounds apply
|
plot. The y2-axis bound do not apply in 3d plots. The z-axis bounds apply
|
||||||
@@ -1360,52 +1498,52 @@ I<only> to 3d plots or colormaps.
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--xlabel/ylabel/y2label/zlabel xxx
|
C<--xlabel/ylabel/y2label/zlabel xxx>
|
||||||
|
|
||||||
Label the given axis. The y2-axis label does not apply to 3d plots while the
|
Label the given axis. The y2-axis label does not apply to 3d plots while the
|
||||||
z-axis label applies I<only> to 3d plots.
|
z-axis label applies I<only> to 3d plots.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--y2 xxx
|
C<--y2 xxx>
|
||||||
|
|
||||||
Plot the data specified by this curve ID on the y2 axis. Without --dataid, the
|
Plot the data specified by this curve ID on the y2 axis. Without C<--dataid>,
|
||||||
ID is just an ordered 0-based index. Does not apply to 3d plots. Can be passed
|
the ID is just an ordered 0-based index. Does not apply to 3d plots. Can be
|
||||||
multiple times, or passed a comma-separated list. By default the y2-axis curves
|
passed multiple times, or passed a comma-separated list. By default the y2-axis
|
||||||
look the same as the y-axis ones. I.e. the viewer of the resulting plot has to
|
curves look the same as the y-axis ones. I.e. the viewer of the resulting plot
|
||||||
be told which is which via an axes label, legend, etc. Prior to version 1.25 of
|
has to be told which is which via an axes label, legend, etc. Prior to version
|
||||||
feedgnuplot the curves plotted on the y2 axis were drawn with a thicker line.
|
1.25 of feedgnuplot the curves plotted on the y2 axis were drawn with a thicker
|
||||||
This is no longer the case, but that behavior can be brought back by passing
|
line. This is no longer the case, but that behavior can be brought back by
|
||||||
something like
|
passing something like
|
||||||
|
|
||||||
--y2 curveid --curvestyle curveid 'linewidth 3'
|
--y2 curveid --style curveid 'linewidth 3'
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--histogram curveID
|
C<--histogram curveID>
|
||||||
|
|
||||||
|
|
||||||
Set up a this specific curve to plot a histogram. The bin width is given with
|
Set up a this specific curve to plot a histogram. The bin width is given with
|
||||||
the --binwidth option (assumed 1.0 if omitted). --histogram does NOT touch the
|
the C<--binwidth> option (assumed 1.0 if omitted). C<--histogram> does I<not>
|
||||||
drawing style. It is often desired to plot these with boxes, and this MUST be
|
touch the drawing style. It is often desired to plot these with boxes, and this
|
||||||
explicitly requested with --curvestyleall 'with boxes'. This works with --domain
|
I<must> be explicitly requested by C<--with boxes>. This works with C<--domain>
|
||||||
and/or --stream, but in those cases the x-value is used ONLY to cull old data
|
and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
|
||||||
because of --xlen or --monotonic. I.e. the x-values are NOT drawn in any way.
|
data because of C<--xlen> or C<--monotonic>. I.e. the x-values are I<not> drawn
|
||||||
Can be passed multiple times, or passed a comma- separated list
|
in any way. Can be passed multiple times, or passed a comma- separated list
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--binwidth width
|
C<--binwidth width>
|
||||||
|
|
||||||
The width of bins when making histograms. This setting applies to ALL histograms
|
The width of bins when making histograms. This setting applies to ALL histograms
|
||||||
in the plot. Defaults to 1.0 if not given.
|
in the plot. Defaults to 1.0 if not given.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--histstyle style
|
C<--histstyle style>
|
||||||
|
|
||||||
Normally, histograms are generated with the 'smooth freq' gnuplot style.
|
Normally, histograms are generated with the 'smooth freq' gnuplot style.
|
||||||
--histstyle can be used to select different 'smooth' settings. Allowed are
|
C<--histstyle> can be used to select different 'smooth' settings. Allowed are
|
||||||
'unique', 'cumulative' and 'cnormal'. 'unique' indicates whether a bin has at
|
'unique', 'cumulative' and 'cnormal'. 'unique' indicates whether a bin has at
|
||||||
least one item in it: instead of counting the items, it'll always report 0 or 1.
|
least one item in it: instead of counting the items, it'll always report 0 or 1.
|
||||||
'cumulative' is the integral of the "normal" histogram. 'cnormal' is like
|
'cumulative' is the integral of the "normal" histogram. 'cnormal' is like
|
||||||
@@ -1413,58 +1551,100 @@ least one item in it: instead of counting the items, it'll always report 0 or 1.
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--curvestyle curveID
|
C<--style curveID style>
|
||||||
|
|
||||||
style Additional styles per curve. With --dataid, curveID is the ID. Otherwise,
|
Additional styles per curve. With C<--dataid>, curveID is the ID. Otherwise,
|
||||||
it's the index of the curve, starting at 0. Use this option multiple times for
|
it's the index of the curve, starting at 0. Use this option multiple times for
|
||||||
multiple curves. --curvestylall does NOT apply to curves that have a
|
multiple curves. C<--styleall> does I<not> apply to curves that have a
|
||||||
--curvestyle
|
C<--style>
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--curvestyleall xxx
|
C<--curvestyle curveID>
|
||||||
|
|
||||||
Additional styles for all curves that have no --curvestyle
|
Synonym for C<--style>
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--extracmds xxx
|
C<--styleall xxx>
|
||||||
|
|
||||||
Additional commands. These could contain extra global styles for instance. Can
|
Additional styles for all curves that have no C<--style>. This is overridden by
|
||||||
be passed multiple times.
|
any applicable C<--style>. Exclusive with C<--with>.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--square
|
C<--curvestyleall xxx>
|
||||||
|
|
||||||
|
Synonym for C<--styleall>
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
|
C<--with xxx>
|
||||||
|
|
||||||
|
Same as C<--styleall>, but prefixed with "with". Thus
|
||||||
|
|
||||||
|
--with boxes
|
||||||
|
|
||||||
|
is equivalent to
|
||||||
|
|
||||||
|
--styleall 'with boxes'
|
||||||
|
|
||||||
|
Exclusive with C<--styleall>.
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
|
C<--extracmds xxx>
|
||||||
|
|
||||||
|
Additional commands to pass on to gnuplot verbatim. These could contain extra
|
||||||
|
global styles for instance. Can be passed multiple times.
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
|
C<--set xxx>
|
||||||
|
|
||||||
|
Additional 'set' commands to pass on to gnuplot verbatim. C<--set 'a b c'> will
|
||||||
|
result in gnuplot seeing a C<set a b c> command. Can be passed multiple times.
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
|
C<--unset xxx>
|
||||||
|
|
||||||
|
Additional 'unset' commands to pass on to gnuplot verbatim. C<--unset 'a b c'>
|
||||||
|
will result in gnuplot seeing a C<unset a b c> command. Can be passed multiple
|
||||||
|
times.
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
|
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
|
||||||
all 3 axes
|
all 3 axes
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--square_xy
|
C<--square_xy>
|
||||||
|
|
||||||
For 3D plots, set square aspect ratio for ONLY the x,y axes
|
For 3D plots, set square aspect ratio for ONLY the x,y axes
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--hardcopy xxx
|
C<--hardcopy xxx>
|
||||||
|
|
||||||
If not streaming, output to a file specified here. Format inferred from
|
If not streaming, output to a file specified here. Format inferred from
|
||||||
filename, unless specified by --terminal
|
filename, unless specified by C<--terminal>
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--terminal xxx
|
C<--terminal xxx>
|
||||||
|
|
||||||
String passed to 'set terminal'. No attempts are made to validate this.
|
String passed to 'set terminal'. No attempts are made to validate this.
|
||||||
--hardcopy sets this to some sensible defaults if --hardcopy is given .png,
|
C<--hardcopy> sets this to some sensible defaults if --hardcopy is given .png,
|
||||||
.pdf, .ps, .eps or .svg. If any other file type is desired, use both --hardcopy
|
.pdf, .ps, .eps or .svg. If any other file type is desired, use both
|
||||||
and --terminal
|
C<--hardcopy> and C<--terminal>
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--maxcurves xxx
|
C<--maxcurves xxx>
|
||||||
|
|
||||||
The maximum allowed number of curves. This is 100 by default, but can be reset
|
The maximum allowed number of curves. This is 100 by default, but can be reset
|
||||||
with this option. This exists purely to prevent perl from allocating all of the
|
with this option. This exists purely to prevent perl from allocating all of the
|
||||||
@@ -1472,34 +1652,53 @@ system's memory when reading bogus data
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--monotonic
|
C<--monotonic>
|
||||||
|
|
||||||
If --domain is given, checks to make sure that the x- coordinate in the input
|
If C<--domain> is given, checks to make sure that the x- coordinate in the input
|
||||||
data is monotonically increasing. If a given x-variable is in the past, all data
|
data is monotonically increasing. If a given x-variable is in the past, all data
|
||||||
currently cached for this curve is purged. Without --monotonic, all data is
|
currently cached for this curve is purged. Without C<--monotonic>, all data is
|
||||||
kept. Does not make sense with 3d plots. No --monotonic by default. The data is
|
kept. Does not make sense with 3d plots. No C<--monotonic> by default. The data is
|
||||||
replotted before being purged
|
replotted before being purged
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--extraValuesPerPoint
|
C<--rangesize curveID xxx>
|
||||||
|
|
||||||
xxx How many extra values are given for each data point. Normally this is 0, and
|
The options C<--rangesizeall>, C<--rangesize> and C<--extraValuesPerPoint> set
|
||||||
does not need to be specified, but sometimes we want extra data, like for colors
|
the number of values are needed to represent each point being plotted (see
|
||||||
or point sizes or error bars, etc. feedgnuplot options that require this
|
L</"Multi-value style support"> above). These options are I<only> needed if
|
||||||
(colormap, circles) automatically set it. This option is ONLY needed if unknown
|
unknown styles are used, with C<--styleall> or C<--with> for instance.
|
||||||
styles are used, with --curvestyleall for instance
|
|
||||||
|
C<--rangesize> is used to set how many values are needed to represent the range
|
||||||
|
of a point for a particular curve. This overrides any defaults that may exist
|
||||||
|
for this curve only.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--dump
|
C<--rangesizeall xxx>
|
||||||
|
|
||||||
|
Like C<--rangesize>, but applies to I<all> the curves.
|
||||||
|
|
||||||
|
C<--extraValuesPerPoint xxx>
|
||||||
|
|
||||||
|
Like C<--rangesizeall>, but instead of overriding the default, adds to it. For
|
||||||
|
example, if plotting non-lopsided y errorbars gnuplot wants (x,y,ydelta) tuples.
|
||||||
|
These can be specified both with C<--rangesizeall 2> (because there are 2 range
|
||||||
|
values) or C<--extraValuesPerPoint 1> (because there's 1 more value than usual).
|
||||||
|
|
||||||
|
This option is I<only> needed if unknown styles are used, with C<--styleall> or
|
||||||
|
C<--with> for instance.
|
||||||
|
|
||||||
|
=item
|
||||||
|
|
||||||
|
C<--dump>
|
||||||
|
|
||||||
Instead of printing to gnuplot, print to STDOUT. Very useful for debugging. It
|
Instead of printing to gnuplot, print to STDOUT. Very useful for debugging. It
|
||||||
is possible to send the output produced this way to gnuplot directly.
|
is possible to send the output produced this way to gnuplot directly.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--exit
|
C<--exit>
|
||||||
|
|
||||||
Terminate the feedgnuplot process after passing data to gnuplot. The window will
|
Terminate the feedgnuplot process after passing data to gnuplot. The window will
|
||||||
persist but will not be interactive. Without this option feedgnuplot keeps
|
persist but will not be interactive. Without this option feedgnuplot keeps
|
||||||
@@ -1508,13 +1707,13 @@ later versions of gnuplot and only with some gnuplot terminals.
|
|||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--geometry
|
C<--geometry>
|
||||||
|
|
||||||
If using X11, specifies the size, position of the plot window
|
If using X11, specifies the size, position of the plot window
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
--version
|
C<--version>
|
||||||
|
|
||||||
Print the version and exit
|
Print the version and exit
|
||||||
|
|
||||||
@@ -1561,7 +1760,7 @@ in a Thinkpad.
|
|||||||
=head2 Plotting a histogram of file sizes in a directory
|
=head2 Plotting a histogram of file sizes in a directory
|
||||||
|
|
||||||
$ ls -l | awk '{print $5/1e6}' |
|
$ ls -l | awk '{print $5/1e6}' |
|
||||||
feedgnuplot --histogram 0 --curvestyleall 'with boxes' --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
|
feedgnuplot --histogram 0 --with boxes --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
|
||||||
|
|
||||||
=head1 ACKNOWLEDGEMENT
|
=head1 ACKNOWLEDGEMENT
|
||||||
|
|
||||||
|
@@ -7,12 +7,19 @@ complete -W \
|
|||||||
--colormap \
|
--colormap \
|
||||||
--curvestyle \
|
--curvestyle \
|
||||||
--curvestyleall \
|
--curvestyleall \
|
||||||
|
--style \
|
||||||
|
--styleall \
|
||||||
|
--with \
|
||||||
--dataid \
|
--dataid \
|
||||||
--domain \
|
--domain \
|
||||||
--dump \
|
--dump \
|
||||||
--exit \
|
--exit \
|
||||||
--extraValuesPerPoint \
|
--extraValuesPerPoint \
|
||||||
|
--rangesizeall \
|
||||||
|
--rangesize \
|
||||||
--extracmds \
|
--extracmds \
|
||||||
|
--set \
|
||||||
|
--unset \
|
||||||
--geometry \
|
--geometry \
|
||||||
--hardcopy \
|
--hardcopy \
|
||||||
--help \
|
--help \
|
||||||
|
@@ -26,17 +26,24 @@ _arguments -S
|
|||||||
'--zmin:min Z:' \
|
'--zmin:min Z:' \
|
||||||
'--zmax:max Z:' \
|
'--zmax:max Z:' \
|
||||||
'*--y2:plot to place on the Y2 axis:' \
|
'*--y2:plot to place on the Y2 axis:' \
|
||||||
'--curvestyleall[Additional styles for ALL curves]:style' \
|
'(--with)--curvestyleall[Additional styles for ALL curves]:style' \
|
||||||
|
'(--with)--styleall[Additional styles for ALL curves]:style' \
|
||||||
|
'(--curvestyleall)--with[Additional styles for ALL curves]:style' \
|
||||||
'*--extracmds[Additional gnuplot commands]:command' \
|
'*--extracmds[Additional gnuplot commands]:command' \
|
||||||
|
'*--set[Additional 'set' gnuplot commands]:set-option' \
|
||||||
|
'*--unset[Additional 'unset' gnuplot commands]:unset-option' \
|
||||||
'--square[Plot data with square aspect ratio]' \
|
'--square[Plot data with square aspect ratio]' \
|
||||||
'--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]' \
|
'--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]' \
|
||||||
'--hardcopy[Plot to a file]:filename' \
|
'--hardcopy[Plot to a file]:filename' \
|
||||||
'--maxcurves[The maximum allowed number of curves]:number of curves' \
|
'--maxcurves[The maximum allowed number of curves]:number of curves' \
|
||||||
'(--3d)--monotonic[Resets plot if an X in the past is seen]' \
|
'(--3d)--monotonic[Resets plot if an X in the past is seen]' \
|
||||||
'--extraValuesPerPoint[How many extra values are given for each data point]:N'\
|
'(--rangesizeall)--extraValuesPerPoint[How many extra values are given for each data range]:N'\
|
||||||
|
'(--extraValuesPerPoint)--rangesizeall[How many values are given for each data range]:N'\
|
||||||
|
'*--rangesize[How many values comprise a data range in this curve]:curve id: :N:' \
|
||||||
'--dump[Instead of printing to gnuplot, print to STDOUT]' \
|
'--dump[Instead of printing to gnuplot, print to STDOUT]' \
|
||||||
'--geometry[The X11 geometry string]:geometry string:' \
|
'--geometry[The X11 geometry string]:geometry string:' \
|
||||||
'*--curvestyle[Additional styles for a curve]:curve id: :style:' \
|
'*--curvestyle[Additional styles for a curve]:curve id: :style:' \
|
||||||
|
'*--style[Additional styles for a curve]:curve id: :style:' \
|
||||||
'(--3d)*--histogram:plot to treat as a histogram:' \
|
'(--3d)*--histogram:plot to treat as a histogram:' \
|
||||||
'--binwidth:Histogram bin width:' \
|
'--binwidth:Histogram bin width:' \
|
||||||
'--histstyle:Style of histogram:(frequency unique cumulative cnormal)' \
|
'--histstyle:Style of histogram:(frequency unique cumulative cnormal)' \
|
||||||
|
79
debian/changelog
vendored
Normal file
79
debian/changelog
vendored
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
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
|
19
debian/control
vendored
Normal file
19
debian/control
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
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
|
||||||
|
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.
|
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
|
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
|
@@ -1,111 +0,0 @@
|
|||||||
feedgnuplot (1.22) unstable; urgency=low
|
|
||||||
|
|
||||||
* removed --size option
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Mon, 03 Sep 2012 08:33:26 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.21) unstable; urgency=low
|
|
||||||
|
|
||||||
* removed the POD from the script to its own file
|
|
||||||
* fixed regression to allow no given extracmds, histogram or y2
|
|
||||||
options
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 02 Sep 2012 23:52:21 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.20) unstable; urgency=low
|
|
||||||
|
|
||||||
* no longer hardcoding 'x11' as the default terminal
|
|
||||||
* added histogram support
|
|
||||||
* generic terminals can now be requested
|
|
||||||
* --extracmds, --histogram, --y2 can now take comma-separated lists
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Fri, 31 Aug 2012 01:35:50 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.19) unstable; urgency=low
|
|
||||||
|
|
||||||
* added --geometry option to specify plot dimensions
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sat, 11 Feb 2012 21:04:42 -0800
|
|
||||||
|
|
||||||
feedgnuplot (1.18) unstable; urgency=low
|
|
||||||
|
|
||||||
* data-ids can now include characters such as -. Any non-whitespace
|
|
||||||
works
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Tue, 27 Dec 2011 16:47:36 -0800
|
|
||||||
|
|
||||||
feedgnuplot (1.17) unstable; urgency=low
|
|
||||||
|
|
||||||
[ Dima Kogan ]
|
|
||||||
* POD: removed -Winteractive, since this was apparently a mawk-ism
|
|
||||||
* added zsh and bash completions to the package
|
|
||||||
|
|
||||||
[ Hermann Schwarting ]
|
|
||||||
* add build dependency libtest-script-run-perl
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Nov 2011 19:17:22 -0800
|
|
||||||
|
|
||||||
feedgnuplot (1.16) unstable; urgency=low
|
|
||||||
|
|
||||||
* deb version parser now works for any package name
|
|
||||||
* Some POD fixes
|
|
||||||
* now building a native package
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Fri, 11 Nov 2011 00:10:18 -0800
|
|
||||||
|
|
||||||
feedgnuplot (1.15-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* added source format for the debianization
|
|
||||||
* added configuration to let git-buildpackage build this package
|
|
||||||
* standards bump to make lintian happier
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 23 Oct 2011 13:38:15 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.15-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Renamed main script from feedGnuplot to feedgnuplot
|
|
||||||
* Slightly improved packaging, added instructions, etc
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 16 Oct 2011 11:58:15 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.14-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release (added 'clear' command, documented commands)
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 22 May 2011 15:25:28 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.13-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release (Better streaming plot control)
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Tue, 26 Apr 2011 14:24:09 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.12-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Tue, 19 Apr 2011 11:02:23 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.11-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sat, 09 Apr 2011 14:10:21 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.10-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sat, 09 Apr 2011 14:08:06 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.09-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 03 Apr 2011 17:23:38 -0700
|
|
||||||
|
|
||||||
feedgnuplot (1.08-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Initial debianized release.
|
|
||||||
|
|
||||||
-- Dima Kogan <dima@secretsauce.net> Sun, 6 Feb 2011 15:58:22 -0800
|
|
@@ -1 +0,0 @@
|
|||||||
7
|
|
@@ -1,20 +0,0 @@
|
|||||||
Source: feedgnuplot
|
|
||||||
Section: science
|
|
||||||
Priority: extra
|
|
||||||
Build-Depends: debhelper (>= 7), libtest-script-run-perl, perl
|
|
||||||
Maintainer: Dima Kogan <dima@secretsauce.net>
|
|
||||||
Uploaders: Dima Kogan <dima@secretsauce.net>
|
|
||||||
Standards-Version: 3.9.3
|
|
||||||
Homepage: https://github.com/dkogan/feedgnuplot
|
|
||||||
Vcs-Git: git://github.com/dkogan/feedgnuplot.git
|
|
||||||
Vcs-Browser: https://github.com/dkogan/feedgnuplot
|
|
||||||
DM-Upload-Allowed: yes
|
|
||||||
|
|
||||||
Package: feedgnuplot
|
|
||||||
Architecture: all
|
|
||||||
Depends: ${misc:Depends}, ${perl:Depends}, 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.
|
|
@@ -1,5 +0,0 @@
|
|||||||
[DEFAULT]
|
|
||||||
upstream-tree = branch
|
|
||||||
upstream-branch = master
|
|
||||||
debian-branch = master
|
|
||||||
debian-tag = debian-%(version)s
|
|
@@ -1,4 +0,0 @@
|
|||||||
#!/usr/bin/make -f
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@
|
|
@@ -1 +0,0 @@
|
|||||||
3.0 (native)
|
|
588
t/plots.t
588
t/plots.t
@@ -5,7 +5,9 @@
|
|||||||
# change the way the output looks will show up as test failures. Currently the
|
# change the way the output looks will show up as test failures. Currently the
|
||||||
# reference plots come from gnuplot 4.6.4, and I make sure this is the version
|
# reference plots come from gnuplot 4.6.4, and I make sure this is the version
|
||||||
# we're testing with
|
# we're testing with
|
||||||
|
#
|
||||||
|
# Note that some tests are only executed when the RUN_ALL_TESTS environment
|
||||||
|
# variable is set.
|
||||||
|
|
||||||
# require a threaded perl for my tests. This block lifted verbatim from the cpantesters wiki
|
# require a threaded perl for my tests. This block lifted verbatim from the cpantesters wiki
|
||||||
BEGIN {
|
BEGIN {
|
||||||
@@ -15,14 +17,20 @@ BEGIN {
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
open(my $pipe, 'gnuplot --version |');
|
my $gawkversion = `gawk -V`;
|
||||||
if( !$pipe )
|
if( !$gawkversion || $@ )
|
||||||
|
{
|
||||||
|
print("1..0 # Skip: gawk is required for strftime() in the test suite. Skipping tests.\n");
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
my $gnuplotVersion = `gnuplot --version`;
|
||||||
|
if( !$gnuplotVersion || $@)
|
||||||
{
|
{
|
||||||
print("1..0 # Skip: gnuplot not installed. Tests require ver. 4.6.4; feedgnuplot works with any.\n");
|
print("1..0 # Skip: gnuplot not installed. Tests require ver. 4.6.4; feedgnuplot works with any.\n");
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
my $gnuplotVersion = <$pipe>;
|
|
||||||
chomp $gnuplotVersion;
|
chomp $gnuplotVersion;
|
||||||
if ($gnuplotVersion ne "gnuplot 4.6 patchlevel 4")
|
if ($gnuplotVersion ne "gnuplot 4.6 patchlevel 4")
|
||||||
{
|
{
|
||||||
@@ -31,7 +39,7 @@ BEGIN {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
use Test::More tests => 52;
|
use Test::More tests => 58;
|
||||||
use File::Temp 'tempfile';
|
use File::Temp 'tempfile';
|
||||||
use IPC::Run 'run';
|
use IPC::Run 'run';
|
||||||
use String::ShellQuote;
|
use String::ShellQuote;
|
||||||
@@ -318,7 +326,7 @@ tryplot( testname => 'basic line plot with bounds, square aspect ratio',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'lines on both axes with labels, legends, titles',
|
tryplot( testname => 'lines on both axes with labels, legends, titles',
|
||||||
cmd => q{seq 5 | awk '{print 2*$1, $1*$1}'},
|
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
|
||||||
options => [qw(--lines --points),
|
options => [qw(--lines --points),
|
||||||
'--legend', '0', 'data 0',
|
'--legend', '0', 'data 0',
|
||||||
'--title', "Test plot",
|
'--title', "Test plot",
|
||||||
@@ -367,7 +375,7 @@ tryplot( testname => 'lines on both axes with labels, legends, titles',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'lines on both axes with labels, legends, titles; different styles',
|
tryplot( testname => 'lines on both axes with labels, legends, titles; different styles',
|
||||||
cmd => q{seq 5 | awk '{print 2*$1, $1*$1}'},
|
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
|
||||||
options => ['--legend', '0', 'data 0',
|
options => ['--legend', '0', 'data 0',
|
||||||
'--title', "Test plot",
|
'--title', "Test plot",
|
||||||
qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30),
|
qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30),
|
||||||
@@ -417,7 +425,7 @@ tryplot( testname => 'lines on both axes with labels, legends, titles; different
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'domain plot',
|
tryplot( testname => 'domain plot',
|
||||||
cmd => q{seq 5 | awk '{print 2*$1, $1*$1}'},
|
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
|
||||||
options => [qw(--lines --points), '--domain'],
|
options => [qw(--lines --points), '--domain'],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -463,7 +471,7 @@ tryplot( testname => 'domain plot',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'dataid plot',
|
tryplot( testname => 'dataid plot',
|
||||||
cmd => q{seq 5 | awk '{print 2*$1, $1*$1}'},
|
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
|
||||||
options => [qw(--lines --points),
|
options => [qw(--lines --points),
|
||||||
qw(--dataid --autolegend)],
|
qw(--dataid --autolegend)],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
@@ -510,7 +518,7 @@ tryplot( testname => 'dataid plot',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => '3d spiral with bounds, labels',
|
tryplot( testname => '3d spiral with bounds, labels',
|
||||||
cmd => q{seq 50 | awk '{print 2*cos($1/5), sin($1/5), $1}'},
|
cmd => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'},
|
||||||
options => [qw(--lines --points),
|
options => [qw(--lines --points),
|
||||||
qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
|
qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
|
||||||
'--extracmds', 'set view 60,30'],
|
'--extracmds', 'set view 60,30'],
|
||||||
@@ -558,7 +566,7 @@ tryplot( testname => '3d spiral with bounds, labels',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
|
tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
|
||||||
cmd => q{seq 50 | awk '{print 2*cos($1/5), sin($1/5), $1}'},
|
cmd => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'},
|
||||||
options => [qw(--lines --points),
|
options => [qw(--lines --points),
|
||||||
qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
|
qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
|
||||||
'--extracmds', 'set view 60,30', '--square_xy'],
|
'--extracmds', 'set view 60,30', '--square_xy'],
|
||||||
@@ -603,197 +611,10 @@ tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
tryplot( testname => 'Histogram plot',
|
|
||||||
cmd => q{seq 50 | awk '{print $1*$1}'},
|
|
||||||
options => [qw(--lines --points),
|
|
||||||
qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
|
|
||||||
refplot => <<'EOF' );
|
|
||||||
|
|
||||||
|
|
||||||
4 ++----------****----------+------------+-----------+------------+------------+-----------++
|
|
||||||
+ *+** + + + + + +
|
|
||||||
| * ** |
|
|
||||||
| * ** |
|
|
||||||
3.5 ++ * ** ++
|
|
||||||
| * ** |
|
|
||||||
| * ** |
|
|
||||||
| * ** |
|
|
||||||
| * ** |
|
|
||||||
3 ++ * *** ++
|
|
||||||
| * *** |
|
|
||||||
| * *** |
|
|
||||||
| * *** |
|
|
||||||
2.5 ++ * *** ++
|
|
||||||
| * *** |
|
|
||||||
| * *** |
|
|
||||||
| * *** |
|
|
||||||
2 ++ * **** *** ++
|
|
||||||
| * **** *** |
|
|
||||||
| * **** *** |
|
|
||||||
| * **** *** |
|
|
||||||
| * **** *** |
|
|
||||||
1.5 ++ * **** *** ++
|
|
||||||
| * **** *** |
|
|
||||||
| * **** *** |
|
|
||||||
| * **** *** |
|
|
||||||
1 ++ * ************************** ******** ************************** ** ++
|
|
||||||
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
|
||||||
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
|
||||||
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
|
||||||
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
|
||||||
0.5 ++ * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** ++
|
|
||||||
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
|
||||||
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
|
||||||
+ *+**** *** **** *** **** *** **** *** **** *** **** *** **** *** ** +
|
|
||||||
0 ++----------****************************-********-**************************-**----------++
|
|
||||||
-500 0 500 1000 1500 2000 2500 3000
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
tryplot( testname => 'Cumulative histogram',
|
|
||||||
cmd => q{seq 50 | awk '{print $1*$1}'},
|
|
||||||
options => [qw(--lines --points),
|
|
||||||
qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
|
|
||||||
refplot => <<'EOF' );
|
|
||||||
|
|
||||||
|
|
||||||
50 ++-----------+------------+------------+------------+------------+-----------***----------++
|
|
||||||
+ + + + + + ** ***+* +
|
|
||||||
| **** *** * |
|
|
||||||
| *** **** *** * |
|
|
||||||
| ** *** **** *** * |
|
|
||||||
| ***** *** **** *** * |
|
|
||||||
| **** *** *** **** *** * |
|
|
||||||
40 ++ ** **** *** *** **** *** * ++
|
|
||||||
| ****** **** *** *** **** *** * |
|
|
||||||
| ***** *** **** *** *** **** *** * |
|
|
||||||
| *** *** *** **** *** *** **** *** * |
|
|
||||||
| ****** *** *** **** *** *** **** *** * |
|
|
||||||
| ** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ****** **** *** *** **** *** *** **** *** * |
|
|
||||||
30 ++ *** *** **** *** *** **** *** *** **** *** * ++
|
|
||||||
| ****** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| *** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ****** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ****** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
20 ++ *** *** **** *** *** **** *** *** **** *** *** **** *** * ++
|
|
||||||
| ****** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| *** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ****** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
10 ++ ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * ++
|
|
||||||
| *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| ***** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
| * *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
|
||||||
+ *+*** **** ***+*** **** ***+*** **** ***+*** **** ***+*** **** ***+* +
|
|
||||||
0 ++----------********************************************-********+***-****-*****----------++
|
|
||||||
-500 0 500 1000 1500 2000 2500 3000
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
tryplot( testname => 'Circles',
|
|
||||||
cmd => q{seq 5 | awk '{print $1,$1,$1/10}'},
|
|
||||||
options => [qw(--circles --domain)],
|
|
||||||
refplot => <<'EOF' );
|
|
||||||
|
|
||||||
|
|
||||||
5 ++-------+--------+--------+--------+--------+--------+--------+--------*******************
|
|
||||||
+ + + + + + + + * + *+
|
|
||||||
| * * *|
|
|
||||||
| ******** * *|
|
|
||||||
4.5 ++ ** ** * *+
|
|
||||||
| ** ** ** **|
|
|
||||||
| ** ** ** ** |
|
|
||||||
| * * ** ** |
|
|
||||||
| * * ** ** |
|
|
||||||
4 ++ * ** ********** ++
|
|
||||||
| * * |
|
|
||||||
| * * |
|
|
||||||
| * * * |
|
|
||||||
3.5 ++ ****** ** ** ++
|
|
||||||
| * * ** ** |
|
|
||||||
| * * ** ** |
|
|
||||||
| * * ******** |
|
|
||||||
3 ++ * ** ++
|
|
||||||
| * * |
|
|
||||||
| * * |
|
|
||||||
| * * |
|
|
||||||
| * * |
|
|
||||||
2.5 ++ * ****** ++
|
|
||||||
| ****** |
|
|
||||||
| ** ** |
|
|
||||||
| * * |
|
|
||||||
2 ++ * ** ++
|
|
||||||
| * ** |
|
|
||||||
| * * |
|
|
||||||
| ** ** |
|
|
||||||
| ****** |
|
|
||||||
1.5 ++ ++
|
|
||||||
| |
|
|
||||||
| * |
|
|
||||||
+ **** + + + + + + + + +
|
|
||||||
1 ++-----*-+**------+--------+--------+--------+--------+--------+--------+--------+-------++
|
|
||||||
0.5 1 1.5 2 2.5 3 3.5 4 4.5 5 5.5
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
tryplot( testname => 'Error bars (using extraValuesPerPoint)',
|
|
||||||
cmd => q{seq 5 | awk '{print $1,$1,$1/10}'},
|
|
||||||
options => [qw(--domain),
|
|
||||||
qw(--extraValuesPerPoint 1 --curvestyle 0), 'with errorbars'],
|
|
||||||
refplot => <<'EOF' );
|
|
||||||
|
|
||||||
|
|
||||||
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
|
|
||||||
+ + + + + + + + *
|
|
||||||
| *
|
|
||||||
5 ++ +A
|
|
||||||
| *
|
|
||||||
| *
|
|
||||||
| *
|
|
||||||
4.5 ++ **
|
|
||||||
| *** |
|
|
||||||
| * |
|
|
||||||
4 ++ A ++
|
|
||||||
| * |
|
|
||||||
| * |
|
|
||||||
| *** |
|
|
||||||
3.5 ++ ++
|
|
||||||
| *** |
|
|
||||||
| * |
|
|
||||||
3 ++ A ++
|
|
||||||
| * |
|
|
||||||
| * |
|
|
||||||
| *** |
|
|
||||||
2.5 ++ ++
|
|
||||||
| |
|
|
||||||
| *** |
|
|
||||||
2 ++ A ++
|
|
||||||
| * |
|
|
||||||
| *** |
|
|
||||||
| |
|
|
||||||
1.5 ++ ++
|
|
||||||
| |
|
|
||||||
| |
|
|
||||||
1 A* ++
|
|
||||||
** |
|
|
||||||
| |
|
|
||||||
+ + + + + + + + +
|
|
||||||
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
|
|
||||||
1 1.5 2 2.5 3 3.5 4 4.5 5
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'Monotonicity check',
|
tryplot( testname => 'Monotonicity check',
|
||||||
cmd => q{seq 10 | awk '{print (NR-1)%5,NR}'},
|
cmd => q{seq 10 | gawk '{print (NR-1)%5,NR}'},
|
||||||
options => [qw(--lines --points --domain --monotonic)],
|
options => [qw(--lines --points --domain --monotonic)],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -840,7 +661,7 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
tryplot( testname => 'basic --timefmt plot',
|
tryplot( testname => 'basic --timefmt plot',
|
||||||
cmd => q{seq 5 | awk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
|
cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
|
||||||
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S'],
|
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S'],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -886,7 +707,7 @@ tryplot( testname => 'basic --timefmt plot',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => '--timefmt plot with bounds',
|
tryplot( testname => '--timefmt plot with bounds',
|
||||||
cmd => q{seq 5 | awk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
|
cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
|
||||||
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
||||||
'--xmin', '20 Oct 2013 06:05:00',
|
'--xmin', '20 Oct 2013 06:05:00',
|
||||||
'--xmax', '20 Oct 2013 06:05:20'],
|
'--xmax', '20 Oct 2013 06:05:20'],
|
||||||
@@ -934,7 +755,7 @@ tryplot( testname => '--timefmt plot with bounds',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => '--timefmt plot with --monotonic',
|
tryplot( testname => '--timefmt plot with --monotonic',
|
||||||
cmd => q{seq 10 | awk '{x=(NR-1)%5; print strftime("%d %b %Y %T",1382249107+x,1),$1}'},
|
cmd => q{seq 10 | gawk '{x=(NR-1)%5; print strftime("%d %b %Y %T",1382249107+x,1),$1}'},
|
||||||
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
||||||
'--monotonic'],
|
'--monotonic'],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
@@ -980,6 +801,354 @@ tryplot( testname => '--timefmt plot with --monotonic',
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
tryplot( testname => '--timefmt with custom rangesize',
|
||||||
|
cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1,$1/10}'},
|
||||||
|
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
||||||
|
qw(--with errorbars --rangesizeall 2)],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
|
||||||
|
+ + + + + + + + *
|
||||||
|
| *
|
||||||
|
5 ++ +A
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
4.5 ++ **
|
||||||
|
| *** |
|
||||||
|
| * |
|
||||||
|
4 ++ A ++
|
||||||
|
| * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
3.5 ++ ++
|
||||||
|
| *** |
|
||||||
|
| * |
|
||||||
|
3 ++ A ++
|
||||||
|
| * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
2.5 ++ ++
|
||||||
|
| |
|
||||||
|
| *** |
|
||||||
|
2 ++ A ++
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
| |
|
||||||
|
1.5 ++ ++
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
1 A* ++
|
||||||
|
** |
|
||||||
|
| |
|
||||||
|
+ + + + + + + + +
|
||||||
|
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
|
||||||
|
05:08 05:08 05:09 05:09 05:10 05:10 05:11 05:11 05:12
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
tryplot( testname => 'Error bars (using extraValuesPerPoint)',
|
||||||
|
cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'},
|
||||||
|
options => [qw(--domain),
|
||||||
|
qw(--extraValuesPerPoint 1 --with errorbars)],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
|
||||||
|
+ + + + + + + + *
|
||||||
|
| *
|
||||||
|
5 ++ +A
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
4.5 ++ **
|
||||||
|
| *** |
|
||||||
|
| * |
|
||||||
|
4 ++ A ++
|
||||||
|
| * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
3.5 ++ ++
|
||||||
|
| *** |
|
||||||
|
| * |
|
||||||
|
3 ++ A ++
|
||||||
|
| * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
2.5 ++ ++
|
||||||
|
| |
|
||||||
|
| *** |
|
||||||
|
2 ++ A ++
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
| |
|
||||||
|
1.5 ++ ++
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
1 A* ++
|
||||||
|
** |
|
||||||
|
| |
|
||||||
|
+ + + + + + + + +
|
||||||
|
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
|
||||||
|
1 1.5 2 2.5 3 3.5 4 4.5 5
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
tryplot( testname => 'Error bars (using rangesizeall)',
|
||||||
|
cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'},
|
||||||
|
options => [qw(--domain),
|
||||||
|
qw(--rangesizeall 2 --with errorbars)],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
|
||||||
|
+ + + + + + + + *
|
||||||
|
| *
|
||||||
|
5 ++ +A
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
4.5 ++ **
|
||||||
|
| *** |
|
||||||
|
| * |
|
||||||
|
4 ++ A ++
|
||||||
|
| * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
3.5 ++ ++
|
||||||
|
| *** |
|
||||||
|
| * |
|
||||||
|
3 ++ A ++
|
||||||
|
| * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
2.5 ++ ++
|
||||||
|
| |
|
||||||
|
| *** |
|
||||||
|
2 ++ A ++
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
| |
|
||||||
|
1.5 ++ ++
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
1 A* ++
|
||||||
|
** |
|
||||||
|
| |
|
||||||
|
+ + + + + + + + +
|
||||||
|
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
|
||||||
|
1 1.5 2 2.5 3 3.5 4 4.5 5
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
tryplot( testname => 'Error bars (using rangesize, rangesizeall)',
|
||||||
|
cmd => q{seq 5 | gawk '{print $1,"vert",$1,$1/10,"horiz",5-$1,$1-$1/5,$1+$1/20}'},
|
||||||
|
options => [qw(--domain --dataid),
|
||||||
|
qw(--rangesize vert 2 --rangesizeall 3 --with xerrorbars --style vert), 'with errorbars',
|
||||||
|
qw(--xmin 1 --xmax 5 --ymin 0.5 --ymax 5.5)],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
+-----------+----------+-----------+----------+-----------+----------+-----------+---------**
|
||||||
|
+ + + + + + + + *
|
||||||
|
| *
|
||||||
|
5 ++ +A
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
| *
|
||||||
|
| **
|
||||||
|
| *** |
|
||||||
|
## * |
|
||||||
|
4 B# A ++
|
||||||
|
## * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
| |
|
||||||
|
| *** |
|
||||||
|
| # # * |
|
||||||
|
3 ++ #########B## A ++
|
||||||
|
| # # * |
|
||||||
|
| * |
|
||||||
|
| *** |
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
| *** # # |
|
||||||
|
2 ++ A ##############B### ++
|
||||||
|
| * # # |
|
||||||
|
| *** |
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
| # # |
|
||||||
|
1 A* ##################B##### ++
|
||||||
|
** # # |
|
||||||
|
| |
|
||||||
|
+ + + + + + + + +
|
||||||
|
+-----------+----------+-----------+----------+-----------+----------+-----------+----------+
|
||||||
|
1 1.5 2 2.5 3 3.5 4 4.5 5
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
SKIP:
|
||||||
|
{
|
||||||
|
|
||||||
|
# Some tests aren't 100% reliable, so I do not include them in automated testing. These are
|
||||||
|
#
|
||||||
|
# - Histogram and circle-plotting tests: these have inconsistent round-off
|
||||||
|
# behavior on different arches; specifically 32-bit and 64-bit x86. So both
|
||||||
|
# plots look fine, but not identical, thus the tests fail
|
||||||
|
#
|
||||||
|
# - Streaming tests. These tests have a temporal component, so the loading of
|
||||||
|
# the host machine can cause a test failure. It's fine pretty much all the
|
||||||
|
# time on my not-too-new laptop, but this is bad for automated testing
|
||||||
|
|
||||||
|
skip "Skipping unreliable tests. Set RUN_ALL_TESTS environment variable to run them all", 18 unless $ENV{RUN_ALL_TESTS};
|
||||||
|
|
||||||
|
|
||||||
|
tryplot( testname => 'Histogram plot',
|
||||||
|
cmd => q{seq 50 | gawk '{print $1*$1}'},
|
||||||
|
options => [qw(--lines --points),
|
||||||
|
qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
4 ++----------****----------+------------+-----------+------------+------------+-----------++
|
||||||
|
+ *+** + + + + + +
|
||||||
|
| * ** |
|
||||||
|
| * ** |
|
||||||
|
3.5 ++ * ** ++
|
||||||
|
| * ** |
|
||||||
|
| * ** |
|
||||||
|
| * ** |
|
||||||
|
| * ** |
|
||||||
|
3 ++ * *** ++
|
||||||
|
| * *** |
|
||||||
|
| * *** |
|
||||||
|
| * *** |
|
||||||
|
2.5 ++ * *** ++
|
||||||
|
| * *** |
|
||||||
|
| * *** |
|
||||||
|
| * *** |
|
||||||
|
2 ++ * **** *** ++
|
||||||
|
| * **** *** |
|
||||||
|
| * **** *** |
|
||||||
|
| * **** *** |
|
||||||
|
| * **** *** |
|
||||||
|
1.5 ++ * **** *** ++
|
||||||
|
| * **** *** |
|
||||||
|
| * **** *** |
|
||||||
|
| * **** *** |
|
||||||
|
1 ++ * ************************** ******** ************************** ** ++
|
||||||
|
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
||||||
|
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
||||||
|
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
||||||
|
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
||||||
|
0.5 ++ * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** ++
|
||||||
|
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
||||||
|
| * **** *** **** *** **** *** **** *** **** *** **** *** **** *** ** |
|
||||||
|
+ *+**** *** **** *** **** *** **** *** **** *** **** *** **** *** ** +
|
||||||
|
0 ++----------****************************-********-**************************-**----------++
|
||||||
|
-500 0 500 1000 1500 2000 2500 3000
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
tryplot( testname => 'Cumulative histogram',
|
||||||
|
cmd => q{seq 50 | gawk '{print $1*$1}'},
|
||||||
|
options => [qw(--lines --points),
|
||||||
|
qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
50 ++-----------+------------+------------+------------+------------+-----------***----------++
|
||||||
|
+ + + + + + ** ***+* +
|
||||||
|
| **** *** * |
|
||||||
|
| *** **** *** * |
|
||||||
|
| ** *** **** *** * |
|
||||||
|
| ***** *** **** *** * |
|
||||||
|
| **** *** *** **** *** * |
|
||||||
|
40 ++ ** **** *** *** **** *** * ++
|
||||||
|
| ****** **** *** *** **** *** * |
|
||||||
|
| ***** *** **** *** *** **** *** * |
|
||||||
|
| *** *** *** **** *** *** **** *** * |
|
||||||
|
| ****** *** *** **** *** *** **** *** * |
|
||||||
|
| ** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ****** **** *** *** **** *** *** **** *** * |
|
||||||
|
30 ++ *** *** **** *** *** **** *** *** **** *** * ++
|
||||||
|
| ****** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| *** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ****** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ****** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
20 ++ *** *** **** *** *** **** *** *** **** *** *** **** *** * ++
|
||||||
|
| ****** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| *** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ****** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
10 ++ ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * ++
|
||||||
|
| *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| ***** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
| * *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** * |
|
||||||
|
+ *+*** **** ***+*** **** ***+*** **** ***+*** **** ***+*** **** ***+* +
|
||||||
|
0 ++----------********************************************-********+***-****-*****----------++
|
||||||
|
-500 0 500 1000 1500 2000 2500 3000
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
tryplot( testname => 'Circles',
|
||||||
|
cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'},
|
||||||
|
options => [qw(--circles --domain)],
|
||||||
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
|
|
||||||
|
5 ++-------+--------+--------+--------+--------+--------+--------+--------*******************
|
||||||
|
+ + + + + + + + * + *+
|
||||||
|
| * * *|
|
||||||
|
| ******** * *|
|
||||||
|
4.5 ++ ** ** * *+
|
||||||
|
| ** ** ** **|
|
||||||
|
| ** ** ** ** |
|
||||||
|
| * * ** ** |
|
||||||
|
| * * ** ** |
|
||||||
|
4 ++ * ** ********** ++
|
||||||
|
| * * |
|
||||||
|
| * * |
|
||||||
|
| * * * |
|
||||||
|
3.5 ++ ****** ** ** ++
|
||||||
|
| * * ** ** |
|
||||||
|
| * * ** ** |
|
||||||
|
| * * ******** |
|
||||||
|
3 ++ * ** ++
|
||||||
|
| * * |
|
||||||
|
| * * |
|
||||||
|
| * * |
|
||||||
|
| * * |
|
||||||
|
2.5 ++ * ****** ++
|
||||||
|
| ****** |
|
||||||
|
| ** ** |
|
||||||
|
| * * |
|
||||||
|
2 ++ * ** ++
|
||||||
|
| * ** |
|
||||||
|
| * * |
|
||||||
|
| ** ** |
|
||||||
|
| ****** |
|
||||||
|
1.5 ++ ++
|
||||||
|
| |
|
||||||
|
| * |
|
||||||
|
+ **** + + + + + + + + +
|
||||||
|
1 ++-----*-+**------+--------+--------+--------+--------+--------+--------+--------+-------++
|
||||||
|
0.5 1 1.5 2 2.5 3 3.5 4 4.5 5 5.5
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -989,7 +1158,7 @@ note( "Starting to run streaming tests. These will take several seconds each" );
|
|||||||
# points, and then "exit", so I should have two frames worth of data plotted. I
|
# points, and then "exit", so I should have two frames worth of data plotted. I
|
||||||
# pre-send a 0 so that the gnuplot autoscaling is always well-defined
|
# pre-send a 0 so that the gnuplot autoscaling is always well-defined
|
||||||
tryplot( testname => 'basic streaming test',
|
tryplot( testname => 'basic streaming test',
|
||||||
cmd => q{seq 500 | awk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 1.2");}'},
|
cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 1.2");}'},
|
||||||
options => [qw(--lines --points --stream)],
|
options => [qw(--lines --points --stream)],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -1075,7 +1244,7 @@ tryplot( testname => 'basic streaming test',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'basic streaming test, twice as fast',
|
tryplot( testname => 'basic streaming test, twice as fast',
|
||||||
cmd => q{seq 500 | awk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
|
cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
|
||||||
options => [qw(--lines --points --stream 0.4)],
|
options => [qw(--lines --points --stream 0.4)],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -1162,7 +1331,7 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
tryplot( testname => 'streaming with --xlen',
|
tryplot( testname => 'streaming with --xlen',
|
||||||
cmd => q{seq 500 | awk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
|
cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
|
||||||
options => [qw(--lines --points --stream 0.4 --xlen 1.1)],
|
options => [qw(--lines --points --stream 0.4 --xlen 1.1)],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -1248,7 +1417,7 @@ tryplot( testname => 'streaming with --xlen',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => 'streaming with --monotonic',
|
tryplot( testname => 'streaming with --monotonic',
|
||||||
cmd => q{seq 500 | awk '{if(NR==11) {print "exit";} else {x=(NR-1)%5; if(x==0) {print -1,-1;} print x,NR;}; fflush(); system("sleep 0.6");}'},
|
cmd => q{seq 500 | gawk '{if(NR==11) {print "exit";} else {x=(NR-1)%5; if(x==0) {print -1,-1;} print x,NR;}; fflush(); system("sleep 0.6");}'},
|
||||||
options => [qw(--lines --points --stream 0.4 --domain --monotonic)],
|
options => [qw(--lines --points --stream 0.4 --domain --monotonic)],
|
||||||
refplot => <<'EOF' );
|
refplot => <<'EOF' );
|
||||||
|
|
||||||
@@ -1654,7 +1823,7 @@ tryplot( testname => 'streaming with --monotonic',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => '--timefmt streaming plot with --xlen',
|
tryplot( testname => '--timefmt streaming plot with --xlen',
|
||||||
cmd => q{seq 5 | awk 'BEGIN{ print strftime("%d %b %Y %T",1382249107-1,1),-4;} {if(NR==3) {print "exit";} else{ print strftime("%d %b %Y %T",1382249107+$1,1),$1;} fflush(); system("sleep 0.6")}'},
|
cmd => q{seq 5 | gawk 'BEGIN{ print strftime("%d %b %Y %T",1382249107-1,1),-4;} {if(NR==3) {print "exit";} else{ print strftime("%d %b %Y %T",1382249107+$1,1),$1;} fflush(); system("sleep 0.6")}'},
|
||||||
options => ['--points', '--lines',
|
options => ['--points', '--lines',
|
||||||
'--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
'--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
||||||
qw(--stream 0.4 --xlen 3)],
|
qw(--stream 0.4 --xlen 3)],
|
||||||
@@ -1742,7 +1911,7 @@ tryplot( testname => '--timefmt streaming plot with --xlen',
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
tryplot( testname => '--timefmt streaming plot with --monotonic',
|
tryplot( testname => '--timefmt streaming plot with --monotonic',
|
||||||
cmd => q{seq 10 | awk '{x=(NR-1)%5; if(x==0) {print strftime("%d %b %Y %T",1382249107-1,-4),-4;} print strftime("%d %b %Y %T",1382249107+x,1),NR; fflush(); system("sleep 0.6")}'},
|
cmd => q{seq 10 | gawk '{x=(NR-1)%5; if(x==0) {print strftime("%d %b %Y %T",1382249107-1,-4),-4;} print strftime("%d %b %Y %T",1382249107+x,1),NR; fflush(); system("sleep 0.6")}'},
|
||||||
options => ['--points', '--lines',
|
options => ['--points', '--lines',
|
||||||
'--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
'--domain', '--timefmt', '%d %b %Y %H:%M:%S',
|
||||||
qw(--stream 0.4 --monotonic)],
|
qw(--stream 0.4 --monotonic)],
|
||||||
@@ -2149,6 +2318,7 @@ tryplot( testname => '--timefmt streaming plot with --monotonic',
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -2157,7 +2327,7 @@ sub tryplot
|
|||||||
my %args = @_;
|
my %args = @_;
|
||||||
|
|
||||||
my @options = ('--exit',
|
my @options = ('--exit',
|
||||||
'--extracmds', 'unset grid',
|
qw(--unset grid),
|
||||||
'--terminal', 'dumb 100,40');
|
'--terminal', 'dumb 100,40');
|
||||||
unshift @options, @{$args{options}};
|
unshift @options, @{$args{options}};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user