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

bin/feedgnuplot

@@ -75,7 +75,6 @@ if($options{stream})
   }
 
   $streamingFinished = 1;
-  $dataQueue->enqueue(undef);
 
   $plotThr->join() if defined $plotThr;
   $addThr->join();
@@ -414,6 +413,8 @@ sub plotUpdateThread
     # indicate that the timer was the replot source
     $dataQueue->enqueue('replot timertick');
   }
+
+  $dataQueue->enqueue(undef);
 }
 
 sub sendRangeCommand
@@ -454,6 +455,14 @@ sub makeDomainNumeric
 sub mainThread
 {
     local *PIPE;
+    pipe my ($pipe_readdata, $pipe_writedata);
+
+    my $dopersist = '';
+
+    if( getGnuplotVersion() >= 4.3)
+    {
+      $dopersist = '--persist';
+    }
 
     if(exists $options{dump})
     {
@@ -463,7 +472,7 @@ sub mainThread
     {
       my $geometry = defined $options{geometry} ?
         "-geometry $options{geometry}" : '';
-      open PIPE, "|gnuplot $geometry" or die "Can't initialize gnuplot\n";
+      open PIPE, "|gnuplot $geometry $dopersist" or die "Can't initialize gnuplot\n";
     }
     autoflush PIPE 1;
 
@@ -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;
             }
@@ -752,7 +763,7 @@ sub mainThread
     }
 
     # finished reading in all. Plot what we have
-    plotStoredData();
+    plotStoredData($pipe_readdata, $pipe_writedata);
 
     if ( defined $options{hardcopy})
     {
@@ -761,7 +772,7 @@ sub mainThread
       # sleep until the plot file exists, and it is closed. Sometimes the output
       # is still being written at this point. If the output filename starts with
       # '|', gnuplot pipes the output to that process, instead of writing to a
-      # file. In that case I don't make sure the file exists, since there IS no
+      # file. In that case I don't make sure the file exists, since there IS not
       # file
       if( $options{hardcopy} !~ /^\|/ )
       {
@@ -812,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_writedata $curve->{datastring};
-    print PIPE "e\n";
+    print $pipe_writedata "e\n";
   }
 }
 
@@ -970,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];
 
@@ -1001,7 +1017,7 @@ sub replot
       sendRangeCommand( "xrange", $xmin, $xmax );
     }
 
-    plotStoredData();
+    plotStoredData($pipe_readdata, $pipe_writedata);
 
 
     # update replot state
@@ -1750,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,8 +1,8 @@
-feedgnuplot (1.34stir1-1) unstable; urgency=medium
+feedgnuplot (1.34-2) unstable; urgency=medium
 
-  * disabled --persist because on our arm board it confuses things
+  * Depends now works with the 'gnuplot5' packages
 
- -- Dima Kogan <dima@secretsauce.net>  Fri, 22 Aug 2014 14:59:05 -0700
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 10 Oct 2014 14:05:17 -0700
 
 feedgnuplot (1.34-1) unstable; urgency=medium
 

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-nox
+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