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

Minor no-op refactoring

Browse Source 
The ID->curve hash %curveIndices is now called $curveFromID, and now gives you a
curve reference, not an index to @curves

I can thus reorder @curves as I like, and %curveFromID remains valid
This commit is contained in:
Dima Kogan 2019-10-20 18:57:11 -07:00
parent 5e0869dc25
commit 2f9a6acdb3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/feedgnuplot
View File

@ -31,8 +31,8 @@ interpretCommandline();
# datastring # datastring
my @curves = (); my @curves = ();
# list mapping curve names to their indices in the @curves list # Maps a curve ID to the corresponding curve
my %curveIndices = (); my %curveFromID = ();
# Whether any new data has arrived since the last replot # Whether any new data has arrived since the last replot
my $haveNewData; my $haveNewData;
@ -1186,7 +1186,7 @@ sub getCurve
my ($id) = @_; my ($id) = @_;
if( !exists $curveIndices{$id} ) if( !exists $curveFromID{$id} )
{ {
push @curves, {# if we have a catch-all style and no specific style, use push @curves, {# if we have a catch-all style and no specific style, use
# the catch-all style # the catch-all style
@ -1199,9 +1199,9 @@ sub getCurve
datastring => '', datastring => '',
datastring_meta => [], datastring_meta => [],
datastring_offset => 0}; # push a curve with no data and no options datastring_offset => 0}; # push a curve with no data and no options
$curveIndices{$id} = $#curves; $curveFromID{$id} = $curves[-1];
updateCurveOptions($curves[$#curves], $id); updateCurveOptions($curves[-1], $id);
# --xlen has a meaning if we're not plotting histograms at all or if we're # --xlen has a meaning if we're not plotting histograms at all or if we're
@ -1218,8 +1218,11 @@ sub getCurve
print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n"; print STDERR "--xlen only makes sense when plotting ONLY histograms or ONLY NON-histograms\n";
exit -1; exit -1;
} }
return $curves[-1];
} }
return $curves[$curveIndices{$id}];
return $curveFromID{$id};
} }
sub addCurveOption sub addCurveOption