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

addEveryOption(),addCurveOption(),setCurveLabel() into a single function

Browse Source 
These were 99% identical, and now they reuse the same code
This commit is contained in:
Dima Kogan 2021-03-10 22:06:14 -08:00
parent d8b5f586c6
commit d7ab28e2f2
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bin/feedgnuplot
View File

@ -818,8 +818,9 @@ sub mainThread
my $n = scalar @{$options{legend}}/2; my $n = scalar @{$options{legend}}/2;
foreach my $idx (0..$n-1) foreach my $idx (0..$n-1)
{ {
setCurveLabel($options{legend}[$idx*2 ], addOption($options{legend}[$idx*2 ],
$options{legend}[$idx*2 + 1]); 'title',
$options{legend}[$idx*2 + 1]);
} }
} }
@ -831,8 +832,9 @@ sub mainThread
my $n = scalar @{$options{curvestyle}}/2; my $n = scalar @{$options{curvestyle}}/2;
foreach my $idx (0..$n-1) foreach my $idx (0..$n-1)
{ {
addCurveOption($options{curvestyle}[$idx*2 ], addOption($options{curvestyle}[$idx*2 ],
$options{curvestyle}[$idx*2 + 1]); 'extraoptions',
$options{curvestyle}[$idx*2 + 1] . " ");
} }
} }
if(@{$options{every}}) if(@{$options{every}})
@ -842,14 +844,15 @@ sub mainThread
my $n = scalar @{$options{every}}/2; my $n = scalar @{$options{every}}/2;
foreach my $idx (0..$n-1) foreach my $idx (0..$n-1)
{ {
addEveryOption($options{every}[$idx*2 ], addOption($options{every}[$idx*2 ],
$options{every}[$idx*2 + 1]); 'everyoptions',
"every " . $options{every}[$idx*2 + 1] . " ");
} }
} }
addCurveOption($_, 'axes x1y2') foreach (@{$options{x1y2}}); addOption($_, 'extraoptions', 'axes x1y2 ') foreach (@{$options{x1y2}});
addCurveOption($_, 'axes x2y1') foreach (@{$options{x2y1}}); addOption($_, 'extraoptions', 'axes x2y1 ') foreach (@{$options{x2y1}});
addCurveOption($_, 'axes x2y2') foreach (@{$options{x2y2}}); addOption($_, 'extraoptions', 'axes x2y2 ') foreach (@{$options{x2y2}});
# timefmt # timefmt
if( $options{timefmt} ) if( $options{timefmt} )
@ -1199,7 +1202,7 @@ sub updateCurveOptions
# use the given title, unless we're generating a legend automatically. Given titles # use the given title, unless we're generating a legend automatically. Given titles
# override autolegend # override autolegend
my $title; my $title;
if(defined $curve->{title}) if(defined $curve->{title} && length($curve->{title}))
{ $title = $curve->{title}; } { $title = $curve->{title}; }
elsif( $options{autolegend} ) elsif( $options{autolegend} )
{ $title = $id; } { $title = $id; }
@ -1261,6 +1264,7 @@ sub getCurve
everyoptions => (!exists $options{every_hash}{$id} && everyoptions => (!exists $options{every_hash}{$id} &&
exists $options{everyall}) ? exists $options{everyall}) ?
"every $options{everyall} " : ' ', "every $options{everyall} " : ' ',
title => '',
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
@ -1291,29 +1295,12 @@ sub getCurve
return $curveFromID{$id}; return $curveFromID{$id};
} }
sub addCurveOption sub addOption
{ {
my ($id, $str) = @_; my ($id, $which, $str) = @_;
my $curve = getCurve($id); my $curve = getCurve($id);
$curve->{extraoptions} .= "$str "; $curve->{$which} .= $str;
updateCurveOptions($curve, $id);
}
sub addEveryOption
{
my ($id, $str) = @_;
my $curve = getCurve($id);
$curve->{everyoptions} .= "every $str ";
updateCurveOptions($curve, $id);
}
sub setCurveLabel
{
my ($id, $str) = @_;
my $curve = getCurve($id);
$curve->{title} = $str;
updateCurveOptions($curve, $id); updateCurveOptions($curve, $id);
} }