Compare commits

..

5 Commits

Author SHA1 Message Date
Dima Kogan
2fd23ed446 initial tests 2015-08-29 12:09:53 -07:00
Dima Kogan
9d98b84546 even streaming feedgnuplots persist
When the data-feeding pipe dies (data source exits) I still want to see the
realtime plot, as it appeared at the end
2015-06-22 17:03:30 -07:00
Dima Kogan
5609773b5b slighly fancier histogram recipe 2015-06-20 12:55:35 -07:00
Dima Kogan
ac06d5410a changelog bump 2014-10-10 14:05:31 -07:00
Dima Kogan
199796d874 Depends now works with the 'gnuplot5' packages
There's now a family of 'gnuplot5' packages in addition to the 'gnuplot' ones. I
now Depend on either one or on a generic "gnuplot" fallback.
2014-10-10 14:05:05 -07:00
3 changed files with 30 additions and 12 deletions

View File

@@ -455,9 +455,11 @@ sub makeDomainNumeric
sub mainThread sub mainThread
{ {
local *PIPE; local *PIPE;
pipe my ($pipe_readdata, $pipe_writedata);
my $dopersist = ''; my $dopersist = '';
if( !$options{stream} && getGnuplotVersion() >= 4.3) if( getGnuplotVersion() >= 4.3)
{ {
$dopersist = '--persist'; $dopersist = '--persist';
} }
@@ -644,7 +646,8 @@ sub mainThread
if(/^replot/o ) if(/^replot/o )
{ {
# /timertick/ determines if the timer was the source of the replot # /timertick/ determines if the timer was the source of the replot
replot( $domain0_numeric, /timertick/ ); replot( $pipe_readdata, $pipe_writedata,
$domain0_numeric, /timertick/ );
next; next;
} }
@@ -700,7 +703,8 @@ sub mainThread
# the x-coordinate of the new point is in the past, so I wipe out # 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 # all the data and start anew. Before I wipe the old data, I
# replot the old data # replot the old data
replot( $domain0_numeric ); replot( $pipe_readdata, $pipe_writedata,
$domain0_numeric );
clearCurves(); clearCurves();
$latestX = undef; $latestX = undef;
} }
@@ -759,7 +763,7 @@ sub mainThread
} }
# finished reading in all. Plot what we have # finished reading in all. Plot what we have
plotStoredData(); plotStoredData($pipe_readdata, $pipe_writedata);
if ( defined $options{hardcopy}) if ( defined $options{hardcopy})
{ {
@@ -819,18 +823,22 @@ sub pruneOldData
sub plotStoredData sub plotStoredData
{ {
my ($pipe_readdata, $pipe_writedata) = @_;
# get the options for those curves that havse any data # get the options for those curves that havse any data
my @nonemptyCurves = grep { $_->{datastring} } @curves; my @nonemptyCurves = grep { $_->{datastring} } @curves;
my @extraopts = map {$_->{options}} @nonemptyCurves; 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"; } if($options{'3d'}) { print PIPE "splot $body\n"; }
else { print PIPE "plot $body\n"; } else { print PIPE "plot $body\n"; }
foreach my $curve (@nonemptyCurves) foreach my $curve (@nonemptyCurves)
{ {
print PIPE $curve->{datastring}; print $pipe_writedata $curve->{datastring};
print PIPE "e\n"; print $pipe_writedata "e\n";
} }
} }
@@ -977,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]; my $now = [gettimeofday];
@@ -1008,7 +1017,7 @@ sub replot
sendRangeCommand( "xrange", $xmin, $xmax ); sendRangeCommand( "xrange", $xmin, $xmax );
} }
plotStoredData(); plotStoredData($pipe_readdata, $pipe_writedata);
# update replot state # update replot state
@@ -1757,10 +1766,12 @@ in a Thinkpad.
$ while true; do cat /proc/acpi/ibm/thermal | awk '{$1=""; print}' ; sleep 1; done | $ 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)' 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}' | $ 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 =head1 ACKNOWLEDGEMENT

6
debian/changelog vendored
View File

@@ -1,3 +1,9 @@
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 feedgnuplot (1.34-1) unstable; urgency=medium
* Very minor upstream update * Very minor upstream update

3
debian/control vendored
View File

@@ -11,7 +11,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnu
Package: feedgnuplot Package: feedgnuplot
Architecture: all 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 Description: Pipe-oriented frontend to Gnuplot
Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data 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 coming in on STDIN or given in a filename passed on the commandline. Various