Compare commits

..

29 Commits

Author SHA1 Message Date
Dima Kogan
fce0b9bb99 version bump 2021-02-03 14:49:06 -08:00
Dima Kogan
47957cfed6 changelog bump 2021-02-03 14:42:22 -08:00
Dima Kogan
bb9220ea97 updated default hardcopy settings 2021-02-03 14:41:28 -08:00
Dima Kogan
099ef33843 fixed typo in docs 2021-01-11 15:12:06 -08:00
Dima Kogan
b2c57797a7 ping example doesn't use -A
There's just no reason for that at all
2020-11-13 20:48:32 -08:00
Dima Kogan
c8dac15db3 version bump 2020-07-20 15:51:49 -07:00
Dima Kogan
4244299169 Revert "Removed reference to no-longer-existing variable"
This reverts commit 7e1e6af184.

This commit did nothing other than introduce a bug. --style is supposed to
override --with, but after this commit, --style was ADDED to --with, which is
wrong
2020-07-20 15:47:32 -07:00
Dima Kogan
4234c94737 minor documentation update 2020-05-19 08:59:56 -07:00
Dima Kogan
154377691c minor documentation update 2020-05-19 08:54:01 -07:00
Dima Kogan
bdb9919c39 documented --every 2020-04-17 14:18:09 -07:00
Dima Kogan
4e85f991c4 version bump 2020-04-17 14:07:08 -07:00
Dima Kogan
2e6c9d6ea3 added tab completions for --every and --everyall 2020-04-17 14:06:10 -07:00
Dima Kogan
c4eef7a167 --timefmt can be used with --histogram 2020-04-17 14:01:17 -07:00
Dima Kogan
7e1e6af184 Removed reference to no-longer-existing variable 2020-03-06 22:16:07 -08:00
Dima Kogan
e9c9ff02e4 Minor no-op refactoring 2020-03-06 22:16:07 -08:00
Dima Kogan
2f9a6acdb3 Minor no-op refactoring
The ID->curve hash %curveIndices is now called $curveFromID, and now gives you a
curve reference, not an index to @curves

I can thus reorder @curves as I like, and %curveFromID remains valid
2020-03-06 22:14:40 -08:00
Dima Kogan
5e0869dc25 Added support for --every and --everyall
Needs documentation, tab completion
2020-01-24 19:24:02 -08:00
Dima Kogan
592ce20d1f readme update
github had a bug where it wouldn't render symlinks to embedded POD. Is this
still broken?
2020-01-08 21:20:50 -08:00
Dima Kogan
373b97092e version bump 2020-01-08 18:55:52 -08:00
Dima Kogan
e4523f97e7 documentation 2019-12-16 20:37:36 -08:00
Dima Kogan
d73118087a Full support for all 4 2d axes
Before I'd default to x1y1, and I could use x1y2 if --y2. Now I can ask for
--x1y2 and --x2y1 and --x2y2
2019-11-13 13:50:07 -08:00
Dima Kogan
b8111af563 added forgotten options to the tab-completions 2019-09-11 14:57:40 -07:00
Dima Kogan
54fc8c625d version bump 2019-08-25 15:32:55 -07:00
Dima Kogan
8bb0c3a7d8 Manual POD update
Maybe github fixed their bug already? I should check
2019-08-25 15:32:08 -07:00
Dima Kogan
29f4f5a368 Added --squarexy and --square-xy as synonyms to --square_xy 2019-06-27 11:11:20 -07:00
Dima Kogan
55faefec8b README has link to SCaLE talk 2019-03-10 18:09:47 -07:00
Dima Kogan
77f54da873 extracted POD into README.pod. manually 2019-01-14 18:22:25 -08:00
Dima Kogan
b5275d6386 manually extracted README.pod to a file to work around github bug 2019-01-14 18:18:19 -08:00
Dima Kogan
481f18a5fb added note to INSTALL file 2018-11-29 17:17:14 -08:00
17 changed files with 1215 additions and 347 deletions

32
Changes
View File

@@ -1,3 +1,35 @@
feedgnuplot (1.56) unstable; urgency=medium
* Updated default hardcopy settings
-- Dima Kogan <dkogan@debian.org> Wed, 03 Feb 2021 14:42:15 -0800
feedgnuplot (1.55)
* Fixed regression introduced in 1.54:
--style now correctly overrides --with
-- Dima Kogan <dkogan@debian.org> Mon, 20 Jul 2020 15:51:23 -0700
feedgnuplot (1.54)
* Added --every and --everyall to decimate the input data
* --timefmt can be used with --histogram
-- Dima Kogan <dkogan@debian.org> Fri, 17 Apr 2020 14:06:55 -0700
feedgnuplot (1.53)
* Full support for all 4 axes. Added --x2...
-- Dima Kogan <dkogan@debian.org> Wed, 08 Jan 2020 18:55:29 -0800
feedgnuplot (1.52)
* Added --squarexy and --square-xy as synonyms to --square_xy
-- Dima Kogan <dima@secretsauce.net> Sun, 25 Aug 2019 15:32:37 -0700
feedgnuplot (1.51) feedgnuplot (1.51)
* Added .gp "terminal" to create self-plotting gnuplot files * Added .gp "terminal" to create self-plotting gnuplot files

View File

@@ -10,4 +10,11 @@ Without a package, an installation can be done with
make make
make install make install
This installs feedgnuplot to /usr/local. Adjust the paths as required This installs feedgnuplot to /usr/local. Adjust the paths as required.
Also, note that this is a self-contained utility. Usually running from the tree
works just fine:
git clone https://github.com/dkogan/feedgnuplot.git
cd feedgnuplot/bin
./feedgnuplot ...

View File

@@ -1 +0,0 @@
bin/feedgnuplot

1009
README.pod Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -16,7 +16,7 @@ use Pod::Usage;
use Time::Piece; use Time::Piece;
# Makefile.PL assumes this is in '' # Makefile.PL assumes this is in ''
my $VERSION = '1.51'; my $VERSION = '1.56';
my %options; my %options;
interpretCommandline(); interpretCommandline();
@@ -31,8 +31,8 @@ interpretCommandline();
# datastring # datastring
my @curves = (); my @curves = ();
# list mapping curve names to their indices in the @curves list # Maps a curve ID to the corresponding curve
my %curveIndices = (); my %curveFromID = ();
# Whether any new data has arrived since the last replot # Whether any new data has arrived since the last replot
my $haveNewData; my $haveNewData;
@@ -90,8 +90,11 @@ sub interpretCommandline
$options{legend} = []; $options{legend} = [];
$options{curvestyle} = []; $options{curvestyle} = [];
$options{style} = []; $options{style} = [];
$options{every} = [];
$options{histogram} = []; $options{histogram} = [];
$options{y2} = []; $options{x1y2} = [];
$options{x2y1} = [];
$options{x2y2} = [];
$options{extracmds} = []; $options{extracmds} = [];
$options{set} = []; $options{set} = [];
$options{unset} = []; $options{unset} = [];
@@ -105,11 +108,15 @@ sub interpretCommandline
$options{tuplesize} = []; $options{tuplesize} = [];
GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', 'vnlog!', '3d!', 'colormap!', 'lines!', 'points!', GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', 'vnlog!', '3d!', 'colormap!', 'lines!', 'points!',
'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s', 'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'x2label=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',
'zmin=f', 'zmax=f', 'y2=s@', 'xmin=s', 'xmax=s', 'x2min=s', 'x2max=s',
'ymin=f', 'ymax=f', 'y2min=f', 'y2max=f',
'zmin=f', 'zmax=f',
'x2=s@', 'y2=s@', 'x1y2=s@', 'x2y1=s@', 'x2y2=s@',
'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@', 'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@',
'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s', 'every=s{2}', 'everyall=s',
'square!', 'square_xy!', 'square-xy!', 'squarexy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
'equation=s@', 'equation=s@',
'image=s', 'image=s',
'histogram=s@', 'binwidth=f', 'histstyle=s', 'histogram=s@', 'binwidth=f', 'histstyle=s',
@@ -143,6 +150,10 @@ sub interpretCommandline
delete $options{styleall}; delete $options{styleall};
} }
# various square-xy synonyms
$options{'square_xy'} = 1 if $options{'square-xy'} || $options{'squarexy'};
push @{$options{curvestyle}}, @{$options{style}}; push @{$options{curvestyle}}, @{$options{style}};
delete $options{style}; delete $options{style};
@@ -164,12 +175,12 @@ sub interpretCommandline
} }
# 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 x2 y2 x1y2 x2y1 x2y2))
{ {
@{$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 tuplesize)) for my $listkey (qw(curvestyle rangesize tuplesize every))
{ {
next unless defined $options{$listkey}; next unless defined $options{$listkey};
my @in = @{$options{$listkey}}; my @in = @{$options{$listkey}};
@@ -188,6 +199,11 @@ sub interpretCommandline
@{$options{$listkey}} = @out; @{$options{$listkey}} = @out;
} }
# handle x2 == x2y1 and y2 == x1y2
push @{$options{x2y1}}, @{$options{x2}} if defined $options{x2};
push @{$options{x1y2}}, @{$options{y2}} if defined $options{y2};
$options{x2} = [];
$options{y2} = [];
# convert all tuplesize business to rangesize # convert all tuplesize business to rangesize
my $domainsize = $options{'3d'} ? 2 : 1; my $domainsize = $options{'3d'} ? 2 : 1;
@@ -239,7 +255,7 @@ sub interpretCommandline
# 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 rangesize)) for my $listkey (qw(legend curvestyle rangesize every))
{ {
$options{"${listkey}_hash"} = {}; $options{"${listkey}_hash"} = {};
@@ -347,9 +363,11 @@ sub interpretCommandline
exit -1; exit -1;
} }
if ( defined $options{y2min} || defined $options{y2max} || @{$options{y2}} ) if ( defined $options{x2min} || defined $options{x2max} ||
defined $options{y2min} || defined $options{y2max} ||
@{$options{x1y2}} || @{$options{x2y1}} || @{$options{x2y2}} )
{ {
print STDERR "--3d does not make sense with --y2...\n"; print STDERR "--3d does not make sense with --x2... or --y2...\n";
exit -1; exit -1;
} }
@@ -379,9 +397,9 @@ sub interpretCommandline
} }
else else
{ {
if ( $options{timefmt} && !$options{domain} ) if ( $options{timefmt} && !$options{domain} && !@{$options{histogram}} )
{ {
print STDERR "--timefmt makes sense only with --domain\n"; print STDERR "--timefmt makes sense only with --domain or --histogram\n";
exit -1; exit -1;
} }
@@ -631,11 +649,11 @@ sub mainThread
} }
my %terminalOpts = my %terminalOpts =
( eps => 'postscript noenhanced solid color enhanced eps', ( eps => 'postscript noenhanced solid color eps',
ps => 'postscript noenhanced solid color landscape 12', ps => 'postscript noenhanced solid color landscape 12',
pdf => 'pdfcairo noenhanced solid color font ",12" size 11in,8.5in', pdf => 'pdfcairo noenhanced solid color font ",12" size 8in,6in',
png => 'png noenhanced size 1280,1024', png => 'pngcairo noenhanced size 1024,768 transparent crop font ",12"',
svg => 'svg noenhanced', svg => 'svg noenhanced solid dynamic size 800,600 font ",14"',
gp => 'gp'); gp => 'gp');
if( !defined $options{terminal} && if( !defined $options{terminal} &&
@@ -745,9 +763,10 @@ sub mainThread
print PIPE "set grid\n"; print PIPE "set grid\n";
print(PIPE "set xlabel \"$options{xlabel }\"\n") if defined $options{xlabel}; print(PIPE "set xlabel \"$options{xlabel }\"\n") if defined $options{xlabel};
print(PIPE "set x2label \"$options{x2label}\"\n") if defined $options{x2label};
print(PIPE "set ylabel \"$options{ylabel }\"\n") if defined $options{ylabel}; print(PIPE "set ylabel \"$options{ylabel }\"\n") if defined $options{ylabel};
print(PIPE "set zlabel \"$options{zlabel }\"\n") if defined $options{zlabel};
print(PIPE "set y2label \"$options{y2label}\"\n") if defined $options{y2label}; print(PIPE "set y2label \"$options{y2label}\"\n") if defined $options{y2label};
print(PIPE "set zlabel \"$options{zlabel }\"\n") if defined $options{zlabel};
print(PIPE "set title \"$options{title }\"\n") if defined $options{title}; print(PIPE "set title \"$options{title }\"\n") if defined $options{title};
if($options{square}) if($options{square})
@@ -795,9 +814,21 @@ sub mainThread
$options{curvestyle}[$idx*2 + 1]); $options{curvestyle}[$idx*2 + 1]);
} }
} }
if(@{$options{every}})
{
# @{$options{every}} is a list where consecutive pairs are (curveID,
# every).
my $n = scalar @{$options{every}}/2;
foreach my $idx (0..$n-1)
{
addEveryOption($options{every}[$idx*2 ],
$options{every}[$idx*2 + 1]);
}
}
# For the values requested to be printed on the y2 axis, set that addCurveOption($_, 'axes x1y2') foreach (@{$options{x1y2}});
addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}}); addCurveOption($_, 'axes x2y1') foreach (@{$options{x2y1}});
addCurveOption($_, 'axes x2y2') foreach (@{$options{x2y2}});
# timefmt # timefmt
if( $options{timefmt} ) if( $options{timefmt} )
@@ -814,7 +845,14 @@ sub mainThread
setCurveAsHistogram( $_ ) foreach (@{$options{histogram}}); setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
if(@{$options{y2}}) if(@{$options{x2y1}} || @{$options{x2y2}})
{
print PIPE "set xtics nomirror\n";
print PIPE "set x2tics\n";
# if any of the ranges are given, set the range
sendRangeCommand( "x2range", $options{x2min}, $options{x2max} );
}
if(@{$options{x1y2}} || @{$options{x2y2}})
{ {
print PIPE "set ytics nomirror\n"; print PIPE "set ytics nomirror\n";
print PIPE "set y2tics\n"; print PIPE "set y2tics\n";
@@ -964,8 +1002,8 @@ sub mainThread
} }
else else
{ {
$domain[0] = $line_number; $domain[0] = $line_number;
$domain0_numeric = makeDomainNumeric( $domain[0] ); $domain0_numeric = $line_number;
} }
my $id = -1; my $id = -1;
@@ -1118,7 +1156,7 @@ sub updateCurveOptions
my $histoptions = $curve->{histoptions} || ''; my $histoptions = $curve->{histoptions} || '';
my $usingoptions = ''; my $usingoptions = '';
if( $options{timefmt} ) if( $options{timefmt} && !$histoptions )
{ {
# with --timefmt I need an explicit 'using' specification. I specify the # 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 # columns as 1:2:3..... I need the right number of columns (this is given
@@ -1131,7 +1169,7 @@ sub updateCurveOptions
} }
$curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions}"; $curve->{options} = "$curve->{everyoptions} $histoptions $usingoptions $titleoption $curve->{extraoptions}";
} }
sub getCurve sub getCurve
@@ -1148,19 +1186,23 @@ sub getCurve
my ($id) = @_; my ($id) = @_;
if( !exists $curveIndices{$id} ) if( !exists $curveFromID{$id} )
{ {
push @curves, {# if we have a catch-all style and no specific style, use my $curve = {# if we have a catch-all style and no specific style, use
# the catch-all style # the catch-all style
extraoptions => (!exists $options{curvestyle_hash}{$id} && extraoptions => (!exists $options{curvestyle_hash}{$id} &&
exists $options{curvestyleall}) ? exists $options{curvestyleall}) ?
"$options{curvestyleall} " : ' ', "$options{curvestyleall} " : ' ',
datastring => '', everyoptions => (!exists $options{every_hash}{$id} &&
datastring_meta => [], exists $options{everyall}) ?
datastring_offset => 0}; # push a curve with no data and no options "every $options{everyall} " : ' ',
$curveIndices{$id} = $#curves; datastring => '',
datastring_meta => [],
datastring_offset => 0}; # push a curve with no data and no options
push @curves, $curve; # push a curve with no data and no options
$curveFromID{$id} = $curve;
updateCurveOptions($curves[$#curves], $id); updateCurveOptions($curve, $id);
# --xlen has a meaning if we're not plotting histograms at all or if we're # --xlen has a meaning if we're not plotting histograms at all or if we're
@@ -1177,8 +1219,11 @@ sub getCurve
print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n"; print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n";
exit -1; exit -1;
} }
return $curve;
} }
return $curves[$curveIndices{$id}];
return $curveFromID{$id};
} }
sub addCurveOption sub addCurveOption
@@ -1189,6 +1234,14 @@ sub addCurveOption
$curve->{extraoptions} .= "$str "; $curve->{extraoptions} .= "$str ";
updateCurveOptions($curve, $id); updateCurveOptions($curve, $id);
} }
sub addEveryOption
{
my ($id, $str) = @_;
my $curve = getCurve($id);
$curve->{everyoptions} .= "every $str ";
updateCurveOptions($curve, $id);
}
sub setCurveLabel sub setCurveLabel
{ {
@@ -1365,6 +1418,7 @@ Simple plotting of piped data:
2 +-----------------------------------------------------------------+ 0 2 +-----------------------------------------------------------------+ 0
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5
Here we asked for ASCII plotting, which is useful for documentation.
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):
@@ -1827,10 +1881,10 @@ plot I<only> histograms or I<only> I<non>-histograms.
=item =item
C<--xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx> C<--xmin/xmax/x2min/x2max/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 x2/y2-axis bounds do not apply in 3d plots. The z-axis bounds apply
I<only> to 3d plots or colormaps. Note that there is no C<--xrange> to set both I<only> to 3d plots or colormaps. Note that there is no C<--xrange> to set both
sides at once or C<--xinv> to flip the axis around: anything more than the sides at once or C<--xinv> to flip the axis around: anything more than the
basics supported in this option is clearly obtainable by talking to gnuplot, for basics supported in this option is clearly obtainable by talking to gnuplot, for
@@ -1838,23 +1892,29 @@ instance C<--set 'xrange [20:10]'> to set the given inverted bounds.
=item =item
C<--xlabel/ylabel/y2label/zlabel xxx> C<--xlabel/x2label/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 x2/y2-axis labels do 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
C<--y2 xxx> C<--x2/--y2/--x1y2/--x2y1/--x2y2 xxx>
Plot the data specified by this curve ID on the y2 axis. Without C<--dataid>, By default data is plotted against the x1 and y1 axes (the left and bottom one
the ID is just an ordered 0-based index. Does not apply to 3d plots. Can be respectively). If we want a particular curve plotted against a different axis,
passed multiple times, or passed a comma-separated list. By default the y2-axis we can specify that with these options. You pass C<--AXIS ID> where C<AXIS>
curves look the same as the y-axis ones. I.e. the viewer of the resulting plot defines the axis (C<x2> or C<y2> or C<x1y2> or C<x2y1> or C<x2y2>) and the C<ID>
has to be told which is which via an axes label, legend, etc. Prior to version is the curve ID. C<--x2> is a synonym for C<--x2y1> and C<--y2> is a synonym for
1.25 of feedgnuplot the curves plotted on the y2 axis were drawn with a thicker C<--x1y2>. The curve ID is an ordered 0-based index or a specific ID if
line. This is no longer the case, but that behavior can be brought back by C<--dataid> or C<--vnlog>. None of these apply to 3d plots. Can be passed
passing something like multiple times for different curve IDs, multiple IDs can be passed in as a
comma-separated list. By default the curves plotted against the various axes
aren not drawn in any differentiated way: the viewer of the resulting plot has
to be told which is which via an axes label, legend, colors, etc. Prior to
version 1.25 of C<feedgnuplot> the curves plotted on the y2 axis were drawn with
a thicker line. This is no longer the case, but that behavior can be brought
back by passing something like
--y2 curveid --style curveid 'linewidth 3' --y2 curveid --style curveid 'linewidth 3'
@@ -1937,6 +1997,21 @@ Exclusive with C<--styleall>.
=item =item
C<--every curveID factor>
Decimates the input. Instead of plotting every point in the given curve, plot
one point per factor. This is useful to quickly process huge datasets. For
instance, to plot 1% of the data, pass a factor of 100.
=item
C<--everyall factor>
Decimates the input. This works exactly like C<--every>, except it applies to
I<all> the curves.
=item
C<--extracmds xxx> C<--extracmds xxx>
Additional commands to pass on to gnuplot verbatim. These could contain extra Additional commands to pass on to gnuplot verbatim. These could contain extra
@@ -2005,7 +2080,7 @@ all 3 axes
=item =item
C<--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
@@ -2174,7 +2249,10 @@ also.
C<--geometry> C<--geometry>
If using X11, specifies the size, position of the plot window Specifies the size, position of the plot window. This applies I<only> to the
C<x11> gnuplot terminal, and has no effect otherwise. To control the window size
for any other terminal, ask for the terminal explicitly, with the options
specifying the size. For instance C<--terminal 'qt size 1024,768'>
=item =item
@@ -2231,7 +2309,7 @@ in a Thinkpad.
=head2 Plotting a live histogram of the ping round-trip times for the past 20 seconds =head2 Plotting a live histogram of the ping round-trip times for the past 20 seconds
$ ping -A -D 8.8.8.8 | $ ping -D 8.8.8.8 |
perl -anE 'BEGIN { $| = 1; } perl -anE 'BEGIN { $| = 1; }
$F[0] =~ s/[\[\]]//g or next; $F[0] =~ s/[\[\]]//g or next;
$F[7] =~ s/.*=//g or next; $F[7] =~ s/.*=//g or next;

View File

@@ -9,6 +9,8 @@ complete -W \
--curvestyleall \ --curvestyleall \
--style \ --style \
--styleall \ --styleall \
--every \
--everyall \
--with \ --with \
--dataid \ --dataid \
--domain \ --domain \
@@ -17,6 +19,8 @@ complete -W \
--extraValuesPerPoint \ --extraValuesPerPoint \
--rangesizeall \ --rangesizeall \
--rangesize \ --rangesize \
--tuplesizeall \
--tuplesize \
--extracmds \ --extracmds \
--set \ --set \
--unset \ --unset \
@@ -33,23 +37,31 @@ complete -W \
--monotonic \ --monotonic \
--points \ --points \
--square \ --square \
--square_xy \ --square-xy \
--stream \ --stream \
--terminal \ --terminal \
--timefmt \ --timefmt \
--title \ --title \
--version \ --version \
--x2 \
--y2 \
--x2y1 \
--x1y2 \
--x2y2 \
--xlabel \ --xlabel \
--xlen \ --xlen \
--xmax \ --xmax \
--xmin \ --xmin \
--y2 \ --x2label \
--y2label \ --x2max \
--y2max \ --x2min \
--y2min \
--ylabel \ --ylabel \
--ymax \ --ymax \
--ymin \ --ymin \
--y2label \
--y2max \
--y2min \
--zlabel \ --zlabel \
--zmax \ --zmax \
--zmin' feedgnuplot --zmin \
--vnlog ' feedgnuplot

View File

@@ -10,22 +10,28 @@ _arguments -S
'--points' \ '--points' \
'--circles' \ '--circles' \
'--xlabel:X-axis label:' \ '--xlabel:X-axis label:' \
'--x2label:X2-axis label:' \
'--ylabel:Y-axis label:' \ '--ylabel:Y-axis label:' \
'--y2label:Y2-axis label:' \ '--y2label:Y2-axis label:' \
'--zlabel:Z-axis label:' \ '--zlabel:Z-axis label:' \
'--zlabel:Z-axis label:' \
'--title:Plot title:' \ '--title:Plot title:' \
'--autolegend[Label each plot with its data ID]' \ '--autolegend[Label each plot with its data ID]' \
'(--3d)--xlen[the size of the x-window to plot]:window size:' \ '(--3d)--xlen[the size of the x-window to plot]:window size:' \
'(--xlen)--xmin:min X:' \ '(--xlen)--xmin:min X:' \
'(--xlen)--xmax:max X:' \ '(--xlen)--xmax:max X:' \
'--x2min:min X2:' \
'--x2max:max X2:' \
'--ymin:min Y:' \ '--ymin:min Y:' \
'--ymax:max Y:' \ '--ymax:max Y:' \
'--y2min:min Y2:' \ '--y2min:min Y2:' \
'--y2max:max Y2:' \ '--y2max:max Y2:' \
'--zmin:min Z:' \ '--zmin:min Z:' \
'--zmax:max Z:' \ '--zmax:max Z:' \
'*--y2:plot to place on the Y2 axis:' \ '*--x2:curve to place on the X2Y1 axis:' \
'*--y2:curve to place on the X1Y2 axis:' \
'*--x2y1:curve to place on the X2Y1 axis:' \
'*--x1y2:curve to place on the X1Y2 axis:' \
'*--x2y2:curve to place on the X2Y2 axis:' \
'(--with)--curvestyleall[Additional styles for ALL curves]:style' \ '(--with)--curvestyleall[Additional styles for ALL curves]:style' \
'(--with)--styleall[Additional styles for ALL curves]:style' \ '(--with)--styleall[Additional styles for ALL curves]:style' \
'(--curvestyleall)--with[Additional styles for ALL curves]:style' \ '(--curvestyleall)--with[Additional styles for ALL curves]:style' \
@@ -35,17 +41,21 @@ _arguments -S
'*--equation[Raw symbolic equation]:equation' \ '*--equation[Raw symbolic equation]:equation' \
'--image[Image file to render beneath the data]:image:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \ '--image[Image file to render beneath the data]:image:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
'--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]:new image filename:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \ '--hardcopy[Plot to a file]:new image filename:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
'--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]' \
'(--rangesizeall)--extraValuesPerPoint[How many extra values are given for each data range]: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'\ '(--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:' \ '*--rangesize[How many values comprise a data range in this curve]:curve id: :N:' \
'(--extraValuesPerPoint)--tuplesizeall[How many values are given for each data tuple]:N'\
'*--tuplesize[How many values comprise a data tuple 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:' \ '*--style[Additional styles for a curve]:curve id: :style:' \
'*--every[Decimation factor for a curve]:curve id: :decimation factor:' \
'--everyall[Decimation factor for ALL curves]:decimation factor' \
'(--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 fnormal unique cumulative cnormal)' \ '--histstyle:Style of histogram:(frequency fnormal unique cumulative cnormal)' \
@@ -54,4 +64,5 @@ _arguments -S
'--exit[Exit gnuplot after making the plot]' \ '--exit[Exit gnuplot after making the plot]' \
'--version' \ '--version' \
'--help' \ '--help' \
'--timefmt[Format for time/date data]:time format' '--timefmt[Format for time/date data]:time format' \
'--vnlog[column IDs come from a vnlog header]'

201
debian/changelog vendored
View File

@@ -1,201 +0,0 @@
feedgnuplot (1.51-1) unstable; urgency=medium
* Added .gp "terminal" to create self-plotting gnuplot files
-- Dima Kogan <dkogan@debian.org> Sat, 29 Sep 2018 11:00:40 -0700
feedgnuplot (1.50-1) unstable; urgency=medium
* Script waits for the plot window to close before exiting
Instead of sleeping forever. This is really nice! I no longer need
to quit the plot window AND then C-c. Quitting the plot window is
now sufficient
* by default --image sets range noextend
* tab-completion knows about the fnormal distribution
-- Dima Kogan <dkogan@debian.org> Fri, 24 Aug 2018 13:16:35 -0700
feedgnuplot (1.49-2) unstable; urgency=medium
* Updated Vcs-... tags to salsa
-- Dima Kogan <dkogan@debian.org> Sun, 17 Jun 2018 22:18:18 -0700
feedgnuplot (1.49-1) unstable; urgency=medium
* --vnl now works with plots that have rangesize > 1
* zsh completion: --xlen argument isn't optional
-- Dima Kogan <dkogan@debian.org> Fri, 16 Mar 2018 13:56:27 -0700
feedgnuplot (1.48-1) unstable; urgency=medium
* Added --tuplesize and --tuplesizeall
* vnlog integration
-- Dima Kogan <dkogan@debian.org> Sat, 24 Feb 2018 12:56:05 -0800
feedgnuplot (1.45-1) unstable; urgency=medium
* zsh completion: --hardcopy, --image suggest filenames
* --image now produces a nicer legend: just the filename
* --curvestyle now overrides --curvestyleall
- This is a bug fix
* The version is now treated as a string not as a number
- So "1.40" is distinct from "1.4"
-- Dima Kogan <dkogan@debian.org> Sun, 29 Oct 2017 14:06:26 -0700
feedgnuplot (1.44-1) unstable; urgency=medium
* --image always goes on the FRONT of the equation list
-- Dima Kogan <dkogan@debian.org> Tue, 20 Jun 2017 16:45:42 -0700
feedgnuplot (1.43-1) unstable; urgency=medium
* added --image as a convenience wrapper for --equation
-- Dima Kogan <dkogan@debian.org> Mon, 19 Jun 2017 13:16:18 -0700
feedgnuplot (1.42-1) unstable; urgency=medium
* Upstream update:
- Fixed regression: data can now come from STDIN or files on the
cmdline
- reworded manpage of --exit
-- Dima Kogan <dkogan@debian.org> Tue, 25 Apr 2017 11:02:18 -0700
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
View File

@@ -1 +0,0 @@
9

21
debian/control vendored
View File

@@ -1,21 +0,0 @@
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-Browser: https://salsa.debian.org/science-team/feedgnuplot
Vcs-Git: https://salsa.debian.org/science-team/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
View File

@@ -1,24 +0,0 @@
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'.

View File

@@ -1,9 +0,0 @@
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

View File

@@ -1 +0,0 @@
feedgnuplot.html

View File

@@ -1,2 +0,0 @@
completions/bash/feedgnuplot /usr/share/bash-completion/completions/
completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions

4
debian/gbp.conf vendored
View File

@@ -1,4 +0,0 @@
[DEFAULT]
debian-branch = debian
upstream-tag = v%(version)s
pristine-tar = True

12
debian/rules vendored
View File

@@ -1,12 +0,0 @@
#!/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

View File

@@ -1 +0,0 @@
3.0 (quilt)

4
debian/watch vendored
View File

@@ -1,4 +0,0 @@
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