mirror of
https://github.com/dkogan/feedgnuplot.git
synced 2025-09-18 19:18:06 +08:00
Compare commits
16 Commits
debian/1.3
...
v1.35
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c19dc4aa2a | ||
![]() |
238a0c1943 | ||
![]() |
42a8218fbe | ||
![]() |
4cfcf0fc35 | ||
![]() |
0e7f51f3f7 | ||
![]() |
01971c2434 | ||
![]() |
104accdd0d | ||
![]() |
605158b391 | ||
![]() |
0c32afacfd | ||
![]() |
1688496f34 | ||
![]() |
498047e785 | ||
![]() |
72adba82f7 | ||
![]() |
539b2035d8 | ||
![]() |
9b3cbc13be | ||
![]() |
a65abc6095 | ||
![]() |
5db86810b5 |
30
Changes
30
Changes
@@ -1,3 +1,33 @@
|
||||
feedgnuplot (1.35)
|
||||
|
||||
* replaced a 'say' with 'print'. Should work better with ancient perls
|
||||
* an "exit" command now has effect even with triggered-only replotting
|
||||
|
||||
* More sophisticated handling of termination conditions:
|
||||
- Without --exit, we always end up with an interactive plot when the
|
||||
input data is exhausted or when the user sends a ^C to the pipeline
|
||||
- When streaming, the first ^C does not kill feedgnuplot
|
||||
|
||||
* Removed threading
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Sun, 01 Nov 2015 12:50:33 -0800
|
||||
|
||||
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
|
||||
|
296
bin/feedgnuplot
296
bin/feedgnuplot
@@ -1,19 +1,20 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
package feedgnuplot; # for the metacpan indexer
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Getopt::Long;
|
||||
use Time::HiRes qw( usleep gettimeofday tv_interval );
|
||||
use IO::Handle;
|
||||
use IO::Select;
|
||||
use List::Util qw( first );
|
||||
use Scalar::Util qw( looks_like_number );
|
||||
use Text::ParseWords;
|
||||
use threads;
|
||||
use threads::shared;
|
||||
use Thread::Queue;
|
||||
use Text::ParseWords; # for shellwords
|
||||
use Pod::Usage;
|
||||
use Time::Piece;
|
||||
|
||||
my $VERSION = 1.32;
|
||||
my $VERSION = 1.35;
|
||||
|
||||
my %options;
|
||||
interpretCommandline();
|
||||
@@ -26,16 +27,11 @@ interpretCommandline();
|
||||
# with --xlen, the offsets are preserved by using $curve->{datastring_offset} to
|
||||
# represent the offset IN THE ORIGINAL STRING of the current start of the
|
||||
# datastring
|
||||
|
||||
|
||||
my @curves = ();
|
||||
|
||||
# list mapping curve names to their indices in the @curves list
|
||||
my %curveIndices = ();
|
||||
|
||||
# now start the data acquisition and plotting threads
|
||||
my $dataQueue;
|
||||
|
||||
# Whether any new data has arrived since the last replot
|
||||
my $haveNewData;
|
||||
|
||||
@@ -45,39 +41,16 @@ my $last_replot_time = [gettimeofday];
|
||||
# whether the previous replot was timer based
|
||||
my $last_replot_is_from_timer = 1;
|
||||
|
||||
my $streamingFinished : shared = undef;
|
||||
|
||||
if($options{stream})
|
||||
{
|
||||
$dataQueue = Thread::Queue->new();
|
||||
my $addThr = threads->create(\&mainThread);
|
||||
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 );
|
||||
|
||||
# spawn the plot updating thread. If I'm replotting from a data trigger, I don't need this
|
||||
my $plotThr = threads->create(\&plotUpdateThread) if $options{stream} > 0;
|
||||
|
||||
while(<>)
|
||||
{
|
||||
chomp;
|
||||
|
||||
last if /^exit/;
|
||||
|
||||
# place every line of input to the queue, so that the plotting thread can process it. if we are
|
||||
# using an implicit domain (x = line number), then we send it on the data queue also, since
|
||||
# $. is not meaningful in the plotting thread
|
||||
if(!$options{domain})
|
||||
{
|
||||
$_ .= " $.";
|
||||
}
|
||||
$dataQueue->enqueue($_);
|
||||
}
|
||||
|
||||
$streamingFinished = 1;
|
||||
|
||||
$plotThr->join() if defined $plotThr;
|
||||
$addThr->join();
|
||||
}
|
||||
else
|
||||
{ mainThread(); }
|
||||
mainThread();
|
||||
|
||||
|
||||
|
||||
@@ -202,11 +175,31 @@ 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
|
||||
# >0 for timed replotting
|
||||
# undef if not streaming
|
||||
#
|
||||
# Note that '0' is not allowed, so !$options{stream} will do the expected
|
||||
# thing
|
||||
if(defined $options{stream})
|
||||
{
|
||||
# if no streaming period is given, default to 1Hz.
|
||||
@@ -354,7 +347,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
|
||||
@@ -363,7 +356,7 @@ sub interpretCommandline
|
||||
{
|
||||
if( $options{xlen} - int($options{xlen}) )
|
||||
{
|
||||
say STDERR "When streaming --xlen MUST be an integer. Rounding up to the nearest second";
|
||||
print STDERR "When streaming --xlen MUST be an integer. Rounding up to the nearest second\n";
|
||||
$options{xlen} = 1 + int($options{xlen});
|
||||
}
|
||||
}
|
||||
@@ -384,19 +377,6 @@ sub getGnuplotVersion
|
||||
return $gnuplotVersion;
|
||||
}
|
||||
|
||||
sub plotUpdateThread
|
||||
{
|
||||
while(! $streamingFinished)
|
||||
{
|
||||
usleep( $options{stream} * 1e6 );
|
||||
|
||||
# indicate that the timer was the replot source
|
||||
$dataQueue->enqueue('replot timertick');
|
||||
}
|
||||
|
||||
$dataQueue->enqueue(undef);
|
||||
}
|
||||
|
||||
sub sendRangeCommand
|
||||
{
|
||||
my ($name, $min, $max) = @_;
|
||||
@@ -432,29 +412,64 @@ sub makeDomainNumeric
|
||||
return $domain0;
|
||||
}
|
||||
|
||||
sub mainThread
|
||||
|
||||
sub getNextLine
|
||||
{
|
||||
my $valuesPerPoint;
|
||||
if( $options{rangesizeall} )
|
||||
while(1)
|
||||
{
|
||||
$valuesPerPoint = $options{rangesizeall};
|
||||
}
|
||||
else
|
||||
$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);
|
||||
|
||||
|
||||
my $now = [gettimeofday];
|
||||
my $time_remaining = $options{stream} - tv_interval($prev_timed_replot_time, $now);
|
||||
|
||||
if ( $time_remaining < 0 )
|
||||
{
|
||||
$valuesPerPoint = 1;
|
||||
if($options{extraValuesPerPoint}) { $valuesPerPoint += $options{extraValuesPerPoint}; }
|
||||
if($options{colormap}) { $valuesPerPoint++; }
|
||||
if($options{circles} ) { $valuesPerPoint++; }
|
||||
$prev_timed_replot_time = $now;
|
||||
$this_replot_is_from_timer = 1;
|
||||
return 'replot';
|
||||
}
|
||||
|
||||
if ($selector->can_read($time_remaining))
|
||||
{
|
||||
return $stdin->getline();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub mainThread
|
||||
{
|
||||
local *PIPE;
|
||||
my $dopersist = '';
|
||||
|
||||
if( !$options{stream} && getGnuplotVersion() >= 4.3)
|
||||
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;
|
||||
@@ -621,8 +636,7 @@ sub mainThread
|
||||
# number of seconds since the UNIX epoch.
|
||||
my $domain0_numeric;
|
||||
|
||||
# I should be using the // operator, but I'd like to be compatible with perl 5.8
|
||||
while( $_ = (defined $dataQueue ? $dataQueue->dequeue() : <>))
|
||||
while( defined ($_ = getNextLine()) )
|
||||
{
|
||||
next if /^#/o;
|
||||
|
||||
@@ -636,16 +650,13 @@ sub mainThread
|
||||
|
||||
if(/^replot/o )
|
||||
{
|
||||
# /timertick/ determines if the timer was the source of the replot
|
||||
replot( $domain0_numeric, /timertick/ );
|
||||
replot( $domain0_numeric );
|
||||
next;
|
||||
}
|
||||
|
||||
# /exit/ is handled in the data-reading thread
|
||||
last if /^exit/o;
|
||||
}
|
||||
|
||||
if(! /^replot/o)
|
||||
{
|
||||
# parse the incoming data lines. The format is
|
||||
# x id0 dat0 id1 dat1 ....
|
||||
# where idX is the ID of the curve that datX corresponds to
|
||||
@@ -702,17 +713,8 @@ sub mainThread
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
# since $. is not meaningful in the plotting thread if we're using the data queue, we pass
|
||||
# $. on the data queue in that case
|
||||
if(defined $dataQueue)
|
||||
{
|
||||
$domain[0] = pop @fields;
|
||||
}
|
||||
else
|
||||
{
|
||||
$domain[0] = $.;
|
||||
}
|
||||
$domain0_numeric = makeDomainNumeric( $domain[0] );
|
||||
}
|
||||
|
||||
@@ -720,8 +722,6 @@ sub mainThread
|
||||
|
||||
while(@fields)
|
||||
{
|
||||
my $rangesize = $valuesPerPoint;
|
||||
|
||||
if($options{dataid})
|
||||
{
|
||||
$id = shift @fields;
|
||||
@@ -731,10 +731,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;
|
||||
|
||||
@@ -745,16 +745,9 @@ sub mainThread
|
||||
$domain0_numeric);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# if we were streaming, we're now done!
|
||||
if( $options{stream} )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
# finished reading in all. Plot what we have
|
||||
plotStoredData();
|
||||
plotStoredData() unless $options{stream};
|
||||
|
||||
if ( defined $options{hardcopy})
|
||||
{
|
||||
@@ -763,7 +756,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 not
|
||||
# file. In that case I don't make sure the file exists, since there IS no
|
||||
# file
|
||||
if( $options{hardcopy} !~ /^\|/ )
|
||||
{
|
||||
@@ -775,6 +768,13 @@ sub mainThread
|
||||
return;
|
||||
}
|
||||
|
||||
# data exhausted. If we're killed now, then we should peacefully die.
|
||||
if($options{stream} && !$options{exit})
|
||||
{
|
||||
print STDERR "Input data exhausted\n";
|
||||
$SIG{INT} = undef;
|
||||
}
|
||||
|
||||
# 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
|
||||
@@ -865,7 +865,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 +972,7 @@ sub replot
|
||||
# }
|
||||
|
||||
|
||||
my ($domain0_numeric, $replot_is_from_timer) = @_;
|
||||
my ($domain0_numeric) = @_;
|
||||
|
||||
my $now = [gettimeofday];
|
||||
|
||||
@@ -970,7 +982,7 @@ sub replot
|
||||
# if the last replot was timer-based, but this one isn't, force a replot.
|
||||
# This makes sure that a replot happens for a domain rollover shortly
|
||||
# after a timer replot
|
||||
!$replot_is_from_timer && $last_replot_is_from_timer ||
|
||||
!$this_replot_is_from_timer && $last_replot_is_from_timer ||
|
||||
|
||||
# if enough time has elapsed since the last replot, it's ok to replot
|
||||
tv_interval ( $last_replot_time, $now ) > 0.8*$options{stream} )
|
||||
@@ -996,7 +1008,7 @@ sub replot
|
||||
|
||||
# update replot state
|
||||
$last_replot_time = $now;
|
||||
$last_replot_is_from_timer = $replot_is_from_timer;
|
||||
$last_replot_is_from_timer = $this_replot_is_from_timer;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1683,10 +1695,80 @@ is possible to send the output produced this way to gnuplot directly.
|
||||
|
||||
C<--exit>
|
||||
|
||||
Terminate the feedgnuplot process after passing data to gnuplot. The window will
|
||||
persist but will not be interactive. Without this option feedgnuplot keeps
|
||||
running and must be killed by the user. Note that this option works only with
|
||||
later versions of gnuplot and only with some gnuplot terminals.
|
||||
This controls the details of what happens when the input data is exhausted, or
|
||||
when some part of the C<feedgnuplot> pipeline is killed. This option does
|
||||
different things depending on whether C<--stream> is active, so read this
|
||||
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
|
||||
possible states:
|
||||
|
||||
=over
|
||||
|
||||
=item Alive: C<feedgnuplot>, C<gnuplot> alive, plot window process alive, no
|
||||
shell prompt (shell busy with C<feedgnuplot>)
|
||||
|
||||
=item Half-alive: C<feedgnuplot>, C<gnuplot> dead, plot window process alive
|
||||
(but non-interactive), shell prompt available
|
||||
|
||||
=item Dead: C<feedgnuplot>, C<gnuplot> dead, plot window process dead, shell
|
||||
prompt available
|
||||
|
||||
=back
|
||||
|
||||
The C<--exit> option controls the details of this behavior. The possibilities
|
||||
are:
|
||||
|
||||
=over
|
||||
|
||||
=item No C<--stream>, input pipe is exhausted (all data read in)
|
||||
|
||||
=over
|
||||
|
||||
=item default; no C<--exit>
|
||||
|
||||
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
|
||||
here.
|
||||
|
||||
=back
|
||||
|
||||
=item C<--stream>, input pipe is exhausted (all data read in) or the
|
||||
C<feedgnuplot> process terminated
|
||||
|
||||
=over
|
||||
|
||||
=item default; no C<--exit>
|
||||
|
||||
Alive. Need to Ctrl-C to get back into the shell
|
||||
|
||||
=item C<--exit>
|
||||
|
||||
Dead. No plot is shown, and the shell accepts new commands. With C<--stream> the
|
||||
goal is to show a plot as the data comes in, which we have been doing. Now that
|
||||
we're done, we can clean up everything.
|
||||
|
||||
=back
|
||||
|
||||
=back
|
||||
|
||||
Note that one usually invokes C<feedgnuplot> as a part of a shell pipeline:
|
||||
|
||||
$ write_data | feedgnuplot
|
||||
|
||||
If the user terminates this pipeline with ^C, then I<all> the processes in the
|
||||
pipeline receive SIGINT. This normally kills C<feedgnuplot> and all its
|
||||
C<gnuplot> children, and we let this happen unless C<--stream> and no C<--exit>.
|
||||
If C<--stream> and no C<--exit>, then we ignore the first ^C. The data feeder
|
||||
dies, and we behave as if the input data was exhausted. A second ^C kills us
|
||||
also.
|
||||
|
||||
=item
|
||||
|
||||
@@ -1740,10 +1822,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
|
||||
|
||||
|
65
debian/changelog
vendored
65
debian/changelog
vendored
@@ -1,65 +0,0 @@
|
||||
feedgnuplot (1.32-1) unstable; urgency=low
|
||||
|
||||
* Added --rangesize and --rangesizeall. Different curves can now plot
|
||||
different-size tuples
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Wed, 05 Feb 2014 14:00:44 -0800
|
||||
|
||||
feedgnuplot (1.30-1) unstable; urgency=low
|
||||
|
||||
* made the VCS links canonical
|
||||
* added --set, --unset, --with, --style, --styleall
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Fri, 24 Jan 2014 15:50:03 -0800
|
||||
|
||||
feedgnuplot (1.28-1) unstable; urgency=low
|
||||
|
||||
* Upstream update:
|
||||
- Removed example debianization
|
||||
- Removed unreliable unit tests from automated testing (Closes: #731080)
|
||||
* gnuplot dependency now favors graphical gnuplot packages
|
||||
* Removed Anton Gladky from the Uploaders
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Wed, 04 Dec 2013 02:05:08 -0800
|
||||
|
||||
feedgnuplot (1.26-1) unstable; urgency=low
|
||||
|
||||
[ Dima Kogan ]
|
||||
* Minor POD update
|
||||
* Added test suite
|
||||
* Added initial support for --timefmt. Currently time/date data is
|
||||
supported only at the x-axis domain
|
||||
* Added --exit option for force feedgnuplot to return even if gnuplot
|
||||
may not yet be done rendering (patch by Eric Schulte)
|
||||
* Reformatted the documentation
|
||||
* y2-axis curves no longer have a thicker line by default
|
||||
* --hardcopy now handles piped output (gnuplot 'set output |process'
|
||||
syntax)
|
||||
|
||||
[ Anton Gladky ]
|
||||
* Add libipc-run-perl to Build-Depends to execute tests
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Sun, 20 Oct 2013 01:19:51 -0700
|
||||
|
||||
feedgnuplot (1.24-2) unstable; urgency=low
|
||||
|
||||
* Now building the html documentation from the correct POD source
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Sun, 28 Apr 2013 17:42:52 -0700
|
||||
|
||||
feedgnuplot (1.24-1) unstable; urgency=low
|
||||
|
||||
* Fixed regression in --monotonic. This works again now
|
||||
* moved POD back into the main source file. This fixes the broken usage
|
||||
messages
|
||||
* added --version
|
||||
* fixed watchfile to work with newer github pages
|
||||
* priority now optional
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Fri, 08 Feb 2013 02:01:32 -0800
|
||||
|
||||
feedgnuplot (1.23-2) unstable; urgency=low
|
||||
|
||||
* Initial Debian release (Closes: #686413)
|
||||
|
||||
-- Dima Kogan <dima@secretsauce.net> Tue, 30 Oct 2012 11:14:01 -0700
|
1
debian/compat
vendored
1
debian/compat
vendored
@@ -1 +0,0 @@
|
||||
9
|
19
debian/control
vendored
19
debian/control
vendored
@@ -1,19 +0,0 @@
|
||||
Source: feedgnuplot
|
||||
Section: science
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>= 9), libstring-shellquote-perl, perl, gawk, gnuplot, libipc-run-perl
|
||||
Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
|
||||
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: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
|
||||
|
||||
Package: feedgnuplot
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, ${perl:Depends}, gnuplot-qt | gnuplot-x11 | 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
|
||||
data representations are supported, as is hardcopy output and streaming display
|
||||
of live data.
|
24
debian/copyright
vendored
24
debian/copyright
vendored
@@ -1,24 +0,0 @@
|
||||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Source: https://github.com/dkogan/feedgnuplot
|
||||
Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
|
||||
Upstream-Name: feedgnuplot
|
||||
|
||||
Files: *
|
||||
Copyright: 2011, Dima Kogan <dima@secretsauce.net>
|
||||
License: Artistic or GPL-1+
|
||||
|
||||
License: Artistic
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the Artistic License, which comes with Perl.
|
||||
.
|
||||
On Debian GNU/Linux systems, the complete text of the Artistic License
|
||||
can be found in `/usr/share/common-licenses/Artistic'.
|
||||
|
||||
License: GPL-1+
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 1, or (at your option)
|
||||
any later version.
|
||||
.
|
||||
On Debian GNU/Linux systems, the complete text of version 1 of the
|
||||
General Public License can be found in `/usr/share/common-licenses/GPL-1'.
|
9
debian/feedgnuplot.doc-base
vendored
9
debian/feedgnuplot.doc-base
vendored
@@ -1,9 +0,0 @@
|
||||
Document: feedgnuplot
|
||||
Title: Feedgnuplot Manual
|
||||
Author: Dima Kogan
|
||||
Abstract: Formatted manpage for feedgnuplot
|
||||
Section: Science/Data Analysis
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/feedgnuplot/feedgnuplot.html
|
||||
Files: /usr/share/doc/feedgnuplot/feedgnuplot.html
|
1
debian/feedgnuplot.docs
vendored
1
debian/feedgnuplot.docs
vendored
@@ -1 +0,0 @@
|
||||
feedgnuplot.html
|
2
debian/feedgnuplot.install
vendored
2
debian/feedgnuplot.install
vendored
@@ -1,2 +0,0 @@
|
||||
completions/bash/feedgnuplot /etc/bash_completion.d/
|
||||
completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions
|
4
debian/gbp.conf
vendored
4
debian/gbp.conf
vendored
@@ -1,4 +0,0 @@
|
||||
[DEFAULT]
|
||||
debian-branch = debian
|
||||
upstream-tag = v%(version)s
|
||||
pristine-tar = True
|
12
debian/rules
vendored
12
debian/rules
vendored
@@ -1,12 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
override_dh_auto_build:
|
||||
dh_auto_build
|
||||
pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
|
||||
|
||||
override_dh_auto_clean:
|
||||
rm -rf feedgnuplot.html pod2htm*
|
||||
dh_auto_clean
|
1
debian/source/format
vendored
1
debian/source/format
vendored
@@ -1 +0,0 @@
|
||||
3.0 (quilt)
|
4
debian/watch
vendored
4
debian/watch
vendored
@@ -1,4 +0,0 @@
|
||||
version=3
|
||||
opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
|
||||
https://github.com/dkogan/feedgnuplot/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
|
||||
# Bart Martens <bartm@debian.org> Sat, 22 Dec 2012 12:54:18 +0000
|
49
t/plots.t
49
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),
|
||||
|
Reference in New Issue
Block a user