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

the --dataindex option has been changed to --dataid, with alphanumeric IDs. This necessiatated some

Browse Source 
cleanup
This commit is contained in:
Dima Kogan 2010-10-23 14:40:11 -07:00
parent 1e729e3b06
commit c11f8df99b
1 changed files with 80 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
feedGnuplot.pl
View File

@ -29,25 +29,26 @@ Usage: $0 [options] file1 file2 ...
--[no]domain If enabled, the first element of each line is the --[no]domain If enabled, the first element of each line is the
domain variable. If not, the point index is used domain variable. If not, the point index is used
--[no]dataindex If enabled, each data point is preceded by the index --[no]dataid If enabled, each data point is preceded by the ID
of the data set that point corresponds to. If not of the data set that point corresponds to. This ID is
interpreted as a string, NOT as just a number. If not
enabled, the order of the point is used. enabled, the order of the point is used.
As an example, if line 3 of the input is "0 9 1 20" As an example, if line 3 of the input is "0 9 1 20"
'--nodomain --nodataindex' would parse the 4 numbers as points in 4 '--nodomain --nodataid' would parse the 4 numbers as points in 4
different curves at x=3 different curves at x=3
'--domain --nodataindex' would parse the 4 numbers as points in 3 different '--domain --nodataid' would parse the 4 numbers as points in 3 different
curves at x=0. Here, 0 is the x-variable and 9,1,20 are the data values curves at x=0. Here, 0 is the x-variable and 9,1,20 are the data values
'--nodomain --dataindex' would parse the 4 numbers as points in 2 different '--nodomain --dataid' would parse the 4 numbers as points in 2 different
curves at x=3. Here 0 and 1 are the data indices and 9 and 20 are the curves at x=3. Here 0 and 1 are the data IDs and 9 and 20 are the
data values data values
'--domain --dataindex' would parse the 4 numbers as a single point at '--domain --dataid' would parse the 4 numbers as a single point at
x=0. Here 9 is the data index and 1 is the data value. 20 is an extra x=0. Here 9 is the data ID and 1 is the data value. 20 is an extra
value, so it is ignored. If another value followed 20, we'd get another value, so it is ignored. If another value followed 20, we'd get another
point in curve number point in curve ID 20
--[no]stream Do [not] display the data a point at a time, as it --[no]stream Do [not] display the data a point at a time, as it
@ -85,8 +86,8 @@ As an example, if line 3 of the input is "0 9 1 20"
--y2max xxx Set the range for the y2 axis. --y2max xxx Set the range for the y2 axis.
--y2 xxx Plot the data with this index on the y2 axis. These are --y2 xxx Plot the data specified by this curve ID on the y2 axis.
0-indexed Without --dataid, the ID is just an ordered 0-based index
--curvestyle xxx Additional style per curve. Give this option multiple --curvestyle xxx Additional style per curve. Give this option multiple
times for multiple curves times for multiple curves
@ -131,7 +132,7 @@ if(exists $ARGV[0] && !-r $ARGV[0])
# no monotonicity checks by default # no monotonicity checks by default
my %options = ( "stream" => 0, my %options = ( "stream" => 0,
"domain" => 0, "domain" => 0,
"dataindex" => 0, "dataid" => 0,
"points" => 0, "points" => 0,
"lines" => 0, "lines" => 0,
"xlen" => 0, "xlen" => 0,
@ -140,7 +141,7 @@ my %options = ( "stream" => 0,
GetOptions(\%options, GetOptions(\%options,
"stream!", "stream!",
"domain!", "domain!",
"dataindex!", "dataid!",
"lines!", "lines!",
"points!", "points!",
"legend=s@", "legend=s@",
@ -155,7 +156,7 @@ GetOptions(\%options,
"xmax=f", "xmax=f",
"y2min=f", "y2min=f",
"y2max=f", "y2max=f",
"y2=i@", "y2=s@",
"curvestyle=s@", "curvestyle=s@",
"extracmds=s@", "extracmds=s@",
"size=s", "size=s",
@ -184,6 +185,9 @@ if( defined $options{"help"} )
# references to lists of (x,y) tuples # references to lists of (x,y) tuples
my @curves = (); my @curves = ();
# list mapping curve names to their indices in the @curves list
my %curveIndices = ();
# now start the data acquisition and plotting threads # now start the data acquisition and plotting threads
my $dataQueue; my $dataQueue;
my $xwindow; my $xwindow;
@ -317,26 +321,29 @@ sub mainThread {
# For the specified values, set the legend entries to 'title "blah blah"' # For the specified values, set the legend entries to 'title "blah blah"'
if($options{"legend"}) if($options{"legend"})
{ {
foreach (@{$options{"legend"}}) { newCurve($_, "") } my $id = 0;
} foreach (@{$options{"legend"}})
{
# For the values requested to be printed on the y2 axis, set that setCurveLabel($id++, $_);
foreach my $y2idx (@{$options{"y2"}}) }
{
addCurveOption($y2idx, 'axes x1y2 linewidth 3');
} }
# add the extra curve options # add the extra curve options
if($options{"curvestyle"}) if($options{"curvestyle"})
{ {
my $idx = 0; my $id = 0;
foreach (@{$options{"curvestyle"}}) foreach (@{$options{"curvestyle"}})
{ {
addCurveOption($idx, $_); addCurveOption($id++, $_);
$idx++;
} }
} }
# For the values requested to be printed on the y2 axis, set that
foreach (@{$options{"y2"}})
{
addCurveOption($_, 'axes x1y2 linewidth 3');
}
# add the extra global options # add the extra global options
if($options{"extracmds"}) if($options{"extracmds"})
{ {
@ -359,12 +366,12 @@ sub mainThread {
if($_ ne "Plot now") if($_ ne "Plot now")
{ {
# parse the incoming data lines. The format is # parse the incoming data lines. The format is
# x idx0 dat0 idx1 dat1 .... # x id0 dat0 id1 dat1 ....
# where idxX is the index of the curve that datX corresponds to # where idX is the ID of the curve that datX corresponds to
# #
# $options{domain} indicates whether the initial 'x' is given or not (if not, the line # $options{domain} indicates whether the initial 'x' is given or not (if not, the line
# number is used) # number is used)
# $options{dataindex} indicates whether idxX is given or not (if not, the point order in the # $options{dataid} indicates whether idX is given or not (if not, the point order in the
# line is used) # line is used)
if($options{domain}) if($options{domain})
@ -387,25 +394,25 @@ sub mainThread {
} }
} }
if($options{dataindex}) if($options{dataid})
{ {
while(/(\d+)\s+$numRE/go) while(/(\w+)\s+$numRE/go)
{ {
my $idx = $1;
my $point = $2; my $point = $2;
$haveNewData = 1; $haveNewData = 1;
pushPoint($idx, [$xlast, $point]); pushPoint(getCurveIdx($1),
[$xlast, $point]);
} }
} }
else else
{ {
my $idx = 0; my $id = 0;
foreach my $point (/$numRE/go) foreach my $point (/$numRE/go)
{ {
$haveNewData = 1; $haveNewData = 1;
pushPoint($idx, [$xlast, $point]); pushPoint(getCurveIdx($id++),
$idx++; [$xlast, $point]);
} }
} }
} }
@ -494,59 +501,59 @@ sub plotStoredData
} }
} }
sub newCurve sub updateCurveOptions
{ {
sub pushNewEmptyCurve # generates the "options" string for a curve, based on its legend title and its other options
{ # These could be integrated into a single string, but that raises an issue in the no-title
my $opts = "notitle "; # case. When no title is specified, gnuplot will still add a legend entry with an unhelpful '-'
push @curves, [{"options" => " $opts"}]; # label. Thus I explicitly do "notitle" for that case
}
# I optionally pass in the title of this plot and any additional options separately. The title my ($curveoptions) = @_;
# COULD be a part of $opts, but this raises an issue in the no-title case. When no title is my $titleoption = defined $curveoptions->{title} ?
# specified, gnuplot will still add a legend entry with an unhelpful '-' label. I can still grep "title \"$curveoptions->{title}\"" : "notitle";
# $opts to see if a title is given, but that's a bit ugly in its own way...
my ($title, $opts, $idx) = @_; $curveoptions->{options} = "$curveoptions->{extraoptions} $titleoption";
}
sub getCurveIdx
{
# This function returns the curve index for a particular curve, creating a new curve if necessary
if(scalar @curves >= $options{maxcurves}) if(scalar @curves >= $options{maxcurves})
{ {
print STDERR "Tried to exceed the --maxcurves setting.\n"; print STDERR "Tried to exceed the --maxcurves setting.\n";
print STDERR "Invoke with a higher --maxcurves limit if you really want to do this.\n"; print STDERR "Invoke with a higher --maxcurves limit if you really want to do this.\n";
return; exit;
} }
# if this curve index doesn't exist, create curve up-to this index my ($id) = @_;
if(defined $idx)
if( !exists $curveIndices{$id} )
{ {
while(!exists $curves[$idx]) push @curves, [{extraoptions => ' '}]; # push a curve with no data and no options
{ $curveIndices{$id} = $#curves;
pushNewEmptyCurve();
}
}
else
{
# if we're not given an index, create a new one at the end, and fill it in
pushNewEmptyCurve();
$idx = $#curves;
}
if(defined $title) { $opts = "title \"$title\" $opts" } updateCurveOptions($curves[$#curves][0]);
else { $opts = "notitle $opts" } }
return $curveIndices{$id};
$curves[$idx] = [{"options" => " $opts"}];
} }
sub addCurveOption sub addCurveOption
{ {
my ($idx, $str) = @_; my ($id, $str) = @_;
if(exists $curves[$idx])
{ my $idx = getCurveIdx($id);
$curves[$idx][0]{"options"} .= " $str"; $curves[$idx][0]{extraoptions} .= "$str ";
} updateCurveOptions($curves[$idx][0]);
else }
{
newCurve('', $str, $idx); sub setCurveLabel
} {
my ($id, $str) = @_;
my $idx = getCurveIdx($id);
$curves[$idx][0]{title} = $str;
updateCurveOptions($curves[$idx][0]);
} }
# function to add a point to the plot. Assumes that the curve indexed by $idx already exists # function to add a point to the plot. Assumes that the curve indexed by $idx already exists
@ -554,11 +561,7 @@ sub pushPoint
{ {
my ($idx, $xy) = @_; my ($idx, $xy) = @_;
if ( !exists $curves[$idx] ) if($options{monotonic})
{
newCurve("", "", $idx);
}
elsif($options{monotonic})
{ {
my $curve = $curves[$idx]; my $curve = $curves[$idx];
if( @$curve > 1 && $xy->[0] < $curve->[$#{$curve}][0] ) if( @$curve > 1 && $xy->[0] < $curve->[$#{$curve}][0] )