initial tests

When the data-feeding pipe dies (data source exits) I still want to see the
realtime plot, as it appeared at the end

Changes

@@ -1,3 +1,19 @@
+feedgnuplot (1.34)
+
+  * Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey
+    Putkunz
+
+  * Declaring feedgnuplot as a package to let MetaCPAN index this
+    distribution
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 14 May 2014 00:45:24 -0700
+
+feedgnuplot (1.33)
+
+  * fixed incorrect plotting of --timefmt --rangesize plots
+
+ -- Dima Kogan <dima@secretsauce.net>  Thu, 06 Feb 2014 23:17:21 -0800
+
 feedgnuplot (1.32)
 
   * Added --rangesize and --rangesizeall. Different curves can now plot

bin/feedgnuplot

@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+
+package feedgnuplot; # for the metacpan indexer
+
 use strict;
 use warnings;
 use Getopt::Long;
@@ -13,7 +16,7 @@ use Thread::Queue;
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.32;
+my $VERSION = 1.34;
 
 my %options;
 interpretCommandline();
@@ -202,6 +205,23 @@ sub interpretCommandline
     exit -1;
   }
 
+
+  # I now set up the rangesize to always be
+  #  $options{rangesize_hash}{$id} // $options{rangesize_default}
+  if ( $options{rangesizeall} )
+  {
+      $options{rangesize_default} = $options{rangesizeall};
+  }
+  else
+  {
+      $options{rangesize_default} = 1;
+
+      $options{rangesize_default} += $options{extraValuesPerPoint} if ($options{extraValuesPerPoint});
+      $options{rangesize_default}++                                if ($options{colormap});
+      $options{rangesize_default}++                                if ($options{circles} );
+  }
+
+
   # parse stream option. Allowed only numbers >= 0 or 'trigger'. After this code
   # $options{stream} is
   #  -1 for triggered replotting
@@ -354,7 +374,7 @@ sub interpretCommandline
     $options{timefmt} =~ s/^\s*//;
     $options{timefmt} =~ s/\s*$//;
 
-    my $Nfields = scalar split( ' ', $options{timefmt});
+    my $Nfields = () = split /\s+/, $options{timefmt}, -1;
     $options{timefmt_Ncols} = $Nfields;
 
     # make sure --xlen is an integer. With a timefmt xlen goes through strptime
@@ -434,23 +454,12 @@ sub makeDomainNumeric
 
 sub mainThread
 {
-    my $valuesPerPoint;
-    if( $options{rangesizeall} )
-    {
-        $valuesPerPoint = $options{rangesizeall};
-    }
-    else
-    {
-        $valuesPerPoint = 1;
-        if($options{extraValuesPerPoint}) { $valuesPerPoint += $options{extraValuesPerPoint}; }
-        if($options{colormap})            { $valuesPerPoint++; }
-        if($options{circles} )            { $valuesPerPoint++; }
-    }
-
     local *PIPE;
+    pipe my ($pipe_readdata, $pipe_writedata);
+
     my $dopersist = '';
 
-    if( !$options{stream} && getGnuplotVersion() >= 4.3)
+    if( getGnuplotVersion() >= 4.3)
     {
       $dopersist = '--persist';
     }
@@ -637,7 +646,8 @@ sub mainThread
         if(/^replot/o )
         {
           # /timertick/ determines if the timer was the source of the replot
-          replot( $domain0_numeric, /timertick/ );
+          replot( $pipe_readdata, $pipe_writedata,
+                  $domain0_numeric, /timertick/ );
           next;
         }
 
@@ -693,7 +703,8 @@ sub mainThread
               # the x-coordinate of the new point is in the past, so I wipe out
               # all the data and start anew. Before I wipe the old data, I
               # replot the old data
-              replot( $domain0_numeric );
+              replot( $pipe_readdata, $pipe_writedata,
+                      $domain0_numeric );
               clearCurves();
               $latestX = undef;
             }
@@ -720,8 +731,6 @@ sub mainThread
 
         while(@fields)
         {
-            my $rangesize = $valuesPerPoint;
-
             if($options{dataid})
             {
                 $id = shift @fields;
@@ -731,10 +740,10 @@ sub mainThread
                 $id++;
             }
 
-            if( $options{rangesize_hash}{$id} )
-            {
-                $rangesize = $options{rangesize_hash}{$id};
-            }
+            # I'd like to use //, but I guess some people are still on perl 5.8
+            my $rangesize = exists $options{rangesize_hash}{$id} ?
+              $options{rangesize_hash}{$id} :
+              $options{rangesize_default};
 
             last if @fields < $rangesize;
 
@@ -754,7 +763,7 @@ sub mainThread
     }
 
     # finished reading in all. Plot what we have
-    plotStoredData();
+    plotStoredData($pipe_readdata, $pipe_writedata);
 
     if ( defined $options{hardcopy})
     {
@@ -814,18 +823,22 @@ sub pruneOldData
 
 sub plotStoredData
 {
+  my ($pipe_readdata, $pipe_writedata) = @_;
+
   # get the options for those curves that havse any data
   my @nonemptyCurves = grep { $_->{datastring} } @curves;
   my @extraopts = map {$_->{options}} @nonemptyCurves;
 
-  my $body = join(', ' , map({ "'-' $_" } @extraopts) );
+  my $fd = fileno $pipe_readdata;
+
+  my $body = join(', ' , map({ "'<&$fd' $_" } @extraopts) );
   if($options{'3d'}) { print PIPE "splot $body\n"; }
   else               { print PIPE  "plot $body\n"; }
 
   foreach my $curve (@nonemptyCurves)
   {
-    print PIPE $curve->{datastring};
-    print PIPE "e\n";
+    print $pipe_writedata $curve->{datastring};
+    print $pipe_writedata "e\n";
   }
 }
 
@@ -865,7 +878,19 @@ sub updateCurveOptions
   my $usingoptions = '';
   if( $options{timefmt} )
   {
-    $usingoptions = "using 1:" . ($options{timefmt_Ncols}+1);
+      # 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
+      # as 1 + rangesize). I also need to start the range at the first column
+      # past the timefmt
+
+      # I'd like to use //, but I guess some people are still on perl 5.8
+      my $rangesize = exists $options{rangesize_hash}{$id} ?
+        $options{rangesize_hash}{$id} :
+        $options{rangesize_default};
+
+      my @rest = map {$_ + $options{timefmt_Ncols}} (1..$rangesize);
+
+      $usingoptions = "using 1:" . join(':', @rest);
   }
 
   $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $curvestyleall";
@@ -960,7 +985,8 @@ sub replot
   # }
 
 
-  my ($domain0_numeric, $replot_is_from_timer) = @_;
+  my ($pipe_readdata, $pipe_writedata,
+      $domain0_numeric, $replot_is_from_timer) = @_;
 
   my $now = [gettimeofday];
 
@@ -991,7 +1017,7 @@ sub replot
       sendRangeCommand( "xrange", $xmin, $xmax );
     }
 
-    plotStoredData();
+    plotStoredData($pipe_readdata, $pipe_writedata);
 
 
     # update replot state
@@ -1740,10 +1766,12 @@ in a Thinkpad.
  $ while true; do cat /proc/acpi/ibm/thermal | awk '{$1=""; print}' ; sleep 1; done |
    feedgnuplot --stream --xlen 100 --lines --autolegend --ymax 100 --ymin 20 --ylabel 'Temperature (deg C)'
 
-=head2 Plotting a histogram of file sizes in a directory
+=head2 Plotting a histogram of file sizes in a directory, granular to 10MB
 
  $ ls -l | awk '{print $5/1e6}' |
-   feedgnuplot --histogram 0 --with boxes --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
+   feedgnuplot --histogram 0 --with boxes
+     --binwidth 10 --set 'style fill solid'
+     --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
 
 =head1 ACKNOWLEDGEMENT
 

debian/changelog

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

debian/control

@@ -11,7 +11,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnu
 
 Package: feedgnuplot
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, gnuplot-qt | gnuplot-x11 | gnuplot
+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

t/plots.t

@@ -39,7 +39,7 @@ BEGIN {
   }
 }
 
-use Test::More tests => 56;
+use Test::More tests => 58;
 use File::Temp 'tempfile';
 use IPC::Run 'run';
 use String::ShellQuote;
@@ -801,6 +801,53 @@ tryplot( testname => '--timefmt plot with --monotonic',
 
 EOF
 
+tryplot( testname => '--timefmt with custom rangesize',
+         cmd      => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1,$1/10}'},
+         options  => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
+                      qw(--with errorbars --rangesizeall 2)],
+         refplot  => <<'EOF' );
+
+
+  5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
+      +          +           +          +          +          +           +          +          *
+      |                                                                                         *
+    5 ++                                                                                       +A
+      |                                                                                         *
+      |                                                                                         *
+      |                                                                                         *
+  4.5 ++                                                                                       **
+      |                                                                  ***                    |
+      |                                                                   *                     |
+    4 ++                                                                  A                    ++
+      |                                                                   *                     |
+      |                                                                   *                     |
+      |                                                                  ***                    |
+  3.5 ++                                                                                       ++
+      |                                           ***                                           |
+      |                                            *                                            |
+    3 ++                                           A                                           ++
+      |                                            *                                            |
+      |                                            *                                            |
+      |                                           ***                                           |
+  2.5 ++                                                                                       ++
+      |                                                                                         |
+      |                     ***                                                                 |
+    2 ++                     A                                                                 ++
+      |                      *                                                                  |
+      |                     ***                                                                 |
+      |                                                                                         |
+  1.5 ++                                                                                       ++
+      |                                                                                         |
+      |                                                                                         |
+    1 A*                                                                                       ++
+      **                                                                                        |
+      |                                                                                         |
+      +          +           +          +          +          +           +          +          +
+  0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
+    05:08      05:08       05:09      05:09      05:10      05:10       05:11      05:11      05:12
+
+EOF
+
 tryplot( testname => 'Error bars (using extraValuesPerPoint)',
          cmd      => q{seq 5 | gawk '{print $1,$1,$1/10}'},
          options  => [qw(--domain),