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

the rangesizes are now precomputed and easily assessed

Browse Source
This commit is contained in:
Dima Kogan 2014-02-06 23:07:39 -08:00
parent d75b572875
commit 5db86810b5
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bin/feedgnuplot
View File

@ -202,6 +202,23 @@ sub interpretCommandline
exit -1; 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 # parse stream option. Allowed only numbers >= 0 or 'trigger'. After this code
# $options{stream} is # $options{stream} is
# -1 for triggered replotting # -1 for triggered replotting
@ -434,19 +451,6 @@ sub makeDomainNumeric
sub mainThread 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; local *PIPE;
my $dopersist = ''; my $dopersist = '';
@ -720,8 +724,6 @@ sub mainThread
while(@fields) while(@fields)
{ {
my $rangesize = $valuesPerPoint;
if($options{dataid}) if($options{dataid})
{ {
$id = shift @fields; $id = shift @fields;
@ -731,10 +733,10 @@ sub mainThread
$id++; $id++;
} }
if( $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} ?
$rangesize = $options{rangesize_hash}{$id}; $options{rangesize_hash}{$id} :
} $options{rangesize_default};
last if @fields < $rangesize; last if @fields < $rangesize;