mirror of
https://github.com/dkogan/feedgnuplot.git
synced 2025-09-18 10:28:12 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
498047e785 | ||
|
|
72adba82f7 | ||
|
|
539b2035d8 | ||
|
|
9b3cbc13be | ||
|
|
a65abc6095 | ||
|
|
5db86810b5 |
16
Changes
16
Changes
@@ -1,3 +1,19 @@
|
||||
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
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
package feedgnuplot; # for the metacpan indexer
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Getopt::Long;
|
||||
@@ -13,7 +16,7 @@ use Thread::Queue;
|
||||
use Pod::Usage;
|
||||
use Time::Piece;
|
||||
|
||||
my $VERSION = 1.32;
|
||||
my $VERSION = 1.34;
|
||||
|
||||
my %options;
|
||||
interpretCommandline();
|
||||
@@ -202,6 +205,23 @@ 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
|
||||
@@ -354,7 +374,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
|
||||
@@ -434,19 +454,6 @@ sub makeDomainNumeric
|
||||
|
||||
sub mainThread
|
||||
{
|
||||
my $valuesPerPoint;
|
||||
if( $options{rangesizeall} )
|
||||
{
|
||||
$valuesPerPoint = $options{rangesizeall};
|
||||
}
|
||||
else
|
||||
{
|
||||
$valuesPerPoint = 1;
|
||||
if($options{extraValuesPerPoint}) { $valuesPerPoint += $options{extraValuesPerPoint}; }
|
||||
if($options{colormap}) { $valuesPerPoint++; }
|
||||
if($options{circles} ) { $valuesPerPoint++; }
|
||||
}
|
||||
|
||||
local *PIPE;
|
||||
my $dopersist = '';
|
||||
|
||||
@@ -720,8 +727,6 @@ sub mainThread
|
||||
|
||||
while(@fields)
|
||||
{
|
||||
my $rangesize = $valuesPerPoint;
|
||||
|
||||
if($options{dataid})
|
||||
{
|
||||
$id = shift @fields;
|
||||
@@ -731,10 +736,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;
|
||||
|
||||
@@ -865,7 +870,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";
|
||||
|
||||
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