mirror of
https://github.com/dkogan/feedgnuplot.git
synced 2025-09-19 03:38:08 +08:00
Compare commits
8 Commits
v1.33
...
test_strpt
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8ae16172ef | ||
![]() |
11f568ddf2 | ||
![]() |
605158b391 | ||
![]() |
0c32afacfd | ||
![]() |
1688496f34 | ||
![]() |
498047e785 | ||
![]() |
72adba82f7 | ||
![]() |
539b2035d8 |
10
Changes
10
Changes
@@ -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)
|
||||
|
||||
* fixed incorrect plotting of --timefmt --rangesize plots
|
||||
|
@@ -1,4 +1,7 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
package feedgnuplot; # for the metacpan indexer
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Getopt::Long;
|
||||
@@ -11,9 +14,9 @@ use threads;
|
||||
use threads::shared;
|
||||
use Thread::Queue;
|
||||
use Pod::Usage;
|
||||
use Time::Piece;
|
||||
use DateTime::Format::Strptime;
|
||||
|
||||
my $VERSION = 1.33;
|
||||
my $VERSION = 1.34;
|
||||
|
||||
my %options;
|
||||
interpretCommandline();
|
||||
@@ -28,6 +31,9 @@ interpretCommandline();
|
||||
# datastring
|
||||
|
||||
|
||||
|
||||
my $strptime;
|
||||
|
||||
my @curves = ();
|
||||
|
||||
# list mapping curve names to their indices in the @curves list
|
||||
@@ -72,6 +78,7 @@ if($options{stream})
|
||||
}
|
||||
|
||||
$streamingFinished = 1;
|
||||
$dataQueue->enqueue(undef);
|
||||
|
||||
$plotThr->join() if defined $plotThr;
|
||||
$addThr->join();
|
||||
@@ -371,19 +378,23 @@ 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
|
||||
# and strftime, and those are integer-only
|
||||
if( defined $options{xlen} )
|
||||
{
|
||||
# warning do I need to make sure this is an integer anymore?
|
||||
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});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# $strptime = DateTime::Format::Strptime->new( pattern => $options{timefmt} );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -410,8 +421,6 @@ sub plotUpdateThread
|
||||
# indicate that the timer was the replot source
|
||||
$dataQueue->enqueue('replot timertick');
|
||||
}
|
||||
|
||||
$dataQueue->enqueue(undef);
|
||||
}
|
||||
|
||||
sub sendRangeCommand
|
||||
@@ -438,14 +447,18 @@ sub makeDomainNumeric
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -690,6 +703,17 @@ sub mainThread
|
||||
@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( 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
|
||||
plotStoredData();
|
||||
plotStoredData() unless $options{stream};
|
||||
|
||||
if ( defined $options{hardcopy})
|
||||
{
|
||||
@@ -765,7 +783,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} !~ /^\|/ )
|
||||
{
|
||||
@@ -1000,7 +1018,7 @@ sub replot
|
||||
{
|
||||
# if we're using a timefmt, I need to convert my xmin range from
|
||||
# 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 );
|
||||
}
|
||||
|
Reference in New Issue
Block a user