Compare commits

..

8 Commits

2 changed files with 48 additions and 20 deletions

10
Changes
View File

@@ -1,3 +1,13 @@
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) feedgnuplot (1.33)
* fixed incorrect plotting of --timefmt --rangesize plots * fixed incorrect plotting of --timefmt --rangesize plots

View File

@@ -1,4 +1,7 @@
#!/usr/bin/perl #!/usr/bin/perl
package feedgnuplot; # for the metacpan indexer
use strict; use strict;
use warnings; use warnings;
use Getopt::Long; use Getopt::Long;
@@ -11,9 +14,9 @@ use threads;
use threads::shared; use threads::shared;
use Thread::Queue; use Thread::Queue;
use Pod::Usage; use Pod::Usage;
use Time::Piece; use DateTime::Format::Strptime;
my $VERSION = 1.33; my $VERSION = 1.34;
my %options; my %options;
interpretCommandline(); interpretCommandline();
@@ -28,6 +31,9 @@ interpretCommandline();
# datastring # datastring
my $strptime;
my @curves = (); my @curves = ();
# list mapping curve names to their indices in the @curves list # list mapping curve names to their indices in the @curves list
@@ -72,6 +78,7 @@ if($options{stream})
} }
$streamingFinished = 1; $streamingFinished = 1;
$dataQueue->enqueue(undef);
$plotThr->join() if defined $plotThr; $plotThr->join() if defined $plotThr;
$addThr->join(); $addThr->join();
@@ -371,19 +378,23 @@ sub interpretCommandline
$options{timefmt} =~ s/^\s*//; $options{timefmt} =~ s/^\s*//;
$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; $options{timefmt_Ncols} = $Nfields;
# make sure --xlen is an integer. With a timefmt xlen goes through strptime # make sure --xlen is an integer. With a timefmt xlen goes through strptime
# and strftime, and those are integer-only # and strftime, and those are integer-only
if( defined $options{xlen} ) if( defined $options{xlen} )
{ {
# warning do I need to make sure this is an integer anymore?
if( $options{xlen} - int($options{xlen}) ) 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}); $options{xlen} = 1 + int($options{xlen});
} }
} }
# $strptime = DateTime::Format::Strptime->new( pattern => $options{timefmt} );
} }
} }
@@ -410,8 +421,6 @@ sub plotUpdateThread
# indicate that the timer was the replot source # indicate that the timer was the replot source
$dataQueue->enqueue('replot timertick'); $dataQueue->enqueue('replot timertick');
} }
$dataQueue->enqueue(undef);
} }
sub sendRangeCommand sub sendRangeCommand
@@ -438,14 +447,18 @@ sub makeDomainNumeric
{ {
my ($domain0) = @_; my ($domain0) = @_;
if ( $options{timefmt} )
{
my $timepiece = Time::Piece->strptime( $domain0, $options{timefmt} )
or die "Couldn't parse time format. String '$domain0' doesn't fit format '$options{timefmt}'";
return $timepiece->epoch();
if( $options{timefmt})
{
# my $t = $strptime->parse_datetime($domain0);
# print STDERR "$domain0 $t\n";
} }
# return $strptime->parse_datetime($domain0) if $options{timefmt};
return $domain0; return $domain0;
} }
@@ -690,6 +703,17 @@ sub mainThread
@domain = splice(@fields, 0, 2); @domain = splice(@fields, 0, 2);
} }
# domain0_numeric is only used for xlen and monotonic, I think. And
# this is the only thing that requires strptime. Shouldn't bother with
# strptime otherwise
if( $options{monotonic} ) if( $options{monotonic} )
{ {
if( defined $latestX && $domain0_numeric < $latestX ) if( defined $latestX && $domain0_numeric < $latestX )
@@ -749,14 +773,8 @@ sub mainThread
} }
} }
# if we were streaming, we're now done!
if( $options{stream} )
{
return;
}
# finished reading in all. Plot what we have # finished reading in all. Plot what we have
plotStoredData(); plotStoredData() unless $options{stream};
if ( defined $options{hardcopy}) if ( defined $options{hardcopy})
{ {
@@ -765,7 +783,7 @@ sub mainThread
# sleep until the plot file exists, and it is closed. Sometimes the output # 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 # 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 # '|', 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 # file
if( $options{hardcopy} !~ /^\|/ ) if( $options{hardcopy} !~ /^\|/ )
{ {
@@ -1000,7 +1018,7 @@ sub replot
{ {
# if we're using a timefmt, I need to convert my xmin range from # if we're using a timefmt, I need to convert my xmin range from
# seconds-since-the-epoch BACK to the timefmt. Sheesh # seconds-since-the-epoch BACK to the timefmt. Sheesh
($xmin, $xmax) = map {Time::Piece->strptime( $_, '%s' )->strftime( $options{timefmt} ) } ($xmin, $xmax); ($xmin, $xmax) = map {$strptime->parse_datetime($_)} ($xmin, $xmax);
} }
sendRangeCommand( "xrange", $xmin, $xmax ); sendRangeCommand( "xrange", $xmin, $xmax );
} }