version bump

Changes

@@ -1,3 +1,10 @@
+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)
 
   * Added --equation to plot symbolic equations

bin/feedgnuplot

@@ -14,7 +14,7 @@ use Text::ParseWords; # for shellwords
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.36;
+my $VERSION = 1.37;
 
 my %options;
 interpretCommandline();
@@ -552,7 +552,7 @@ sub mainThread
       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}})
     {
       # @{$options{legend}} is a list where consecutive pairs are (curveID,
@@ -567,7 +567,7 @@ sub mainThread
       }
     }
 
-# add the extra curve options
+    # add the extra curve options
     if(@{$options{curvestyle}})
     {
       # @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
@@ -582,22 +582,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}});
 
-# timefmt
+    # timefmt
     if( $options{timefmt} )
     {
       print(PIPE "set timefmt '$options{timefmt}'\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 "set $_\n")   foreach (@{$options{set}});
     print(PIPE "unset $_\n") foreach (@{$options{unset}});
 
-# set up histograms
+    # set up histograms
     $options{binwidth} ||= 1;   # if no binwidth given, set it to 1
     print PIPE
       "set boxwidth $options{binwidth}\n" .
@@ -605,7 +605,7 @@ sub mainThread
 
     setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
 
-# 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
     # gnuplot
     print PIPE "set xtics\n";
@@ -749,7 +749,7 @@ sub mainThread
     }
 
     # finished reading in all. Plot what we have
-    plotStoredData() unless $options{stream};
+    plotStoredData() unless $options{stream} && $options{exit};
 
     if ( defined $options{hardcopy})
     {
@@ -1541,12 +1541,17 @@ in the plot. Defaults to 1.0 if not given.
 
 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), 'unique', 'cumulative' and 'cnormal'. 'unique' indicates whether a bin
-'cumulative' is the integral of the "normal" histogram. 'cnormal' is like
+has at least one item in it: instead of counting the items, it'll always report
-'cumulative', but rescaled to end up at 1.0.
+0 or 1. 'cumulative' is the integral of the 'frequency' histogram. 'cnormal' is
+like 'cumulative', but rescaled to end up at 1.0. Note that there's no
+normalized 'frequency' option because gnuplot does not provide one.
+
+
+C<help smooth>
 
 =item
 
@@ -1617,7 +1622,7 @@ times.
 C<--equation xxx>
 
 Gnuplot can plot both data and symbolic equations. C<feedgnuplot> generally
-plots data, but with this option can plot symbolic equations /also/. This is
+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
 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
@@ -1629,7 +1634,7 @@ basic example:
                --equation 'sin(x)/x' --equation 'cos(x)/x with lines lw 4'
 
 Here I plot the incoming data (points along a line) with the given style (a line
-with thickness 3), /and/ I plot two damped sinusoids on the same plot. The
+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
 separately, as in this example. More complicated example:
 
@@ -1638,7 +1643,7 @@ separately, as in this example. More complicated example:
                --set parametric --set "trange [0:2*3.14]" --equation "sin(t),cos(t)"
 
 Here the data I generate is points along the unit circle. I plot these as
-points, and I /also/ plot a true circle as a parametric equation.
+points, and I I<also> plot a true circle as a parametric equation.
 
 =item
 

completions/bash/feedgnuplot

@@ -20,6 +20,7 @@ complete -W               \
     --extracmds           \
     --set                 \
     --unset               \
+    --equation            \
     --geometry            \
     --hardcopy            \
     --help                \

completions/zsh/_feedgnuplot

@@ -32,6 +32,7 @@ _arguments -S
     '*--extracmds[Additional gnuplot commands]:command'                           \
     '*--set[Additional 'set' gnuplot commands]:set-option'                        \
     '*--unset[Additional 'unset' gnuplot commands]:unset-option'                  \
+    '*--equation[Raw symbolic equation]:equation'                                 \
     '--square[Plot data with square aspect ratio]'                                \
     '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'    \
     '--hardcopy[Plot to a file]:filename'                                         \

debian/changelog

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

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,20 +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-Git: git://anonscm.debian.org/debian-science/packages/feedgnuplot.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
-
-Package: feedgnuplot
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends},
-         gnuplot-qt | gnuplot-x11 | gnuplot-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | gnuplot
-Description: Pipe-oriented frontend to Gnuplot
- Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
- coming in on STDIN or given in a filename passed on the commandline. Various
- data representations are supported, as is hardcopy output and streaming display
- of live data.

debian/copyright

@@ -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'.

debian/feedgnuplot.doc-base

@@ -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

debian/feedgnuplot.docs

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

debian/feedgnuplot.install

@@ -1,2 +0,0 @@
-completions/bash/feedgnuplot /etc/bash_completion.d/
-completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions

debian/gbp.conf

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

debian/rules

@@ -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

debian/source/format

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

debian/watch

@@ -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