version bump

There's just no reason for that at all

Changes

@@ -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)
 
   * Added .gp "terminal" to create self-plotting gnuplot files

INSTALL

@@ -10,4 +10,11 @@ Without a package, an installation can be done with
          make
          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 ...

README.pod

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

bin/feedgnuplot

@@ -16,7 +16,7 @@ use Pod::Usage;
 use Time::Piece;
 
 # Makefile.PL assumes this is in ''
-my $VERSION = '1.51';
+my $VERSION = '1.56';
 
 my %options;
 interpretCommandline();
@@ -31,8 +31,8 @@ interpretCommandline();
 # datastring
 my @curves = ();
 
-# list mapping curve names to their indices in the @curves list
-my %curveIndices = ();
+# Maps a curve ID to the corresponding curve
+my %curveFromID = ();
 
 # Whether any new data has arrived since the last replot
 my $haveNewData;
@@ -90,8 +90,11 @@ sub interpretCommandline
   $options{legend}     = [];
   $options{curvestyle} = [];
   $options{style}      = [];
+  $options{every}      = [];
   $options{histogram}  = [];
-  $options{y2}         = [];
+  $options{x1y2}       = [];
+  $options{x2y1}       = [];
+  $options{x2y2}       = [];
   $options{extracmds}  = [];
   $options{set}        = [];
   $options{unset}      = [];
@@ -105,11 +108,15 @@ sub interpretCommandline
   $options{tuplesize} = [];
 
   GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', 'vnlog!', '3d!', 'colormap!', 'lines!', 'points!',
-             'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
-             'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=s', 'xmax=s', 'y2min=f', 'y2max=f',
-             'zmin=f', 'zmax=f', 'y2=s@',
+             'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'x2label=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
+             'title=s', 'xlen=f',
+             '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@',
-             '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@',
              'image=s',
              'histogram=s@', 'binwidth=f', 'histstyle=s',
@@ -143,6 +150,10 @@ sub interpretCommandline
     delete $options{styleall};
   }
 
+  # various square-xy synonyms
+  $options{'square_xy'} = 1 if $options{'square-xy'} || $options{'squarexy'};
+
+
   push @{$options{curvestyle}}, @{$options{style}};
   delete $options{style};
 
@@ -164,12 +175,12 @@ sub interpretCommandline
   }
 
   # 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}}
       if defined $options{$listkey};
   }
-  for my $listkey (qw(curvestyle rangesize tuplesize))
+  for my $listkey (qw(curvestyle rangesize tuplesize every))
   {
       next unless defined $options{$listkey};
       my @in = @{$options{$listkey}};
@@ -188,6 +199,11 @@ sub interpretCommandline
       @{$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
   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
   # because those are useful to have later. After this I can access individual
   # legends with $options{legend_hash}{curveid}
-  for my $listkey (qw(legend curvestyle rangesize))
+  for my $listkey (qw(legend curvestyle rangesize every))
   {
     $options{"${listkey}_hash"} = {};
 
@@ -347,9 +363,11 @@ sub interpretCommandline
       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;
     }
 
@@ -379,9 +397,9 @@ sub interpretCommandline
   }
   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;
     }
 
@@ -631,11 +649,11 @@ sub mainThread
       }
 
       my %terminalOpts =
-      ( eps  => 'postscript noenhanced solid color enhanced eps',
+      ( eps  => 'postscript noenhanced solid color eps',
         ps   => 'postscript noenhanced solid color landscape 12',
-        pdf  => 'pdfcairo noenhanced solid color font ",12" size 11in,8.5in',
-        png  => 'png noenhanced size 1280,1024',
-        svg  => 'svg noenhanced',
+        pdf  => 'pdfcairo noenhanced solid color font ",12" size 8in,6in',
+        png  => 'pngcairo noenhanced size 1024,768 transparent crop font ",12"',
+        svg  => 'svg noenhanced solid dynamic size 800,600 font ",14"',
         gp   => 'gp');
 
       if( !defined $options{terminal} &&
@@ -745,9 +763,10 @@ sub mainThread
     print PIPE "set grid\n";
 
     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 zlabel  \"$options{zlabel }\"\n") if defined $options{zlabel};
     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};
 
     if($options{square})
@@ -795,9 +814,21 @@ sub mainThread
                        $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{y2}});
+    addCurveOption($_, 'axes x1y2') foreach (@{$options{x1y2}});
+    addCurveOption($_, 'axes x2y1') foreach (@{$options{x2y1}});
+    addCurveOption($_, 'axes x2y2') foreach (@{$options{x2y2}});
 
     # timefmt
     if( $options{timefmt} )
@@ -814,7 +845,14 @@ sub mainThread
 
     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 y2tics\n";
@@ -964,8 +1002,8 @@ sub mainThread
       }
       else
       {
-        $domain[0] = $line_number;
-        $domain0_numeric = makeDomainNumeric( $domain[0] );
+        $domain[0]       = $line_number;
+        $domain0_numeric = $line_number;
       }
 
       my $id = -1;
@@ -1118,7 +1156,7 @@ sub updateCurveOptions
   my $histoptions = $curve->{histoptions} || '';
 
   my $usingoptions = '';
-  if( $options{timefmt} )
+  if( $options{timefmt} && !$histoptions )
   {
       # 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
@@ -1131,7 +1169,7 @@ sub updateCurveOptions
   }
 
 
-  $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions}";
+  $curve->{options} = "$curve->{everyoptions} $histoptions $usingoptions $titleoption $curve->{extraoptions}";
 }
 
 sub getCurve
@@ -1148,19 +1186,23 @@ sub getCurve
 
   my ($id) = @_;
 
-  if( !exists $curveIndices{$id} )
+  if( !exists $curveFromID{$id} )
   {
-    push @curves, {# if we have a catch-all style and no specific style, use
-                   # the catch-all style
-                   extraoptions      => (!exists $options{curvestyle_hash}{$id} &&
-                                          exists $options{curvestyleall}) ?
-                                        "$options{curvestyleall} " : ' ',
-                   datastring        => '',
-                   datastring_meta   => [],
-                   datastring_offset => 0}; # push a curve with no data and no options
-    $curveIndices{$id} =  $#curves;
+    my $curve = {# if we have a catch-all style and no specific style, use
+                 # the catch-all style
+                 extraoptions      => (!exists $options{curvestyle_hash}{$id} &&
+                                        exists $options{curvestyleall}) ?
+                                      "$options{curvestyleall} " : ' ',
+                 everyoptions      => (!exists $options{every_hash}{$id} &&
+                                        exists $options{everyall}) ?
+                                      "every $options{everyall} " : ' ',
+                 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
@@ -1177,8 +1219,11 @@ sub getCurve
         print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n";
         exit -1;
     }
+
+    return $curve;
   }
-  return $curves[$curveIndices{$id}];
+
+  return $curveFromID{$id};
 }
 
 sub addCurveOption
@@ -1189,6 +1234,14 @@ sub addCurveOption
   $curve->{extraoptions} .= "$str ";
   updateCurveOptions($curve, $id);
 }
+sub addEveryOption
+{
+  my ($id, $str) = @_;
+
+  my $curve = getCurve($id);
+  $curve->{everyoptions} .= "every $str ";
+  updateCurveOptions($curve, $id);
+}
 
 sub setCurveLabel
 {
@@ -1365,6 +1418,7 @@ Simple plotting of piped data:
    2 +-----------------------------------------------------------------+ 0
      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
 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
 
-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
-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
 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
@@ -1838,23 +1892,29 @@ instance C<--set 'xrange [20:10]'> to set the given inverted bounds.
 
 =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.
 
 =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>,
-the ID is just an ordered 0-based index. Does not apply to 3d plots. Can be
-passed multiple times, or passed a comma-separated list. By default the y2-axis
-curves look the same as the y-axis ones. I.e. the viewer of the resulting plot
-has to be told which is which via an axes label, legend, etc. Prior to version
-1.25 of 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
+By default data is plotted against the x1 and y1 axes (the left and bottom one
+respectively). If we want a particular curve plotted against a different axis,
+we can specify that with these options. You pass C<--AXIS ID> where C<AXIS>
+defines the axis (C<x2> or C<y2> or C<x1y2> or C<x2y1> or C<x2y2>) and the C<ID>
+is the curve ID. C<--x2> is a synonym for C<--x2y1> and C<--y2> is a synonym for
+C<--x1y2>. The curve ID is an ordered 0-based index or a specific ID if
+C<--dataid> or C<--vnlog>. None of these apply to 3d plots. Can be passed
+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'
 
@@ -1937,6 +1997,21 @@ Exclusive with C<--styleall>.
 
 =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>
 
 Additional commands to pass on to gnuplot verbatim. These could contain extra
@@ -2005,7 +2080,7 @@ all 3 axes
 
 =item
 
-C<--square_xy>
+C<--square-xy>
 
 For 3D plots, set square aspect ratio for ONLY the x,y axes
 
@@ -2174,7 +2249,10 @@ also.
 
 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
 
@@ -2231,7 +2309,7 @@ in a Thinkpad.
 
 =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; }
               $F[0] =~ s/[\[\]]//g or next;
               $F[7] =~ s/.*=//g    or next;

completions/bash/feedgnuplot

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

completions/zsh/_feedgnuplot

@@ -10,22 +10,28 @@ _arguments -S
     '--points'                                                                    \
     '--circles'                                                                   \
     '--xlabel:X-axis label:'                                                      \
+    '--x2label:X2-axis label:'                                                    \
     '--ylabel:Y-axis label:'                                                      \
     '--y2label:Y2-axis label:'                                                    \
     '--zlabel:Z-axis label:'                                                      \
-    '--zlabel:Z-axis label:'                                                      \
     '--title:Plot title:'                                                         \
     '--autolegend[Label each plot with its data ID]'                              \
     '(--3d)--xlen[the size of the x-window to plot]:window size:'                 \
     '(--xlen)--xmin:min X:'                                                       \
     '(--xlen)--xmax:max X:'                                                       \
+    '--x2min:min X2:'                                                             \
+    '--x2max:max X2:'                                                             \
     '--ymin:min Y:'                                                               \
     '--ymax:max Y:'                                                               \
     '--y2min:min Y2:'                                                             \
     '--y2max:max Y2:'                                                             \
     '--zmin:min 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)--styleall[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'                                 \
     '--image[Image file to render beneath the data]:image:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
     '--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)"' \
     '--maxcurves[The maximum allowed number of curves]:number of curves'          \
     '(--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'\
     '(--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:' \
+    '(--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]'                     \
     '--geometry[The X11 geometry string]:geometry string:'                        \
     '*--curvestyle[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:'                            \
     '--binwidth:Histogram bin width:'                                             \
     '--histstyle:Style of histogram:(frequency fnormal unique cumulative cnormal)' \
@@ -54,4 +64,5 @@ _arguments -S
     '--exit[Exit gnuplot after making the plot]'                                  \
     '--version'                                                                   \
     '--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]'