changelog bump

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

Changes

@@ -1,3 +1,77 @@
+feedgnuplot (1.51)
+
+  * Added .gp "terminal" to create self-plotting gnuplot files
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 29 Sep 2018 10:56:30 -0700
+
+feedgnuplot (1.50)
+
+  * 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:11:05 -0700
+
+feedgnuplot (1.49)
+
+  * --vnl now works with plots that have rangesize > 1
+  * zsh completion: --xlen argument isn't optional
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 16 Mar 2018 13:52:28 -0700
+
+feedgnuplot (1.48)
+
+  * --vnlog works properly with --domain
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 24 Feb 2018 12:33:50 -0800
+
+feedgnuplot (1.47)
+
+  * Fixed typo. Everything is un-broken now
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 23 Feb 2018 10:21:13 -0800
+
+feedgnuplot (1.46)
+
+  * Added --tuplesize and --tuplesizeall as alternatives to --rangesize
+    and --rangesizeall. Both forms are supported.
+  * Vnlog integration
+
+ -- Dima Kogan <dima@secretsauce.net>  Thu, 22 Feb 2018 23:37:54 -0800
+
+feedgnuplot (1.45)
+
+  * 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 <dima@secretsauce.net>  Sun, 29 Oct 2017 13:56:28 -0700
+
+feedgnuplot (1.44)
+
+  * --image draws its output beneath everything else
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 20 Jun 2017 16:44:30 -0700
+
+feedgnuplot (1.43)
+
+  * Added --image
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 19 Jun 2017 13:12:38 -0700
+
+feedgnuplot (1.42)
+
+  * Data can now come from STDIN or files on the cmdline.
+    This fixes a regression. Self-plotting data files work again
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Mar 2017 15:38:47 -0700
+
 feedgnuplot (1.41)
 
   * Histograms: --xlen can coexist with --xmin/--xmax
@@ -24,8 +98,8 @@ feedgnuplot (1.39)
 feedgnuplot (1.38)
 
   * hardcopy defaults:
-   - no enhanced text mode
+    - no enhanced text mode
-   - larger font size
+    - larger font size
 
  -- Dima Kogan <dima@secretsauce.net>  Wed, 27 Jul 2016 22:15:11 -0700
 

Makefile.PL

@@ -20,9 +20,9 @@ sub parseversion
 
   while(<PL>)
   {
-    if( /VERSION = ([0-9\.]+)/ )
+    if( /VERSION = '([0-9\.]+)'/ )
     {
-      if ( $1 != $version )
+      if ( $1 ne $version )
       {
         die "Version mismatch. Changes says version is '$version', but 'bin/feedgnuplot' says it is '$1'";
       }

bin/feedgnuplot

@@ -15,7 +15,8 @@ use Text::ParseWords; # for shellwords
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.41;
+# Makefile.PL assumes this is in ''
+my $VERSION = '1.51';
 
 my %options;
 interpretCommandline();
@@ -41,17 +42,10 @@ my $last_replot_time = [gettimeofday];
 
 # whether the previous replot was timer based
 my $last_replot_is_from_timer = 1;
-
-
-my $prev_timed_replot_time = [gettimeofday];
 my $this_replot_is_from_timer;
-my $stdin    = IO::Handle->new();
-die "Couldn't open STDIN" unless $stdin->fdopen(fileno(STDIN),"r");
-my $selector = IO::Select->new( $stdin );
 
 
 
-mainThread();
 
 
 
@@ -108,21 +102,24 @@ sub interpretCommandline
   $options{with}          = '';
 
   $options{rangesize} = [];
+  $options{tuplesize} = [];
 
-  GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', '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',
              'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=s', 'xmax=s', 'y2min=f', 'y2max=f',
              'zmin=f', 'zmax=f', 'y2=s@',
              'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@',
              'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
              'equation=s@',
+             'image=s',
              'histogram=s@', 'binwidth=f', 'histstyle=s',
              'terminal=s',
-             'rangesize=s{2}', 'rangesizeall=i', 'extraValuesPerPoint=i',
+             'rangesize=s{2}', 'rangesizeall=i',
+             'tuplesize=s{2}', 'tuplesizeall=i',
+             'extraValuesPerPoint=i', # deprecated and undocumented
              'help', 'dump', 'exit', 'version',
              'geometry=s') or exit 1;
 
-
   # handle various cmdline-option errors
   if ( $options{help} )
   {
@@ -160,6 +157,11 @@ sub interpretCommandline
     delete $options{with};
   }
 
+  if( $options{dataid} && $options{vnlog} )
+  {
+    print STDERR "--dataid and --vnlog are mutually exclusive. Please just use one.\n";
+    exit -1;
+  }
 
   # expand options that are given as comma-separated lists
   for my $listkey (qw(histogram y2))
@@ -167,7 +169,7 @@ sub interpretCommandline
     @{$options{$listkey}} = map split('\s*,\s*', $_), @{$options{$listkey}}
       if defined $options{$listkey};
   }
-  for my $listkey (qw(curvestyle rangesize))
+  for my $listkey (qw(curvestyle rangesize tuplesize))
   {
       next unless defined $options{$listkey};
       my @in = @{$options{$listkey}};
@@ -187,6 +189,35 @@ sub interpretCommandline
   }
 
 
+  # convert all tuplesize business to rangesize
+  my $domainsize = $options{'3d'} ? 2 : 1;
+  if (defined $options{tuplesizeall})
+  {
+      if (defined $options{rangesizeall} )
+      {
+          print STDERR "Only one of --rangesizeall and --tuplesizeall may be given\n";
+          exit -1;
+      }
+
+      $options{rangesizeall} = $options{tuplesizeall} - $domainsize;
+      delete $options{tuplesizeall};
+  }
+  if (defined $options{tuplesize})
+  {
+      $options{rangesize} //= [];
+
+      my $N = @{$options{tuplesize}} / 2;
+      for my $i (0..$N-1)
+      {
+          $options{tuplesize}[2*$i + 1] -= $domainsize;
+      }
+
+      push @{$options{rangesize}}, @{$options{tuplesize}};
+      delete $options{tuplesize};
+  }
+
+
+
   # If we're plotting histograms, then set the default histogram options for
   # each histogram curve
   #
@@ -427,6 +458,30 @@ sub interpretCommandline
       }
     }
   }
+
+  # deal with --image. I just fill in --equation, and reverse the y extents if
+  # none are explicitly given
+  if( defined $options{image} )
+  {
+      # images generally have the origin at the top-left instead of the
+      # bottom-left, so given nothing else, I flip the y axis
+      if( !defined $options{xmin} && !defined $options{xmax} &&
+          !defined $options{ymin} && !defined $options{ymax} &&
+          ! any { /^ *xrange\b/ } @{$options{set}} &&
+          ! any { /^ *yrange\b/ } @{$options{set}} )
+      {
+          push @{$options{set}}, "xrange [:] noextend";
+          push @{$options{set}}, "yrange [:] reverse noextend";
+      }
+
+      if ( ! -r $options{image} )
+      {
+          die "Couldn't read image '$options{image}'";
+      }
+
+      unshift @{$options{equation}}, qq{"$options{image}" binary filetype=auto flipy with rgbimage title "$options{image}"};
+      delete $options{image};
+  }
 }
 
 sub getGnuplotVersion
@@ -479,16 +534,66 @@ sub makeDomainNumeric
 }
 
 
+my $prev_timed_replot_time = [gettimeofday];
+my $pipe_in;
+my $selector;
+my $line_number = 0;
+my $is_stdin = !@ARGV; # read stdin only if no data files given on the cmdline
+sub openNextFile
+{
+    my $fd;
+    if($is_stdin)
+    {
+        $fd = IO::Handle->new();
+        $fd->fdopen(fileno(STDIN), "r") or die "Couldn't open STDIN";
+    }
+    else
+    {
+        my $filename = shift @ARGV;
+        $fd = IO::File->new($filename, "r") or die "Couldn't open file '$filename'";
+    }
+
+    my $selector = IO::Select->new( $fd );
+    return ($fd, $selector);
+}
 sub getNextLine
 {
+    sub getline_internal
+    {
+        while(1)
+        {
+            my $line = $pipe_in->getline();
+            if( !$is_stdin && !defined $line && $pipe_in->eof() && @ARGV)
+            {
+                # I got to the end of one file, so open the next one (which I'm
+                # sure exists)
+                ($pipe_in, $selector) = openNextFile();
+                next;
+            }
+            return $line;
+        }
+    }
+
+
+
+
+
+    if( !defined $pipe_in )
+    {
+        ($pipe_in, $selector) = openNextFile();
+    }
+
     while(1)
     {
         $this_replot_is_from_timer = undef;
 
         # if we're not streaming, or we're doing triggered-only replotting, simply
         # do a blocking read
-        return $stdin->getline()
+        if (! $options{stream} || $options{stream} < 0)
-          if (! $options{stream} || $options{stream} < 0);
+        {
+            $line_number++;
+            return getline_internal();
+        }
 
 
         my $now = [gettimeofday];
@@ -503,7 +608,8 @@ sub getNextLine
 
         if ($selector->can_read($time_remaining))
         {
-            return $stdin->getline();
+            $line_number++;
+            return getline_internal();
         }
     }
 }
@@ -511,51 +617,15 @@ sub getNextLine
 sub mainThread
 {
     local *PIPE;
-    my $dopersist = '';
-
-    if( getGnuplotVersion() >= 4.3 && # --persist not available before this
-
-        # --persist is needed for the "half-alive" state (see documentation for
-        # --exit). This state is only used with these options:
-        !$options{stream} && $options{exit})
-    {
-      $dopersist = '--persist';
-    }
-
-    # We trap SIGINT to kill the data input, but keep the plot up. see
-    # documentation for --exit
-    if ($options{stream} && !$options{exit})
-    {
-        $SIG{INT} = sub
-        {
-            print STDERR "$0 received SIGINT. Send again to quit\n";
-            $SIG{INT} = undef;
-        };
-    }
-
-
-
-
-    if(exists $options{dump})
-    {
-      *PIPE = *STDOUT;
-    }
-    else
-    {
-      my $geometry = defined $options{geometry} ?
-        "-geometry $options{geometry}" : '';
-      open PIPE, "|gnuplot $geometry $dopersist" or die "Can't initialize gnuplot\n";
-    }
-    autoflush PIPE 1;
 
     my $outputfile;
     my $outputfileType;
     if( defined $options{hardcopy})
     {
       $outputfile = $options{hardcopy};
-      if( $outputfile =~ /^[^|]                       # starts with anything other than |
+      if( $outputfile =~ /^[^|]                          # starts with anything other than |
-                          .*                          # stuff in the middle
+                          .*                             # stuff in the middle
-                          \.(eps|ps|pdf|png|svg)$/ix) # ends with a known extension
+                          \.(eps|ps|pdf|png|svg|gp)$/ix) # ends with a known extension
       {
         $outputfileType = lc $1;
       }
@@ -565,7 +635,8 @@ sub mainThread
         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');
+        svg  => 'svg noenhanced',
+        gp   => 'gp');
 
       if( !defined $options{terminal} &&
            defined $outputfileType    &&
@@ -577,8 +648,89 @@ sub mainThread
       die "Asked to plot to file '$outputfile', but I don't know which terminal to use, and no --terminal given"
         unless $options{terminal};
     }
-    print PIPE "set terminal $options{terminal}\n" if $options{terminal};
+
-    print PIPE "set output \"$outputfile\"\n"      if $outputfile;
+
+    sub gpterminal
+    {
+        return defined $options{terminal} && $options{terminal} eq 'gp';
+    }
+    sub datadump_only
+    {
+        return
+          exists $options{dump} ||
+          gpterminal();
+    }
+    sub search_PATH
+    {
+        for my $pathdir (File::Spec->path())
+        {
+            my $gnuplot_execpath = File::Spec->catfile($pathdir, $_[0]);
+            return $gnuplot_execpath
+              if -x $gnuplot_execpath && ! -d $gnuplot_execpath;
+        }
+        return undef;
+    }
+
+
+
+
+
+    if(datadump_only())
+    {
+        if(gpterminal())
+        {
+            open PIPE, '>', $outputfile;
+
+            my $gnuplotpath = search_PATH('gnuplot');
+            if(!defined $gnuplotpath)
+            {
+                print STDERR "Couldn't find the gnuplot executable path. Creating .gp file still, but omitting #!. This will NOT be self-executable";
+            }
+            else
+            {
+                chmod 0755, $outputfile;
+                print PIPE "#!$gnuplotpath\n";
+            }
+        }
+        else
+        {
+            *PIPE = *STDOUT;
+        }
+    }
+    else
+    {
+        my $dopersist = '';
+
+        if ( getGnuplotVersion() >= 4.3 && # --persist not available before this
+
+             # --persist is needed for the "half-alive" state (see documentation for
+             # --exit). This state is only used with these options:
+             !$options{stream} && $options{exit}) {
+            $dopersist = '--persist';
+        }
+
+        # We trap SIGINT to kill the data input, but keep the plot up. see
+        # documentation for --exit
+        if ($options{stream} && !$options{exit})
+        {
+            $SIG{INT} = sub
+            {
+                print STDERR "$0 received SIGINT. Send again to quit\n";
+                $SIG{INT} = undef;
+            };
+        }
+
+        my $geometry = defined $options{geometry} ?
+          "-geometry $options{geometry}" : '';
+        open PIPE, "|gnuplot $geometry $dopersist" or die "Can't initialize gnuplot\n";
+        autoflush PIPE 1;
+    }
+
+    if(!gpterminal())
+    {
+        print PIPE "set terminal $options{terminal}\n" if $options{terminal};
+        print PIPE "set output \"$outputfile\"\n"      if $outputfile;
+    }
 
     # set up plotting style
     my $style = '';
@@ -654,11 +806,6 @@ sub mainThread
       print(PIPE "set xdata time\n");
     }
 
-    # 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
     $options{binwidth} ||= 1;   # if no binwidth given, set it to 1
     print PIPE
@@ -681,6 +828,11 @@ sub mainThread
     sendRangeCommand( "zrange",  $options{zmin}, $options{zmax} );
     sendRangeCommand( "cbrange", $options{zmin}, $options{zmax} ) if($options{colormap});
 
+    # 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}});
+
 
 
 
@@ -690,6 +842,41 @@ sub mainThread
     # The domain of the current point
     my @domain;
 
+    # column headers from vnlog
+    my @vnlog_headers;
+    if($options{vnlog})
+    {
+        require Vnlog::Parser;
+        require Vnlog::Util;
+
+        if ( !defined $pipe_in )
+        {
+            ($pipe_in, $selector) = openNextFile();
+        }
+
+        my $parser = Vnlog::Parser->new();
+        while (defined ($_ = Vnlog::Util::get_unbuffered_line($pipe_in)))
+        {
+            if ( !$parser->parse($_) )
+            {
+                die "Error parsing vnlog: $parser->{error}; looking at line '$_'";
+            }
+
+            my $keys = $parser->getKeys();
+            if (defined $keys)
+            {
+                @vnlog_headers = @$keys;
+                last;
+            }
+        }
+        if(!@vnlog_headers)
+        {
+            die "Looked through all of the first file, and never saw a vnlog legend";
+        }
+    }
+
+
+
     # The x-axis domain represented as a number. This is exactly the same as
     # $domain[0] unless the x-axis domain uses a timefmt. Then this is the
     # number of seconds since the UNIX epoch.
@@ -727,6 +914,7 @@ sub mainThread
       # 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x"
 
       my @fields = split;
+      my $i_column = 0;
 
       if($options{domain})
       {
@@ -738,6 +926,7 @@ sub mainThread
 
             $domain[0] = join (' ', splice( @fields, 0, $options{timefmt_Ncols}) );
             $domain0_numeric = makeDomainNumeric( $domain[0] );
+            $i_column += $options{timefmt_Ncols};
         }
         elsif(!$options{'3d'})
         {
@@ -746,6 +935,7 @@ sub mainThread
             next if @fields < 1+1;
 
             $domain[0] = $domain0_numeric = shift @fields;
+            $i_column += 1;
         }
         else
         {
@@ -754,6 +944,7 @@ sub mainThread
             next if @fields < 2+1;
 
             @domain = splice(@fields, 0, 2);
+            $i_column += 2;
         }
 
         if( $options{monotonic} )
@@ -773,16 +964,32 @@ sub mainThread
       }
       else
       {
-        $domain[0] = $.;
+        $domain[0] = $line_number;
         $domain0_numeric = makeDomainNumeric( $domain[0] );
       }
 
       my $id = -1;
-
       while(@fields)
       {
-          if($options{dataid}) { $id = shift @fields; }
+          if   ($options{dataid})
-          else                 { $id++;               }
+          {
+              $id = shift @fields;
+          }
+          elsif($options{vnlog} )
+          {
+              if( $i_column >= @vnlog_headers )
+              {
+                  # Got more columns than vnlog headers. The data is probably
+                  # bogus, but I don't want to barf at the user, so I silently
+                  # ignore the data
+                  last;
+              }
+              $id = $vnlog_headers[$i_column];
+          }
+          else
+          {
+              $id++;
+          }
 
           my $rangesize = getRangeSize($id);
           last if @fields < $rangesize;
@@ -792,13 +999,15 @@ sub mainThread
                          @domain,
                          splice( @fields, 0, $rangesize ) ) . "\n",
                     $domain0_numeric);
+
+          $i_column += $rangesize;
       }
     }
 
     # finished reading in all. Plot what we have
     plotStoredData() unless $options{stream} && $options{exit};
 
-    if ( defined $options{hardcopy})
+    if ( defined $options{hardcopy} && !gpterminal())
     {
       print PIPE "set output\n";
 
@@ -827,7 +1036,15 @@ sub mainThread
     # we persist gnuplot, so we shouldn't need this sleep. However, once
     # gnuplot exits, but the persistent window sticks around, you can no
     # longer interactively zoom the plot. So we still sleep
-    sleep(100000000) unless $options{dump} || $options{exit};
+    if(gpterminal())
+    {
+        print PIPE "pause mouse close\n";
+        close PIPE;
+    }
+    elsif(!($options{dump} || $options{exit}))
+    {
+        print PIPE "pause mouse close\n";
+    }
 }
 
 sub pruneOldData
@@ -913,7 +1130,8 @@ sub updateCurveOptions
       $usingoptions = "using 1:" . join(':', @rest);
   }
 
-  $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $options{curvestyleall}";
+
+  $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions}";
 }
 
 sub getCurve
@@ -932,7 +1150,11 @@ sub getCurve
 
   if( !exists $curveIndices{$id} )
   {
-    push @curves, {extraoptions      => ' ',
+    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
@@ -1082,6 +1304,9 @@ sub pushPoint
 }
 
 
+mainThread();
+
+
 =head1 NAME
 
 feedgnuplot - General purpose pipe-oriented plotting tool
@@ -1099,45 +1324,45 @@ Simple plotting of piped data:
 
  $ seq 5 | awk '{print 2*$1, $1*$1}' |
    feedgnuplot --lines --points --legend 0 "data 0" --title "Test plot" --y2 1
-               --terminal 'dumb 80,40' --exit
+               --unset grid --terminal 'dumb 80,40' --exit
 
                                   Test plot
 
-  10 ++------+--------+-------+-------+-------+--------+-------+------*A 25
+  10 +-----------------------------------------------------------------+ 25
-     +       +        +       +       +       +        +       +    **#+
+     |       +        +       +       +       +        +       +    *##|
-     |       :        :       :       :       :        : data 0+**A*** |
+     |                                                  data 0 ***A*#* |
-     |       :        :       :       :       :        :       :** #   |
+     |                                                          ** #   |
-   9 ++.......................................................**.##....|
+   9 |-+                                                      ** ##    |
-     |       :        :       :       :       :        :    ** :#      |
+     |                                                      **  #      |
-     |       :        :       :       :       :        :  **   #       |
+     |                                                    **   #       |
-     |       :        :       :       :       :        :**   ##:      ++ 20
+     |                                                  **   ##      +-| 20
-   8 ++................................................A....#..........|
+   8 |-+                                               A    #          |
-     |       :        :       :       :       :      **:   #   :       |
+     |                                               **    #           |
-     |       :        :       :       :       :    **  : ##    :       |
+     |                                             **    ##            |
-     |       :        :       :       :       :  **    :#      :       |
+     |                                           **     #              |
-     |       :        :       :       :       :**      B       :       |
+     |                                         **      B               |
-   7 ++......................................**......##................|
+   7 |-+                                     **      ##                |
-     |       :        :       :       :    ** :    ##  :       :      ++ 15
+     |                                     **      ##                +-| 15
-     |       :        :       :       :  **   :   #    :       :       |
+     |                                   **       #                    |
-     |       :        :       :       :**     : ##     :       :       |
+     |                                 **       ##                     |
-   6 ++..............................*A.......##.......................|
+   6 |-+                             *A       ##                       |
-     |       :        :       :    ** :     ##:        :       :       |
+     |                             **       ##                         |
-     |       :        :       :  **   :    #  :        :       :       |
+     |                           **        #                           |
-     |       :        :       :**     :  ##   :        :       :      ++ 10
+     |                         **        ##                          +-| 10
-   5 ++......................**........##..............................|
+   5 |-+                     **        ##                              |
-     |       :        :    ** :      #B       :        :       :       |
+     |                     **        #B                                |
-     |       :        :  **   :    ## :       :        :       :       |
+     |                   **        ##                                  |
-     |       :        :**     :  ##   :       :        :       :       |
+     |                 **        ##                                    |
-   4 ++...............A.......###......................................|
+   4 |-+              A       ###                                      |
-     |       :      **:     ##:       :       :        :       :       |
+     |              **      ##                                         |
-     |       :    **  :   ##  :       :       :        :       :      ++ 5
+     |            **      ##                                         +-| 5
-     |       :  **    : ##    :       :       :        :       :       |
+     |          **      ##                                             |
-     |       :**    ##B#      :       :       :        :       :       |
+     |        **    ##B#                                               |
-   3 ++.....**..####...................................................|
+   3 |-+    **  ####                                                   |
-     |    **####      :       :       :       :        :       :       |
+     |    **####                                                       |
-     |  **## :        :       :       :       :        :       :       |
+     |  ####                                                           |
-     B**     +        +       +       +       +        +       +       +
+     |##     +        +       +       +       +        +       +       |
-   2 A+------+--------+-------+-------+-------+--------+-------+------++ 0
+   2 +-----------------------------------------------------------------+ 0
      1      1.5       2      2.5      3      3.5       4      4.5      5
 
 
@@ -1205,41 +1430,64 @@ with the I<X>-value at the start of that line.
 
 =head3 Curve indexing
 
-By default, each column represents a separate curve. This is fine unless sparse
+We index the curves in one of 3 ways: sequentially, explicitly with a
-data is to be plotted. With the C<--dataid> option, each point is represented by
+C<--dataid> or by C<--vnlog> headers.
-2 values: a string identifying the curve, and the value itself. If we add
+
-C<--dataid> to the original example:
+By default, each column represents a separate curve. The first column (after any
+domain) is curve C<0>. The next one is curve C<1> and so on. This is fine unless
+sparse data is to be plotted. With the C<--dataid> option, each point is
+represented by 2 values: a string identifying the curve, and the value itself.
+If we add C<--dataid> to the original example:
 
  $ seq 5 | awk '{print 2*$1, $1*$1}' | feedgnuplot --dataid --autolegend
 
 we get 5 different curves with one point in each. The first column, as produced
 by C<awk>, is B<2,4,6,8,10>. These are interpreted as the IDs of the curves to
-be plotted. The C<--autolegend> option adds a legend using the given IDs to
+be plotted.
+
+If we're plotting C<vnlog> data (L<https://www.github.com/dkogan/vnlog>) then we
+can get the curve IDs from the vnlog header. Vnlog is a trivial data format
+where lines starting with C<#> are comments and the first comment contains
+column labels. If we have such data, C<feedgnuplot --vnlog> can interpret these
+column labels if the C<vnlog> perl modules are available.
+
+The C<--autolegend> option adds a legend using the given IDs to
 label the curves. The IDs need not be numbers; generic strings are accepted. As
 many points as desired can appear on a single line. C<--domain> can be used in
-conjunction with C<--dataid>.
+conjunction with C<--dataid> or C<--vnlog>.
 
 =head3 Multi-value style support
 
 Depending on how gnuplot is plotting the data, more than one value may be needed
 to represent the range of a single point. Basic 2D plots have 2 numbers
 representing each point: 1 domain and 1 range. But if plotting with
-C<--circles>, for instance, then there's an extra range value: the radius. A
+C<--circles>, for instance, then there's an extra range value: the radius. Many
-similar situation exists with C<--colormap> where each point contains the
+other gnuplot styles require more data: errorbars, variable colors (C<with
-position I<and> the color. There are other gnuplot styles that require more data
+points palette>), variable sizes (C<with points ps variable>), labels and so on.
-(such as error bars), but none of these are directly supported by the script.
+The feedgnuplot tool itself does not know about all these intricacies, but they
-They can still be used, however, by specifying the specific style with
+can still be used, by specifying the specific style with C<--style>, and
-C<--style>, and specifying how many values are needed for each point with
+specifying how many values are needed for each point with any of
-C<--rangesizeall> or C<--rangesize> or C<--extraValuesPerPoint>. Those options
+C<--rangesizeall>, C<--tuplesizeall>, C<--rangesize>, C<--tuplesize>. These
-that specify the range size are required I<only> for styles not explicitly
+options are required I<only> for styles not explicitly supported by feedgnuplot;
-supported by feedgnuplot; supported styles do the right thing automatically.
+supported styles do the right thing automatically.
 
-More examples: if making a 2d plot of y error bars where gnuplot expects a
+Specific example: if making a 2d plot of y error bars, the exact format can be
-(x,y,ydelta) tuple for each point, you want C<--rangesizeall 2> because you have
+queried by running C<gnuplot> and invoking C<help yerrorbars>. This tells us
-one domain value (x) and 2 range values (y,ydelta). Gnuplot can also plot
+that there's a 3-column form: C<x y ydelta> and a 4-column form: C<x y ylow
-lopsided y errorbars by giving a tuple (x,y,ylow,yhigh). This is similar as
+yhigh>. With 2d plots feedgnuplot will always output the 1-value domain C<x>, so
-before, but you want C<--rangesizeall 3> instead.
+the rangesize is 2 and 3 respectively. Thus the following are equivalent:
 
+ $ echo '1 2 0.3
+         2 3 0.4
+         3 4 0.5' | feedgnuplot --domain --rangesizeall 2 --with 'yerrorbars'
+
+ $ echo '1 2 0.3
+         2 3 0.4
+         3 4 0.5' | feedgnuplot --domain --tuplesizeall 3 --with 'yerrorbars'
+
+ $ echo '1 2 1.7 2.3
+         2 3 2.6 3.4
+         3 4 3.5 4.5' | feedgnuplot --domain --rangesizeall 3 --with 'yerrorbars'
 
 =head3 3D data
 
@@ -1343,15 +1591,20 @@ This command causes feedgnuplot to exit.
 
 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>,
-B<.svg> or B<.png> is requested. If any other file type is requested,
+B<.svg>, B<.png> or B<.gp> is requested. If any other file type is requested,
 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.
 
+The B<.gp> output is special. Instead of asking gnuplot to plot to a particular
+terminal, writing to a B<.gp> simply dumps a self-executable gnuplot script into
+the given file. This is similar to what C<--dump> does, but writes to a file,
+and makes sure that the file can be self-executing.
+
 =head2 Self-plotting data files
 
-This script can be used to enable self-plotting data files. There are 2 ways of
+This script can be used to enable self-plotting data files. There are several
-doing this: with a shebang (#!) or with inline perl data.
+ways of doing this: with a shebang (#!) or with inline perl data.
 
 =head3 Self-plotting data with a #!
 
@@ -1385,6 +1638,11 @@ characters and that the full path to feedgnuplot must be given. The 127
 character limit is a serious limitation, but this can likely be resolved with a
 kernel patch. I have only tried on Linux 2.6.
 
+=head3 Self-plotting data with gnuplot
+
+Running C<feedgnuplot --hardcopy plotdata.gp ....> will create a self-executable
+gnuplot script in C<plotdata.gp>
+
 =head3 Self-plotting data with perl inline data
 
 Perl supports storing data and code in the same file. This can also be used to
@@ -1473,6 +1731,19 @@ point in curve ID 20
 
 =item
 
+C<--vnlog>
+
+Vnlog is a trivial data format where lines starting with C<#> are comments and
+the first comment contains column labels. Some tools for working with such data
+are available from the C<vnlog> project: L<https://www.github.com/dkogan/vnlog>.
+With the C<vnlog> perl modules installed, we can read the vnlog column headers
+with C<feedgnuplot --vnlog>. This replaces C<--dataid>, and we can do all the
+normal things with these headers. For instance C<feedgnuplot --vnlog
+--autolegend> will generate plot legends for each column in the vnlog, using the
+vnlog column label in the legend.
+
+=item
+
 C<--[no]3d>
 
 Do [not] plot in 3D. This only makes sense with C<--domain>. Each domain here is
@@ -1489,7 +1760,8 @@ Interpret the X data as a time/date, parsed with the given format
 C<--colormap>
 
 Show a colormapped xy plot. Requires extra data for the color. zmin/zmax can be
-used to set the extents of the colors. Automatically sets the C<--rangesize>.
+used to set the extents of the colors. Automatically sets the
+C<--rangesize>/C<--tuplesize>.
 
 =item
 
@@ -1517,7 +1789,8 @@ Do [not] draw points
 C<--circles>
 
 Plot with circles. This requires a radius be specified for each point.
-Automatically sets the C<--rangesize>. C<Not> supported for 3d plots.
+Automatically sets the C<--rangesize>/C<--tuplesize>. C<Not> supported for 3d
+plots.
 
 =item
 
@@ -1558,7 +1831,10 @@ C<--xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx>
 
 Set the range for the given axis. These x-axis bounds are ignored in a streaming
 plot. The y2-axis bound do not apply in 3d plots. The z-axis bounds apply
-I<only> to 3d plots or colormaps.
+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
+instance C<--set 'xrange [20:10]'> to set the given inverted bounds.
 
 =item
 
@@ -1683,15 +1959,26 @@ times.
 
 =item
 
+C<--image filename>
+
+Overlays the data on top of a raster image given in C<filename>. This is passed
+through to gnuplot via C<--equation>, and is not interpreted by C<feedgnuplot>
+other than checking for existence. Usually images have their origin at the
+top-left corner, while plots have it in the bottom-left corner instead. Thus if
+the y-axis extents are not specified (C<--ymin>, C<--ymax>, C<--set 'yrange
+...'>) this option will also flip around the y axis to make the image appear
+properly. Since this option is just a passthrough to gnuplot, finer control can
+be achieved by passing in C<--equation> and C<--set yrange ...> directly.
+
 C<--equation xxx>
 
 Gnuplot can plot both data and symbolic equations. C<feedgnuplot> generally
 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
+multiple equations. The given strings are passed to gnuplot directly without
-thing added or removed, so styling and such should be applied in the string. A
+anything added or removed, so styling and such should be applied in the string.
-basic example:
+A basic example:
 
  seq 100 | awk '{print $1/10, $1/100}' |
    feedgnuplot --with 'lines lw 3' --domain --ymax 1
@@ -1741,7 +2028,7 @@ file type is desired, use both C<--hardcopy> and C<--terminal>
 
 =item
 
-C<--maxcurves xxx>
+C<--maxcurves N>
 
 The maximum allowed number of curves. This is 100 by default, but can be reset
 with this option. This exists purely to prevent perl from allocating all of the
@@ -1751,20 +2038,22 @@ system's memory when reading bogus data
 
 C<--monotonic>
 
-If C<--domain> is given, checks to make sure that the x- coordinate in the input
+If C<--domain> is given, checks to make sure that the x-coordinate in the input
 data is monotonically increasing. If a given x-variable is in the past, all data
 currently cached for this curve is purged. Without C<--monotonic>, all data is
-kept. Does not make sense with 3d plots. No C<--monotonic> by default. The data is
+kept. Does not make sense with 3d plots. No C<--monotonic> by default. The data
-replotted before being purged
+is replotted before being purged. This is useful in streaming plots where the
+incoming data represents multiple iterations of the same process (repeated
+simulations of the same period in time, for instance).
 
 =item
 
-C<--rangesize curveID xxx>
+C<--rangesize curveID N>
 
-The options C<--rangesizeall>, C<--rangesize> and C<--extraValuesPerPoint> set
+The options C<--rangesizeall> and C<--rangesize> set the number of values are
-the number of values are needed to represent each point being plotted (see
+needed to represent each point being plotted (see L</"Multi-value style
-L</"Multi-value style support"> above). These options are I<only> needed if
+support"> above). These options are I<only> needed if unknown styles are used,
-unknown styles are used, with C<--styleall> or C<--with> for instance.
+with C<--styleall> or C<--with> for instance.
 
 C<--rangesize> is used to set how many values are needed to represent the range
 of a point for a particular curve. This overrides any defaults that may exist
@@ -1776,19 +2065,25 @@ rangesize should apply.
 
 =item
 
-C<--rangesizeall xxx>
+C<--tuplesize curveID N>
+
+Very similar to C<--rangesize>, but instead of specifying the I<range> only,
+this specifies the whole tuple. For instance if we're plotting circles, the
+tuplesize is 3: C<x,y,radius>. In a 2D plot there's a 1-dimensional domain:
+C<x>, so the rangesize is 2: C<y,radius>. This dimensionality can be given
+either way.
+
+=item
+
+C<--rangesizeall N>
 
 Like C<--rangesize>, but applies to I<all> the curves.
 
-C<--extraValuesPerPoint xxx>
+=item
 
-Like C<--rangesizeall>, but instead of overriding the default, adds to it. For
+C<--tuplesizeall N>
-example, if plotting non-lopsided y errorbars gnuplot wants (x,y,ydelta) tuples.
-These can be specified both with C<--rangesizeall 2> (because there are 2 range
-values) or C<--extraValuesPerPoint 1> (because there's 1 more value than usual).
 
-This option is I<only> needed if unknown styles are used, with C<--styleall> or
+Like C<--tuplesize>, but applies to I<all> the curves.
-C<--with> for instance.
 
 =item
 
@@ -1801,16 +2096,15 @@ is possible to send the output produced this way to gnuplot directly.
 
 C<--exit>
 
-This controls the details of what happens when the input data is exhausted, or
+This controls what happens when the input data is exhausted, or when some part
-when some part of the C<feedgnuplot> pipeline is killed. This option does
+of the C<feedgnuplot> pipeline is killed. This option does different things
-different things depending on whether C<--stream> is active, so read this
+depending on whether C<--stream> is active, so read this closely.
-closely.
 
 With interactive gnuplot terminals (qt, x11, wxt), the plot windows live in a
 separate process from the main C<gnuplot> process. It is thus possible for the
 main C<gnuplot> process to exit, while leaving the plot windows up (a caveat is
-that such decapitated windows aren't interactive). To be clear, there are 3
+that such decapitated windows aren't interactive). There are 3 possible states
-possible states:
+of the polotting pipeline:
 
 =over
 
@@ -1825,35 +2119,35 @@ prompt available
 
 =back
 
-The C<--exit> option controls the details of this behavior. The possibilities
+The possibilities are:
-are:
 
 =over
 
-=item No C<--stream>, input pipe is exhausted (all data read in)
+=item No C<--stream>, all data read in
 
 =over
 
-=item default; no C<--exit>
+=item no C<--exit> (default)
 
 Alive. Need to Ctrl-C to get back into the shell
 
 =item C<--exit>
 
 Half-alive. Non-interactive prompt up, and the shell accepts new commands.
-Without C<--stream> the goal is to show a plot, so a Dead state is not useful
+Without C<--stream> the goal is to show a plot, so a Dead state would not be
-here.
+useful.
 
 =back
 
-=item C<--stream>, input pipe is exhausted (all data read in) or the
+=item C<--stream>, all data read in or the C<feedgnuplot> process terminated
-C<feedgnuplot> process terminated
 
 =over
 
-=item default; no C<--exit>
+=item no C<--exit> (default)
 
-Alive. Need to Ctrl-C to get back into the shell
+Alive. Need to Ctrl-C to get back into the shell. This means that when making
+live plots, the first Ctrl-C kills the data feeding process, but leaves the
+final plot up for inspection. A second Ctrl-C kills feedgnuplot as well.
 
 =item C<--exit>
 
@@ -1948,11 +2242,21 @@ in a Thinkpad.
 
 =head2 Plotting points on top of an existing image
 
-This can be done by using C<--equation> to pass arbitrary plot input to gnuplot:
+This can be done with C<--image>:
+
+ $ < features_xy.data
+   feedgnuplot --points --domain --image "image.png"
+
+or with C<--equation>:
 
  $ < features_xy.data
    feedgnuplot --points --domain
-     --equation '"image.png" binary filetype=png flipy with rgbimage'
+     --equation '"image.png" binary filetype=auto flipy with rgbimage'
+     --set 'yrange [:] reverse'
+
+The C<--image> invocation is a convenience wrapper for the C<--equation>
+version. Finer control is available with C<--equation>.
+
 
 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

completions/bash/feedgnuplot

@@ -21,6 +21,7 @@ complete -W               \
     --set                 \
     --unset               \
     --equation            \
+    --image               \
     --geometry            \
     --hardcopy            \
     --help                \

completions/zsh/_feedgnuplot

@@ -16,7 +16,7 @@ _arguments -S
     '--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:'                \
+    '(--3d)--xlen[the size of the x-window to plot]:window size:'                 \
     '(--xlen)--xmin:min X:'                                                       \
     '(--xlen)--xmax:max X:'                                                       \
     '--ymin:min Y:'                                                               \
@@ -33,9 +33,10 @@ _arguments -S
     '*--set[Additional 'set' gnuplot commands]:set-option'                        \
     '*--unset[Additional 'unset' gnuplot commands]:unset-option'                  \
     '*--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]'    \
-    '--hardcopy[Plot to a file]:filename'                                         \
+    '--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'\
@@ -47,7 +48,7 @@ _arguments -S
     '*--style[Additional styles for a curve]:curve id: :style:'                   \
     '(--3d)*--histogram:plot to treat as a histogram:'                            \
     '--binwidth:Histogram bin width:'                                             \
-    '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'        \
+    '--histstyle:Style of histogram:(frequency fnormal unique cumulative cnormal)' \
     '--terminal:Terminal options to set with "set terminal":'                     \
     '*--legend[Legend for a curve]:curve id: :legend:'                            \
     '--exit[Exit gnuplot after making the plot]'                                  \

debian/changelog

@@ -1,3 +1,72 @@
+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:

debian/control

@@ -6,8 +6,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.
 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: https://salsa.debian.org/science-team/feedgnuplot
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
+Vcs-Git: https://salsa.debian.org/science-team/feedgnuplot.git
 
 Package: feedgnuplot
 Architecture: all

debian/feedgnuplot.install

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