zhangyiss/feedgnuplot
1
0
Fork 0
mirror of https://github.com/dkogan/feedgnuplot.git synced 2025-05-06 06:21:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

--vnlog now works with --domain

Browse Source
This commit is contained in:
Dima Kogan 2018-02-23 12:39:49 -08:00
parent e8f9e09090
commit d5e8906946
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/feedgnuplot
View File

@ -865,6 +865,7 @@ sub mainThread
# 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x" # 3d plots require $options{domain}, and dictate "x y" for the domain instead of just "x"
my @fields = split; my @fields = split;
my $i_column = 0;
if($options{domain}) if($options{domain})
{ {
@ -876,6 +877,7 @@ sub mainThread
$domain[0] = join (' ', splice( @fields, 0, $options{timefmt_Ncols}) ); $domain[0] = join (' ', splice( @fields, 0, $options{timefmt_Ncols}) );
$domain0_numeric = makeDomainNumeric( $domain[0] ); $domain0_numeric = makeDomainNumeric( $domain[0] );
$i_column -= $options{timefmt_Ncols};
} }
elsif(!$options{'3d'}) elsif(!$options{'3d'})
{ {
@ -884,6 +886,7 @@ sub mainThread
next if @fields < 1+1; next if @fields < 1+1;
$domain[0] = $domain0_numeric = shift @fields; $domain[0] = $domain0_numeric = shift @fields;
$i_column -= 1;
} }
else else
{ {
@ -892,6 +895,7 @@ sub mainThread
next if @fields < 2+1; next if @fields < 2+1;
@domain = splice(@fields, 0, 2); @domain = splice(@fields, 0, 2);
$i_column -= 2;
} }
if( $options{monotonic} ) if( $options{monotonic} )
@ -915,8 +919,7 @@ sub mainThread
$domain0_numeric = makeDomainNumeric( $domain[0] ); $domain0_numeric = makeDomainNumeric( $domain[0] );
} }
my $id = -1; my $id = -1;
my $i_curve = 0;
while(@fields) while(@fields)
{ {
if ($options{dataid}) if ($options{dataid})
@ -925,14 +928,14 @@ sub mainThread
} }
elsif($options{vnlog} ) elsif($options{vnlog} )
{ {
if( $i_curve >= @vnlog_headers ) if( $i_column >= @vnlog_headers )
{ {
# Got more columns than vnlog headers. The data is probably # Got more columns than vnlog headers. The data is probably
# bogus, but I don't want to barf at the user, so I silently # bogus, but I don't want to barf at the user, so I silently
# ignore the data # ignore the data
last; last;
} }
$id = $vnlog_headers[$i_curve]; $id = $vnlog_headers[$i_column];
} }
else else
{ {
@ -948,7 +951,7 @@ sub mainThread
splice( @fields, 0, $rangesize ) ) . "\n", splice( @fields, 0, $rangesize ) ) . "\n",
$domain0_numeric); $domain0_numeric);
$i_curve++; $i_column++;
} }
} }