mirror of
https://github.com/dkogan/feedgnuplot.git
synced 2025-09-18 19:18:06 +08:00
Compare commits
142 Commits
v1.36
...
debian/1.4
Author | SHA1 | Date | |
---|---|---|---|
![]() |
6f4816efd5 | ||
![]() |
008dc01d17 | ||
![]() |
a0c9e6e8bc | ||
![]() |
64b12e4738 | ||
![]() |
402fa32bda | ||
![]() |
7da37a0015 | ||
![]() |
a48b834512 | ||
![]() |
fc1a8af4bf | ||
![]() |
4da7705077 | ||
![]() |
b76c18a92d | ||
![]() |
888583abe9 | ||
![]() |
e17f110269 | ||
![]() |
89a185f8a6 | ||
![]() |
35ed74eaf1 | ||
![]() |
07f574a929 | ||
![]() |
5dce1d8cda | ||
![]() |
048b0db65c | ||
![]() |
b0877a8926 | ||
![]() |
8ad58134e1 | ||
![]() |
e6cb0830e8 | ||
![]() |
4958bda912 | ||
![]() |
3860d8281b | ||
![]() |
4f9adb6e11 | ||
![]() |
167e85d2a7 | ||
![]() |
5123ca73d3 | ||
![]() |
d4ca90e1bd | ||
![]() |
9e669044c7 | ||
![]() |
cacbedb336 | ||
![]() |
18994e68e1 | ||
![]() |
f8ed461571 | ||
![]() |
f01431dd1e | ||
![]() |
1e51157c0b | ||
![]() |
9a476c6429 | ||
![]() |
80b6030996 | ||
![]() |
232b68b819 | ||
![]() |
12eb829f16 | ||
![]() |
80b5d0ab61 | ||
![]() |
960c43e758 | ||
![]() |
2ecdfb9aef | ||
![]() |
e064c29daa | ||
![]() |
3d85dba82a | ||
![]() |
f6a20cf8d8 | ||
![]() |
9497e9d751 | ||
![]() |
f9174031cc | ||
![]() |
ab26e54e20 | ||
![]() |
9d98b84546 | ||
![]() |
5609773b5b | ||
![]() |
ac06d5410a | ||
![]() |
199796d874 | ||
![]() |
a9d1b533fb | ||
![]() |
0f0e51a159 | ||
![]() |
73ed9b545a | ||
![]() |
10987c5187 | ||
![]() |
9ae728805d | ||
![]() |
f790ac4683 | ||
![]() |
af94ddf457 | ||
![]() |
abc37bfa1e | ||
![]() |
19c56ae041 | ||
![]() |
417ceb2bcc | ||
![]() |
a374e71fae | ||
![]() |
0551483616 | ||
![]() |
48fb730f0b | ||
![]() |
2fbc8f62d3 | ||
![]() |
670a5b84f9 | ||
![]() |
b92093464b | ||
![]() |
516077cbd0 | ||
![]() |
f8e69778a2 | ||
![]() |
7dca5c31bf | ||
![]() |
a6fef8c9f4 | ||
![]() |
987b7d90be | ||
![]() |
d7e30ac655 | ||
![]() |
ece4b29a2a | ||
![]() |
bbd2a44bf9 | ||
![]() |
d2613db253 | ||
![]() |
2217a1a1ba | ||
![]() |
184102a420 | ||
![]() |
1cca6c8eb4 | ||
![]() |
78368597c8 | ||
![]() |
4de5984551 | ||
![]() |
512d515ff6 | ||
![]() |
1d1b5e6808 | ||
![]() |
40b18cf8f9 | ||
![]() |
5283810abe | ||
![]() |
9ab429e618 | ||
![]() |
14a39b6fd2 | ||
![]() |
d705699459 | ||
![]() |
8867cf54f0 | ||
![]() |
52b9024320 | ||
![]() |
6809545a16 | ||
![]() |
a66e45adb5 | ||
![]() |
8557cd4870 | ||
![]() |
88fbd90a28 | ||
![]() |
d9906d8e88 | ||
![]() |
186b7a3ae0 | ||
![]() |
62eb5f17bb | ||
![]() |
a164c4ff29 | ||
![]() |
30d5b10fd6 | ||
![]() |
f2d4b7d78b | ||
![]() |
00d2f0d6a6 | ||
![]() |
0ccffde918 | ||
![]() |
805060ba92 | ||
![]() |
6ba7fc053c | ||
![]() |
21c38efc2d | ||
![]() |
7833e63c32 | ||
![]() |
d9e5067f20 | ||
![]() |
44a81e153d | ||
![]() |
458367883a | ||
![]() |
d4997cbba7 | ||
![]() |
5dcffaa62d | ||
![]() |
5cf323a97c | ||
![]() |
229c08582d | ||
![]() |
04876fa72e | ||
![]() |
e61e831ef2 | ||
![]() |
e5973e4fd6 | ||
![]() |
df2c78a85e | ||
![]() |
472520fdd8 | ||
![]() |
54f7f17558 | ||
![]() |
a8dc63c472 | ||
![]() |
10a4d35e97 | ||
![]() |
70946c92c2 | ||
![]() |
a8f5b99c23 | ||
![]() |
5cb7e3616a | ||
![]() |
b9ce0ea175 | ||
![]() |
d6381c747b | ||
![]() |
a054645a71 | ||
![]() |
0ce0f8a3f0 | ||
![]() |
3171f272fc | ||
![]() |
1cced9a621 | ||
![]() |
3132b76caa | ||
![]() |
b90e783f69 | ||
![]() |
9b0bc07ae4 | ||
![]() |
7bcb3920a1 | ||
![]() |
0ec6cb3d6d | ||
![]() |
9edb99d4cd | ||
![]() |
a1fac377a8 | ||
![]() |
80a5fac5f2 | ||
![]() |
f6fc00f3f2 | ||
![]() |
02d3f2bc92 | ||
![]() |
f682fa0816 | ||
![]() |
1e63a87a3d | ||
![]() |
47846ea562 | ||
![]() |
36d1db13a3 |
38
Changes
38
Changes
@@ -1,3 +1,41 @@
|
|||||||
|
feedgnuplot (1.41)
|
||||||
|
|
||||||
|
* Histograms: --xlen can coexist with --xmin/--xmax
|
||||||
|
* Histograms: work as expected with --xlen and --monotonic
|
||||||
|
* Histograms: better sanity checking of options
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 24 Feb 2017 23:42:28 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.40)
|
||||||
|
|
||||||
|
* If the options couldn't be parsed I don't dump the whole manpage
|
||||||
|
* --style and --rangesize can now take a comma-separated list of IDs
|
||||||
|
* 'any' is from List::MoreUtils, not List::Util
|
||||||
|
* the sleep-forever delay at end is now > 1000 days
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 25 Nov 2016 14:45:06 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.39)
|
||||||
|
|
||||||
|
* by default, histograms are plotted in expected ways
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sat, 15 Oct 2016 20:45:15 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.38)
|
||||||
|
|
||||||
|
* hardcopy defaults:
|
||||||
|
- no enhanced text mode
|
||||||
|
- larger font size
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 27 Jul 2016 22:15:11 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.37)
|
||||||
|
|
||||||
|
* At the end of a streaming plot, include the last chunk of data
|
||||||
|
* Added --equation to the completions
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 01 Jan 2016 08:09:43 -0800
|
||||||
|
|
||||||
feedgnuplot (1.36)
|
feedgnuplot (1.36)
|
||||||
|
|
||||||
* Added --equation to plot symbolic equations
|
* Added --equation to plot symbolic equations
|
||||||
|
@@ -64,6 +64,7 @@ WriteMakefile
|
|||||||
PL_FILES => {},
|
PL_FILES => {},
|
||||||
EXE_FILES => [ 'bin/feedgnuplot' ],
|
EXE_FILES => [ 'bin/feedgnuplot' ],
|
||||||
BUILD_REQUIRES => { 'String::ShellQuote' => 0,
|
BUILD_REQUIRES => { 'String::ShellQuote' => 0,
|
||||||
|
'List::MoreUtils' => 0,
|
||||||
'IPC::Run' => 0},
|
'IPC::Run' => 0},
|
||||||
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
||||||
clean => { FILES => 'feedgnuplot-*' },
|
clean => { FILES => 'feedgnuplot-*' },
|
||||||
|
330
bin/feedgnuplot
330
bin/feedgnuplot
@@ -9,12 +9,13 @@ use Time::HiRes qw( usleep gettimeofday tv_interval );
|
|||||||
use IO::Handle;
|
use IO::Handle;
|
||||||
use IO::Select;
|
use IO::Select;
|
||||||
use List::Util qw( first );
|
use List::Util qw( first );
|
||||||
|
use List::MoreUtils 'any';
|
||||||
use Scalar::Util qw( looks_like_number );
|
use Scalar::Util qw( looks_like_number );
|
||||||
use Text::ParseWords; # for shellwords
|
use Text::ParseWords; # for shellwords
|
||||||
use Pod::Usage;
|
use Pod::Usage;
|
||||||
use Time::Piece;
|
use Time::Piece;
|
||||||
|
|
||||||
my $VERSION = 1.36;
|
my $VERSION = 1.41;
|
||||||
|
|
||||||
my %options;
|
my %options;
|
||||||
interpretCommandline();
|
interpretCommandline();
|
||||||
@@ -56,6 +57,17 @@ mainThread();
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
sub getRangeSize
|
||||||
|
{
|
||||||
|
my ($id) = @_;
|
||||||
|
|
||||||
|
# I'd like to use //, but I guess some people are still on perl 5.8
|
||||||
|
return
|
||||||
|
exists $options{rangesize_hash}{$id} ?
|
||||||
|
$options{rangesize_hash}{$id} :
|
||||||
|
$options{rangesize_default};
|
||||||
|
}
|
||||||
|
|
||||||
sub interpretCommandline
|
sub interpretCommandline
|
||||||
{
|
{
|
||||||
# if I'm using a self-plotting data file with a #! line, then $ARGV[0] will contain ALL of the
|
# if I'm using a self-plotting data file with a #! line, then $ARGV[0] will contain ALL of the
|
||||||
@@ -108,9 +120,7 @@ sub interpretCommandline
|
|||||||
'terminal=s',
|
'terminal=s',
|
||||||
'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
|
'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
|
||||||
'help', 'dump', 'exit', 'version',
|
'help', 'dump', 'exit', 'version',
|
||||||
'geometry=s') or pod2usage( -exitval => 1,
|
'geometry=s') or exit 1;
|
||||||
-verbose => 1, # synopsis and args
|
|
||||||
-output => \*STDERR );
|
|
||||||
|
|
||||||
|
|
||||||
# handle various cmdline-option errors
|
# handle various cmdline-option errors
|
||||||
@@ -127,28 +137,72 @@ sub interpretCommandline
|
|||||||
exit 0;
|
exit 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# --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}; }
|
||||||
|
delete $options{styleall};
|
||||||
|
}
|
||||||
|
|
||||||
|
push @{$options{curvestyle}}, @{$options{style}};
|
||||||
|
delete $options{style};
|
||||||
|
|
||||||
|
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}";
|
||||||
|
delete $options{with};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# 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))
|
||||||
{
|
{
|
||||||
@{$options{$listkey}} = map split('\s*,\s*', $_), @{$options{$listkey}}
|
@{$options{$listkey}} = map split('\s*,\s*', $_), @{$options{$listkey}}
|
||||||
if defined $options{$listkey};
|
if defined $options{$listkey};
|
||||||
}
|
}
|
||||||
|
for my $listkey (qw(curvestyle rangesize))
|
||||||
# --style and --curvestyle are synonyms, as are --styleall and
|
|
||||||
# --curvestyleall, so fill that in
|
|
||||||
if( $options{styleall} )
|
|
||||||
{
|
{
|
||||||
if($options{curvestyleall} )
|
next unless defined $options{$listkey};
|
||||||
{
|
my @in = @{$options{$listkey}};
|
||||||
$options{curvestyleall} .= " $options{styleall}";
|
my $N = @in / 2;
|
||||||
}
|
my @out;
|
||||||
else
|
for my $i (0..$N-1)
|
||||||
{
|
{
|
||||||
$options{curvestyleall} = $options{styleall};
|
my $key = $in[2*$i];
|
||||||
}
|
my $value = $in[2*$i + 1];
|
||||||
}
|
for my $key_new (split('\s*,\s*', $key))
|
||||||
push @{$options{curvestyle}}, @{$options{style}};
|
{
|
||||||
|
push @out, $key_new, $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@{$options{$listkey}} = @out;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# If we're plotting histograms, then set the default histogram options for
|
||||||
|
# each histogram curve
|
||||||
|
#
|
||||||
|
# Apply this to plain (non-cumulative) histograms
|
||||||
|
if( !$options{curvestyleall} && $options{histstyle} =~ /freq|fnorm/ )
|
||||||
|
{
|
||||||
|
for my $hist_curve(@{$options{histogram}})
|
||||||
|
{
|
||||||
|
# If we don't specify any options specifically for this histogram, use
|
||||||
|
# the defaults: filled boxes with borders
|
||||||
|
if( !any { $options{curvestyle}[$_*2] eq $hist_curve } 0..(@{$options{curvestyle}}/2 - 1) )
|
||||||
|
{
|
||||||
|
push @{$options{curvestyle}}, ($hist_curve, 'with boxes fill solid border lt -1');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# --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
|
||||||
@@ -179,7 +233,10 @@ sub interpretCommandline
|
|||||||
|
|
||||||
|
|
||||||
# I now set up the rangesize to always be
|
# I now set up the rangesize to always be
|
||||||
# $options{rangesize_hash}{$id} // $options{rangesize_default}
|
#
|
||||||
|
# $options{rangesize_hash}{$id} // $options{rangesize_default}
|
||||||
|
#
|
||||||
|
# which is available as getRangeSize($id)
|
||||||
if ( $options{rangesizeall} )
|
if ( $options{rangesizeall} )
|
||||||
{
|
{
|
||||||
$options{rangesize_default} = $options{rangesizeall};
|
$options{rangesize_default} = $options{rangesizeall};
|
||||||
@@ -231,17 +288,6 @@ 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
|
||||||
@@ -249,6 +295,13 @@ sub interpretCommandline
|
|||||||
$options{curvestyleall} .= ' palette';
|
$options{curvestyleall} .= ' palette';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( defined $options{binwidth} && !@{$options{histogram}} )
|
||||||
|
{
|
||||||
|
print STDERR "--binwidth doesn't make sense without any histograms\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if ( $options{'3d'} )
|
if ( $options{'3d'} )
|
||||||
{
|
{
|
||||||
if ( !$options{domain} )
|
if ( !$options{domain} )
|
||||||
@@ -281,7 +334,7 @@ sub interpretCommandline
|
|||||||
exit -1;
|
exit -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( defined $options{binwidth} || @{$options{histogram}} )
|
if ( @{$options{histogram}} )
|
||||||
{
|
{
|
||||||
print STDERR "--3d does not make sense with histograms\n";
|
print STDERR "--3d does not make sense with histograms\n";
|
||||||
exit -1;
|
exit -1;
|
||||||
@@ -315,6 +368,16 @@ sub interpretCommandline
|
|||||||
print STDERR "--square_xy only makes sense with --3d\n";
|
print STDERR "--square_xy only makes sense with --3d\n";
|
||||||
exit -1;
|
exit -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for my $hist_curve(@{$options{histogram}})
|
||||||
|
{
|
||||||
|
my $hist_dim = getRangeSize($hist_curve);
|
||||||
|
if( $hist_dim != 1 )
|
||||||
|
{
|
||||||
|
print STDERR "I only support 1D histograms, but curve '$hist_curve' has '$hist_dim'-D data\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(defined $options{xlen} && !$options{stream} )
|
if(defined $options{xlen} && !$options{stream} )
|
||||||
@@ -324,7 +387,8 @@ sub interpretCommandline
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($options{stream} && defined $options{xlen} &&
|
if($options{stream} && defined $options{xlen} &&
|
||||||
( defined $options{xmin} || defined $options{xmax}))
|
( defined $options{xmin} || defined $options{xmax}) &&
|
||||||
|
!defined $options{histogram})
|
||||||
{
|
{
|
||||||
print STDERR "With --stream and --xlen the X bounds are set, so neither --xmin nor --xmax make sense\n";
|
print STDERR "With --stream and --xlen the X bounds are set, so neither --xmin nor --xmax make sense\n";
|
||||||
exit -1;
|
exit -1;
|
||||||
@@ -333,9 +397,9 @@ sub interpretCommandline
|
|||||||
# --xlen implies an order to the data, so I force monotonicity
|
# --xlen implies an order to the data, so I force monotonicity
|
||||||
$options{monotonic} = 1 if defined $options{xlen};
|
$options{monotonic} = 1 if defined $options{xlen};
|
||||||
|
|
||||||
if( $options{histstyle} !~ /freq|cum|uniq|cnorm/ )
|
if( $options{histstyle} !~ /freq|cum|uniq|cnorm|fnorm/ )
|
||||||
{
|
{
|
||||||
print STDERR "unknown histstyle. Allowed are 'freq...', 'cum...', 'uniq...', 'cnorm...'\n";
|
print STDERR "unknown histstyle. Allowed are 'freq...', 'fnorm...', 'cum...', 'uniq...', 'cnorm...'\n";
|
||||||
exit -1;
|
exit -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -497,11 +561,11 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
my %terminalOpts =
|
my %terminalOpts =
|
||||||
( eps => 'postscript solid color enhanced eps',
|
( eps => 'postscript noenhanced solid color enhanced eps',
|
||||||
ps => 'postscript solid color landscape 10',
|
ps => 'postscript noenhanced solid color landscape 12',
|
||||||
pdf => 'pdfcairo solid color font ",10" size 11in,8.5in',
|
pdf => 'pdfcairo noenhanced solid color font ",12" size 11in,8.5in',
|
||||||
png => 'png size 1280,1024',
|
png => 'png noenhanced size 1280,1024',
|
||||||
svg => 'svg');
|
svg => 'svg noenhanced');
|
||||||
|
|
||||||
if( !defined $options{terminal} &&
|
if( !defined $options{terminal} &&
|
||||||
defined $outputfileType &&
|
defined $outputfileType &&
|
||||||
@@ -552,7 +616,7 @@ sub mainThread
|
|||||||
print(PIPE "set view equal xy\n");
|
print(PIPE "set view equal xy\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
# 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(@{$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,
|
||||||
@@ -567,13 +631,11 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# add the extra curve options
|
# add the extra curve options
|
||||||
if(@{$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).
|
||||||
# $options{curvestyle_hash} because I create a new curve when I see a new
|
|
||||||
# one, and the hash is unordered, thus messing up the ordering
|
|
||||||
my $n = scalar @{$options{curvestyle}}/2;
|
my $n = scalar @{$options{curvestyle}}/2;
|
||||||
foreach my $idx (0..$n-1)
|
foreach my $idx (0..$n-1)
|
||||||
{
|
{
|
||||||
@@ -582,22 +644,22 @@ 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
|
||||||
addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}});
|
addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}});
|
||||||
|
|
||||||
# timefmt
|
# timefmt
|
||||||
if( $options{timefmt} )
|
if( $options{timefmt} )
|
||||||
{
|
{
|
||||||
print(PIPE "set timefmt '$options{timefmt}'\n");
|
print(PIPE "set timefmt '$options{timefmt}'\n");
|
||||||
print(PIPE "set xdata time\n");
|
print(PIPE "set xdata time\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
# add the extra global options
|
# add the extra global options
|
||||||
print(PIPE "$_\n") foreach (@{$options{extracmds}});
|
print(PIPE "$_\n") foreach (@{$options{extracmds}});
|
||||||
print(PIPE "set $_\n") foreach (@{$options{set}});
|
print(PIPE "set $_\n") foreach (@{$options{set}});
|
||||||
print(PIPE "unset $_\n") foreach (@{$options{unset}});
|
print(PIPE "unset $_\n") foreach (@{$options{unset}});
|
||||||
|
|
||||||
# set up histograms
|
# set up histograms
|
||||||
$options{binwidth} ||= 1; # if no binwidth given, set it to 1
|
$options{binwidth} ||= 1; # if no binwidth given, set it to 1
|
||||||
print PIPE
|
print PIPE
|
||||||
"set boxwidth $options{binwidth}\n" .
|
"set boxwidth $options{binwidth}\n" .
|
||||||
@@ -605,11 +667,6 @@ sub mainThread
|
|||||||
|
|
||||||
setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
|
setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
|
||||||
|
|
||||||
# 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
|
|
||||||
# gnuplot
|
|
||||||
print PIPE "set xtics\n";
|
|
||||||
|
|
||||||
if(@{$options{y2}})
|
if(@{$options{y2}})
|
||||||
{
|
{
|
||||||
print PIPE "set ytics nomirror\n";
|
print PIPE "set ytics nomirror\n";
|
||||||
@@ -724,20 +781,10 @@ sub mainThread
|
|||||||
|
|
||||||
while(@fields)
|
while(@fields)
|
||||||
{
|
{
|
||||||
if($options{dataid})
|
if($options{dataid}) { $id = shift @fields; }
|
||||||
{
|
else { $id++; }
|
||||||
$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};
|
|
||||||
|
|
||||||
|
my $rangesize = getRangeSize($id);
|
||||||
last if @fields < $rangesize;
|
last if @fields < $rangesize;
|
||||||
|
|
||||||
pushPoint(getCurve($id),
|
pushPoint(getCurve($id),
|
||||||
@@ -749,7 +796,7 @@ sub mainThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
# finished reading in all. Plot what we have
|
# finished reading in all. Plot what we have
|
||||||
plotStoredData() unless $options{stream};
|
plotStoredData() unless $options{stream} && $options{exit};
|
||||||
|
|
||||||
if ( defined $options{hardcopy})
|
if ( defined $options{hardcopy})
|
||||||
{
|
{
|
||||||
@@ -780,7 +827,7 @@ sub mainThread
|
|||||||
# we persist gnuplot, so we shouldn't need this sleep. However, once
|
# we persist gnuplot, so we shouldn't need this sleep. However, once
|
||||||
# gnuplot exits, but the persistent window sticks around, you can no
|
# gnuplot exits, but the persistent window sticks around, you can no
|
||||||
# longer interactively zoom the plot. So we still sleep
|
# longer interactively zoom the plot. So we still sleep
|
||||||
sleep(100000) unless $options{dump} || $options{exit};
|
sleep(100000000) unless $options{dump} || $options{exit};
|
||||||
}
|
}
|
||||||
|
|
||||||
sub pruneOldData
|
sub pruneOldData
|
||||||
@@ -851,19 +898,6 @@ sub updateCurveOptions
|
|||||||
{ $title = $id; }
|
{ $title = $id; }
|
||||||
|
|
||||||
my $titleoption = defined $title ? "title \"$title\"" : "notitle";
|
my $titleoption = defined $title ? "title \"$title\"" : "notitle";
|
||||||
|
|
||||||
my ($curvestyleall);
|
|
||||||
if( 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 = '';
|
||||||
@@ -874,17 +908,12 @@ sub updateCurveOptions
|
|||||||
# as 1 + rangesize). I also need to start the range at the first column
|
# as 1 + rangesize). I also need to start the range at the first column
|
||||||
# past the timefmt
|
# past the timefmt
|
||||||
|
|
||||||
# I'd like to use //, but I guess some people are still on perl 5.8
|
my @rest = map {$_ + $options{timefmt_Ncols}} (1..getRangeSize($id));
|
||||||
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);
|
$usingoptions = "using 1:" . join(':', @rest);
|
||||||
}
|
}
|
||||||
|
|
||||||
$curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $curvestyleall";
|
$curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $options{curvestyleall}";
|
||||||
}
|
}
|
||||||
|
|
||||||
sub getCurve
|
sub getCurve
|
||||||
@@ -910,6 +939,22 @@ sub getCurve
|
|||||||
$curveIndices{$id} = $#curves;
|
$curveIndices{$id} = $#curves;
|
||||||
|
|
||||||
updateCurveOptions($curves[$#curves], $id);
|
updateCurveOptions($curves[$#curves], $id);
|
||||||
|
|
||||||
|
|
||||||
|
# --xlen has a meaning if we're not plotting histograms at all or if we're
|
||||||
|
# plotting ONLY histograms. If we're doing both at the same time, there's no
|
||||||
|
# consistent way to assign meaning to xlen
|
||||||
|
if ( defined $options{xlen} &&
|
||||||
|
|
||||||
|
# have at least some histograms
|
||||||
|
@{$options{histogram}} &&
|
||||||
|
|
||||||
|
# there are more curves than histogram curves, i.e. there're some
|
||||||
|
# non-histogram curves
|
||||||
|
@curves > @{$options{histogram}} ) {
|
||||||
|
print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $curves[$curveIndices{$id}];
|
return $curves[$curveIndices{$id}];
|
||||||
}
|
}
|
||||||
@@ -937,6 +982,10 @@ sub setCurveAsHistogram
|
|||||||
my ($id, $str) = @_;
|
my ($id, $str) = @_;
|
||||||
|
|
||||||
my $curve = getCurve($id);
|
my $curve = getCurve($id);
|
||||||
|
|
||||||
|
# With histograms I have 2d plots with rangesize=1. I thus give gnuplot two
|
||||||
|
# values for each point: a domain and a range. For histograms I ignore the
|
||||||
|
# domain, so I get the statistics of the 2nd column: $2
|
||||||
$curve->{histoptions} = 'using (histbin($2)):(1.0) smooth ' . $options{histstyle};
|
$curve->{histoptions} = 'using (histbin($2)):(1.0) smooth ' . $options{histstyle};
|
||||||
|
|
||||||
updateCurveOptions($curve, $id);
|
updateCurveOptions($curve, $id);
|
||||||
@@ -1004,7 +1053,11 @@ sub replot
|
|||||||
# seconds-since-the-epoch BACK to the timefmt. Sheesh
|
# seconds-since-the-epoch BACK to the timefmt. Sheesh
|
||||||
($xmin, $xmax) = map {Time::Piece->strptime( $_, '%s' )->strftime( $options{timefmt} ) } ($xmin, $xmax);
|
($xmin, $xmax) = map {Time::Piece->strptime( $_, '%s' )->strftime( $options{timefmt} ) } ($xmin, $xmax);
|
||||||
}
|
}
|
||||||
sendRangeCommand( "xrange", $xmin, $xmax );
|
|
||||||
|
# if we have any histograms, then I'm not really visualizing the domain at
|
||||||
|
# all, and I don't set the range.
|
||||||
|
sendRangeCommand( "xrange", $xmin, $xmax )
|
||||||
|
unless @{$options{histogram}};
|
||||||
}
|
}
|
||||||
|
|
||||||
plotStoredData();
|
plotStoredData();
|
||||||
@@ -1253,7 +1306,12 @@ windowsize> can be given. This will create an constantly-updating, scrolling
|
|||||||
view of the recent past. C<windowsize> should be replaced by the desired length
|
view of the recent past. C<windowsize> should be replaced by the desired length
|
||||||
of the domain window to plot, in domain units (passed-in values if C<--domain>
|
of the domain window to plot, in domain units (passed-in values if C<--domain>
|
||||||
or line numbers otherwise). If the domain is a time/date via C<--timefmt>, then
|
or line numbers otherwise). If the domain is a time/date via C<--timefmt>, then
|
||||||
C<windowsize> is and I<integer> in seconds.
|
C<windowsize> is and I<integer> in seconds. If we're plotting a histogram, then
|
||||||
|
C<--xlen> causes a histogram over a moving window to be computed. The subtlely
|
||||||
|
here is that with a histogram you don't actually I<see> the domain since only
|
||||||
|
the range is analyzed. But the domain is still there, and can be utilized with
|
||||||
|
C<--xlen>. With C<--xlen> we can plot I<only> histograms or I<only>
|
||||||
|
I<non>-histograms.
|
||||||
|
|
||||||
=head3 Special data commands
|
=head3 Special data commands
|
||||||
|
|
||||||
@@ -1286,7 +1344,9 @@ This command causes feedgnuplot to exit.
|
|||||||
The script is able to produce hardcopy output with C<--hardcopy outputfile>. The
|
The script is able to produce hardcopy output with C<--hardcopy outputfile>. The
|
||||||
output type can be inferred from the filename, if B<.ps>, B<.eps>, B<.pdf>,
|
output type can be inferred from the filename, if B<.ps>, B<.eps>, B<.pdf>,
|
||||||
B<.svg> or B<.png> is requested. If any other file type is requested,
|
B<.svg> or B<.png> is requested. If any other file type is requested,
|
||||||
C<--terminal> I<must> be passed in to tell gnuplot how to make the plot.
|
C<--terminal> I<must> be passed in to tell gnuplot how to make the plot. If
|
||||||
|
C<--terminal> is passed in, then the C<--hardcopy> argument only provides the
|
||||||
|
output filename.
|
||||||
|
|
||||||
=head2 Self-plotting data files
|
=head2 Self-plotting data files
|
||||||
|
|
||||||
@@ -1485,7 +1545,12 @@ C<--xlen xxx>
|
|||||||
|
|
||||||
When using C<--stream>, sets the size of the x-window to plot. Omit this or set
|
When using C<--stream>, sets the size of the x-window to plot. Omit this or set
|
||||||
it 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
|
||||||
C<--monotonic>
|
C<--monotonic>. If we're plotting a histogram, then C<--xlen> causes a histogram
|
||||||
|
over a moving window to be computed. The subtlely here is that with a histogram
|
||||||
|
you don't actually I<see> the domain since only the range is analyzed. But the
|
||||||
|
domain is still there, and can be utilized with C<--xlen>. With C<--xlen> we can
|
||||||
|
plot I<only> histograms or I<only> I<non>-histograms.
|
||||||
|
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
@@ -1521,14 +1586,15 @@ passing something like
|
|||||||
|
|
||||||
C<--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 C<--binwidth> option (assumed 1.0 if omitted). C<--histogram> does I<not>
|
the C<--binwidth> option (assumed 1.0 if omitted). If a drawing style is not
|
||||||
touch the drawing style. It is often desired to plot these with boxes, and this
|
specified for this curve (C<--curvestyle>) or all curves (C<--with>,
|
||||||
I<must> be explicitly requested by C<--with boxes>. This works with C<--domain>
|
C<--curvestyleall>) then the default histogram style is set: filled boxes with
|
||||||
|
borders. This is what the user generally wants. This works with C<--domain>
|
||||||
and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
|
and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
|
||||||
data because of C<--xlen> or C<--monotonic>. I.e. the x-values are I<not> drawn
|
data because of C<--xlen> or C<--monotonic>. I.e. the domain values are I<not>
|
||||||
in any way. Can be passed multiple times, or passed a comma- separated list
|
drawn in any way. Can be passed multiple times, or passed a comma- separated
|
||||||
|
list
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
@@ -1541,21 +1607,24 @@ in the plot. Defaults to 1.0 if not given.
|
|||||||
|
|
||||||
C<--histstyle style>
|
C<--histstyle style>
|
||||||
|
|
||||||
Normally, histograms are generated with the 'smooth freq' gnuplot style.
|
Normally, histograms are generated with the 'smooth frequency' gnuplot style.
|
||||||
C<--histstyle> can be used to select different 'smooth' settings. Allowed are
|
C<--histstyle> can be used to select different C<smooth> settings (see the
|
||||||
'unique', 'cumulative' and 'cnormal'. 'unique' indicates whether a bin has at
|
gnuplot C<help smooth> page for more info). Allowed values are 'frequency' (the
|
||||||
least one item in it: instead of counting the items, it'll always report 0 or 1.
|
default), 'fnormal' (available in very recent gnuplots), 'unique', 'cumulative'
|
||||||
'cumulative' is the integral of the "normal" histogram. 'cnormal' is like
|
and 'cnormal'. 'fnormal' is a normalized histogram. 'unique' indicates whether a
|
||||||
'cumulative', but rescaled to end up at 1.0.
|
bin has at least one item in it: instead of counting the items, it'll always
|
||||||
|
report 0 or 1. 'cumulative' is the integral of the 'frequency' histogram.
|
||||||
|
'cnormal' is like 'cumulative', but rescaled to end up at 1.0.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
C<--style curveID style>
|
C<--style curveID style>
|
||||||
|
|
||||||
Additional styles per curve. With C<--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. curveID can be a comma-separated
|
||||||
multiple curves. C<--styleall> does I<not> apply to curves that have a
|
list of IDs to which the given style should apply. Use this option multiple
|
||||||
C<--style>
|
times for multiple curves. C<--styleall> does I<not> apply to curves that have a
|
||||||
|
C<--style>.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
@@ -1617,7 +1686,7 @@ times.
|
|||||||
C<--equation xxx>
|
C<--equation xxx>
|
||||||
|
|
||||||
Gnuplot can plot both data and symbolic equations. C<feedgnuplot> generally
|
Gnuplot can plot both data and symbolic equations. C<feedgnuplot> generally
|
||||||
plots data, but with this option can plot symbolic equations /also/. This is
|
plots data, but with this option can plot symbolic equations I<also>. This is
|
||||||
generally intended to augment data plots, since for equation-only plots you
|
generally intended to augment data plots, since for equation-only plots you
|
||||||
don't need C<feedgnuplot>. C<--equation> can be passed multiple times for
|
don't need C<feedgnuplot>. C<--equation> can be passed multiple times for
|
||||||
multiple equations. The given strings are passed to gnuplot directly without any
|
multiple equations. The given strings are passed to gnuplot directly without any
|
||||||
@@ -1629,7 +1698,7 @@ basic example:
|
|||||||
--equation 'sin(x)/x' --equation 'cos(x)/x with lines lw 4'
|
--equation 'sin(x)/x' --equation 'cos(x)/x with lines lw 4'
|
||||||
|
|
||||||
Here I plot the incoming data (points along a line) with the given style (a line
|
Here I plot the incoming data (points along a line) with the given style (a line
|
||||||
with thickness 3), /and/ I plot two damped sinusoids on the same plot. The
|
with thickness 3), I<and> I plot two damped sinusoids on the same plot. The
|
||||||
sinusoids are not affected by C<feedgnuplot> styling, so their styles are set
|
sinusoids are not affected by C<feedgnuplot> styling, so their styles are set
|
||||||
separately, as in this example. More complicated example:
|
separately, as in this example. More complicated example:
|
||||||
|
|
||||||
@@ -1638,7 +1707,7 @@ separately, as in this example. More complicated example:
|
|||||||
--set parametric --set "trange [0:2*3.14]" --equation "sin(t),cos(t)"
|
--set parametric --set "trange [0:2*3.14]" --equation "sin(t),cos(t)"
|
||||||
|
|
||||||
Here the data I generate is points along the unit circle. I plot these as
|
Here the data I generate is points along the unit circle. I plot these as
|
||||||
points, and I /also/ plot a true circle as a parametric equation.
|
points, and I I<also> plot a true circle as a parametric equation.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
@@ -1658,16 +1727,17 @@ For 3D plots, set square aspect ratio for ONLY the x,y axes
|
|||||||
C<--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 C<--terminal>
|
filename, unless specified by C<--terminal>. If C<--terminal> is given,
|
||||||
|
C<--hardcopy> sets I<only> the output filename.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
C<--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.
|
||||||
C<--hardcopy> sets this to some sensible defaults if --hardcopy is given .png,
|
C<--hardcopy> sets this to some sensible defaults if C<--hardcopy> is set to a
|
||||||
.pdf, .ps, .eps or .svg. If any other file type is desired, use both
|
filename ending in C<.png>, C<.pdf>, C<.ps>, C<.eps> or C<.svg>. If any other
|
||||||
C<--hardcopy> and C<--terminal>
|
file type is desired, use both C<--hardcopy> and C<--terminal>
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
@@ -1700,6 +1770,10 @@ 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
|
of a point for a particular curve. This overrides any defaults that may exist
|
||||||
for this curve only.
|
for this curve only.
|
||||||
|
|
||||||
|
With C<--dataid>, curveID is the ID. Otherwise, it's the index of the curve,
|
||||||
|
starting at 0. curveID can be a comma-separated list of IDs to which the given
|
||||||
|
rangesize should apply.
|
||||||
|
|
||||||
=item
|
=item
|
||||||
|
|
||||||
C<--rangesizeall xxx>
|
C<--rangesizeall xxx>
|
||||||
@@ -1857,10 +1931,34 @@ in a Thinkpad.
|
|||||||
=head2 Plotting a histogram of file sizes in a directory, granular to 10MB
|
=head2 Plotting a histogram of file sizes in a directory, granular to 10MB
|
||||||
|
|
||||||
$ ls -l | awk '{print $5/1e6}' |
|
$ ls -l | awk '{print $5/1e6}' |
|
||||||
feedgnuplot --histogram 0 --with boxes
|
feedgnuplot --histogram 0
|
||||||
--binwidth 10 --set 'style fill solid'
|
--binwidth 10
|
||||||
--ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
|
--ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
|
||||||
|
|
||||||
|
=head2 Plotting a live histogram of the ping round-trip times for the past 20 seconds
|
||||||
|
|
||||||
|
$ ping -A -D 8.8.8.8 |
|
||||||
|
perl -anE 'BEGIN { $| = 1; }
|
||||||
|
$F[0] =~ s/[\[\]]//g or next;
|
||||||
|
$F[7] =~ s/.*=//g or next;
|
||||||
|
say "$F[0] $F[7]"' |
|
||||||
|
feedgnuplot --stream --domain --histogram 0 --binwidth 10 \
|
||||||
|
--xlabel 'Ping round-trip time (s)' \
|
||||||
|
--ylabel Frequency --xlen 20
|
||||||
|
|
||||||
|
=head2 Plotting points on top of an existing image
|
||||||
|
|
||||||
|
This can be done by using C<--equation> to pass arbitrary plot input to gnuplot:
|
||||||
|
|
||||||
|
$ < features_xy.data
|
||||||
|
feedgnuplot --points --domain
|
||||||
|
--equation '"image.png" binary filetype=png flipy with rgbimage'
|
||||||
|
|
||||||
|
Here an existing image is given to gnuplot verbatim, and data to plot on top of
|
||||||
|
it is interpreted by feedgnuplot as usual. C<flipy> is useful here because
|
||||||
|
usually the y axis points up, but when looking at images, this is usually
|
||||||
|
reversed: the origin is the top-left pixel.
|
||||||
|
|
||||||
=head1 ACKNOWLEDGEMENT
|
=head1 ACKNOWLEDGEMENT
|
||||||
|
|
||||||
This program is originally based on the driveGnuPlots.pl script from
|
This program is originally based on the driveGnuPlots.pl script from
|
||||||
|
@@ -20,6 +20,7 @@ complete -W \
|
|||||||
--extracmds \
|
--extracmds \
|
||||||
--set \
|
--set \
|
||||||
--unset \
|
--unset \
|
||||||
|
--equation \
|
||||||
--geometry \
|
--geometry \
|
||||||
--hardcopy \
|
--hardcopy \
|
||||||
--help \
|
--help \
|
||||||
|
@@ -32,6 +32,7 @@ _arguments -S
|
|||||||
'*--extracmds[Additional gnuplot commands]:command' \
|
'*--extracmds[Additional gnuplot commands]:command' \
|
||||||
'*--set[Additional 'set' gnuplot commands]:set-option' \
|
'*--set[Additional 'set' gnuplot commands]:set-option' \
|
||||||
'*--unset[Additional 'unset' gnuplot commands]:unset-option' \
|
'*--unset[Additional 'unset' gnuplot commands]:unset-option' \
|
||||||
|
'*--equation[Raw symbolic equation]:equation' \
|
||||||
'--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' \
|
||||||
|
132
debian/changelog
vendored
Normal file
132
debian/changelog
vendored
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
feedgnuplot (1.41-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update:
|
||||||
|
- Histograms: --xlen can coexist with --xmin/--xmax
|
||||||
|
- Histograms: work as expected with --xlen and --monotonic
|
||||||
|
- Histograms: better sanity checking of options
|
||||||
|
|
||||||
|
-- Dima Kogan <dkogan@debian.org> Fri, 24 Feb 2017 23:53:27 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.40-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update:
|
||||||
|
- If the options couldn't be parsed I don't dump the whole manpage
|
||||||
|
- --style and --rangesize can now take a comma-separated list of IDs
|
||||||
|
- 'any' is from List::MoreUtils, not List::Util
|
||||||
|
- the sleep-forever delay at end is now > 1000 days
|
||||||
|
|
||||||
|
-- Dima Kogan <dkogan@debian.org> Fri, 25 Nov 2016 14:49:36 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.39-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update:
|
||||||
|
- by default, histograms are plotted in expected ways
|
||||||
|
- No enhanced text mode in hardcopies, slightly larger font size
|
||||||
|
|
||||||
|
-- Dima Kogan <dkogan@debian.org> Sat, 15 Oct 2016 20:45:15 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.37-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update: At the end of a streaming plot, include the last
|
||||||
|
chunk of data
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 01 Jan 2016 08:14:23 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.36-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update: added --equation to plot symbolic equations
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 13 Nov 2015 11:14:30 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.35-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Upstream update: fancier handling of termination conditions, no more
|
||||||
|
threading code
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Mon, 02 Nov 2015 13:55:32 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.34-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Depends now works with the 'gnuplot5' packages
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 10 Oct 2014 14:05:17 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.34-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Very minor upstream update
|
||||||
|
* gnuplot-nox can no satisfy the gnuplot dependency for feedgnuplot
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 06 Aug 2014 15:19:56 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.33-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Upstream update: fixed incorrect plotting of --timefmt --rangesize
|
||||||
|
plots
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Thu, 06 Feb 2014 23:19:02 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.32-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Added --rangesize and --rangesizeall. Different curves can now plot
|
||||||
|
different-size tuples
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 05 Feb 2014 14:00:44 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.30-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* made the VCS links canonical
|
||||||
|
* added --set, --unset, --with, --style, --styleall
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 24 Jan 2014 15:50:03 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.28-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Upstream update:
|
||||||
|
- Removed example debianization
|
||||||
|
- Removed unreliable unit tests from automated testing (Closes: #731080)
|
||||||
|
* gnuplot dependency now favors graphical gnuplot packages
|
||||||
|
* Removed Anton Gladky from the Uploaders
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Wed, 04 Dec 2013 02:05:08 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.26-1) unstable; urgency=low
|
||||||
|
|
||||||
|
[ Dima Kogan ]
|
||||||
|
* Minor POD update
|
||||||
|
* Added test suite
|
||||||
|
* Added initial support for --timefmt. Currently time/date data is
|
||||||
|
supported only at the x-axis domain
|
||||||
|
* Added --exit option for force feedgnuplot to return even if gnuplot
|
||||||
|
may not yet be done rendering (patch by Eric Schulte)
|
||||||
|
* Reformatted the documentation
|
||||||
|
* y2-axis curves no longer have a thicker line by default
|
||||||
|
* --hardcopy now handles piped output (gnuplot 'set output |process'
|
||||||
|
syntax)
|
||||||
|
|
||||||
|
[ Anton Gladky ]
|
||||||
|
* Add libipc-run-perl to Build-Depends to execute tests
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Oct 2013 01:19:51 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.24-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Now building the html documentation from the correct POD source
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Sun, 28 Apr 2013 17:42:52 -0700
|
||||||
|
|
||||||
|
feedgnuplot (1.24-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Fixed regression in --monotonic. This works again now
|
||||||
|
* moved POD back into the main source file. This fixes the broken usage
|
||||||
|
messages
|
||||||
|
* added --version
|
||||||
|
* fixed watchfile to work with newer github pages
|
||||||
|
* priority now optional
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Fri, 08 Feb 2013 02:01:32 -0800
|
||||||
|
|
||||||
|
feedgnuplot (1.23-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Initial Debian release (Closes: #686413)
|
||||||
|
|
||||||
|
-- Dima Kogan <dima@secretsauce.net> Tue, 30 Oct 2012 11:14:01 -0700
|
1
debian/compat
vendored
Normal file
1
debian/compat
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
9
|
21
debian/control
vendored
Normal file
21
debian/control
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
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},
|
||||||
|
liblist-moreutils-perl,
|
||||||
|
gnuplot-qt | gnuplot-x11 | gnuplot-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | gnuplot
|
||||||
|
Description: Pipe-oriented frontend to Gnuplot
|
||||||
|
Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
|
||||||
|
coming in on STDIN or given in a filename passed on the commandline. Various
|
||||||
|
data representations are supported, as is hardcopy output and streaming display
|
||||||
|
of live data.
|
24
debian/copyright
vendored
Normal file
24
debian/copyright
vendored
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
|
Source: https://github.com/dkogan/feedgnuplot
|
||||||
|
Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
|
||||||
|
Upstream-Name: feedgnuplot
|
||||||
|
|
||||||
|
Files: *
|
||||||
|
Copyright: 2011, Dima Kogan <dima@secretsauce.net>
|
||||||
|
License: Artistic or GPL-1+
|
||||||
|
|
||||||
|
License: Artistic
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the Artistic License, which comes with Perl.
|
||||||
|
.
|
||||||
|
On Debian GNU/Linux systems, the complete text of the Artistic License
|
||||||
|
can be found in `/usr/share/common-licenses/Artistic'.
|
||||||
|
|
||||||
|
License: GPL-1+
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 1, or (at your option)
|
||||||
|
any later version.
|
||||||
|
.
|
||||||
|
On Debian GNU/Linux systems, the complete text of version 1 of the
|
||||||
|
General Public License can be found in `/usr/share/common-licenses/GPL-1'.
|
9
debian/feedgnuplot.doc-base
vendored
Normal file
9
debian/feedgnuplot.doc-base
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
Document: feedgnuplot
|
||||||
|
Title: Feedgnuplot Manual
|
||||||
|
Author: Dima Kogan
|
||||||
|
Abstract: Formatted manpage for feedgnuplot
|
||||||
|
Section: Science/Data Analysis
|
||||||
|
|
||||||
|
Format: HTML
|
||||||
|
Index: /usr/share/doc/feedgnuplot/feedgnuplot.html
|
||||||
|
Files: /usr/share/doc/feedgnuplot/feedgnuplot.html
|
1
debian/feedgnuplot.docs
vendored
Normal file
1
debian/feedgnuplot.docs
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
feedgnuplot.html
|
2
debian/feedgnuplot.install
vendored
Normal file
2
debian/feedgnuplot.install
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
completions/bash/feedgnuplot /etc/bash_completion.d/
|
||||||
|
completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions
|
4
debian/gbp.conf
vendored
Normal file
4
debian/gbp.conf
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
debian-branch = debian
|
||||||
|
upstream-tag = v%(version)s
|
||||||
|
pristine-tar = True
|
12
debian/rules
vendored
Executable file
12
debian/rules
vendored
Executable file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
|
%:
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
override_dh_auto_build:
|
||||||
|
dh_auto_build
|
||||||
|
pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
|
||||||
|
|
||||||
|
override_dh_auto_clean:
|
||||||
|
rm -rf feedgnuplot.html pod2htm*
|
||||||
|
dh_auto_clean
|
1
debian/source/format
vendored
Normal file
1
debian/source/format
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
3.0 (quilt)
|
4
debian/watch
vendored
Normal file
4
debian/watch
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
version=3
|
||||||
|
opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
|
||||||
|
https://github.com/dkogan/feedgnuplot/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
|
||||||
|
# Bart Martens <bartm@debian.org> Sat, 22 Dec 2012 12:54:18 +0000
|
58
feedgnuplot.spec
Normal file
58
feedgnuplot.spec
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
# Sample spec file for rpm-based systems. Debian-based systems already have this
|
||||||
|
# packaged, so we do not ship those here
|
||||||
|
|
||||||
|
Name: feedgnuplot
|
||||||
|
Version: 1.38
|
||||||
|
Release: 1%{?dist}
|
||||||
|
Summary: Pipe-oriented frontend to Gnuplot
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
License: Artistic or GPL-1+
|
||||||
|
URL: https://www.github.com/dkogan/feedgnuplot/
|
||||||
|
Source0: https://www.github.com/dkogan/feedgnuplot/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
BuildRequires: /usr/bin/pod2html
|
||||||
|
BuildRequires: perl-String-ShellQuote
|
||||||
|
BuildRequires: perl-ExtUtils-MakeMaker
|
||||||
|
BuildRequires: perl
|
||||||
|
BuildRequires: gawk
|
||||||
|
BuildRequires: gnuplot
|
||||||
|
BuildRequires: perl-IPC-Run
|
||||||
|
|
||||||
|
Requires: gnuplot
|
||||||
|
|
||||||
|
%description
|
||||||
|
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.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
|
||||||
|
%build
|
||||||
|
perl Makefile.PL INSTALLDIRS=vendor
|
||||||
|
make
|
||||||
|
pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install DESTDIR=%{buildroot} PREFIX=/usr
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
|
||||||
|
cp Changes LICENSE feedgnuplot.html %{buildroot}%{_defaultdocdir}/%{name}
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/zsh/site-functions
|
||||||
|
cp completions/zsh/* %{buildroot}%{_datadir}/zsh/site-functions
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
|
||||||
|
cp completions/bash/* %{buildroot}%{_datadir}/bash-completion/completions
|
||||||
|
|
||||||
|
rm -rf %{buildroot}/usr/lib64
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%{_bindir}/*
|
||||||
|
%{_datadir}/zsh/*
|
||||||
|
%{_datadir}/bash-completion/*
|
||||||
|
%doc %{_defaultdocdir}/%{name}/*
|
||||||
|
%doc %{_mandir}
|
Reference in New Issue
Block a user