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

added preliminary support for timefmt

Browse Source
This commit is contained in:
Dima Kogan 2013-09-10 20:40:35 -07:00
parent 2f5e9d95ca
commit b43c9b985f
1 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bin/feedgnuplot
View File

@ -115,7 +115,7 @@ sub interpretCommandline
'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s', 'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=f', 'xmax=f', 'y2min=f', 'y2max=f', 'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=f', 'xmax=f', 'y2min=f', 'y2max=f',
'zmin=f', 'zmax=f', 'y2=s@', 'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=s@', 'zmin=f', 'zmax=f', 'y2=s@', 'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=s@',
'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
'histogram=s@', 'binwidth=f', 'histstyle=s', 'histogram=s@', 'binwidth=f', 'histstyle=s',
'terminal=s', 'terminal=s',
'extraValuesPerPoint=i', 'help', 'dump', 'exit', 'version', 'extraValuesPerPoint=i', 'help', 'dump', 'exit', 'version',
@ -218,6 +218,12 @@ sub interpretCommandline
exit -1; exit -1;
} }
if ( $options->{timefmt} )
{
print STDERR "--3d makes no sense with --timefmt\n";
exit -1;
}
if ( defined $options->{y2min} || defined $options->{y2max} || defined $options->{y2} ) if ( defined $options->{y2min} || defined $options->{y2max} || defined $options->{y2} )
{ {
print STDERR "--3d does not make sense with --y2...\n"; print STDERR "--3d does not make sense with --y2...\n";
@ -244,6 +250,12 @@ sub interpretCommandline
} }
else else
{ {
if ( $options->{timefmt} && !$options->{domain} )
{
print STDERR "--timefmt makes sense only with --domain\n";
exit -1;
}
if(!$options->{colormap}) if(!$options->{colormap})
{ {
if ( defined $options->{zmin} || defined $options->{zmax} || defined $options->{zlabel} ) if ( defined $options->{zmin} || defined $options->{zmax} || defined $options->{zlabel} )
@ -274,6 +286,22 @@ sub interpretCommandline
print STDERR "unknown histstyle. Allowed are 'freq...', 'cum...', 'uniq...', 'cnorm...'\n"; print STDERR "unknown histstyle. Allowed are 'freq...', 'cum...', 'uniq...', 'cnorm...'\n";
exit -1; exit -1;
} }
# deal with timefmt
if ( $options->{timefmt} )
{
# I need to compute a regex to match the time field and I need to count how
# many whilespace-separated fields there are.
# strip leading and trailing whitespace
$options->{timefmt} =~ s/^\s*//;
$options->{timefmt} =~ s/\s*$//;
my $Nfields = scalar split( ' ', $options->{timefmt});
$options->{timefmt_Ncols} = $Nfields;
my $regex_str = join( '\s+', ('\S+') x $Nfields );
$options->{timefmt_regex} = qr/$regex_str/;
}
} }
sub getGnuplotVersion sub getGnuplotVersion
@ -456,6 +484,13 @@ sub mainThread
addCurveOption($_, 'axes x1y2 linewidth 3'); addCurveOption($_, 'axes x1y2 linewidth 3');
} }
# timefmt
if( $options{timefmt} )
{
print(PIPE "set timefmt '$options{timefmt}'\n");
print(PIPE "set xdata time\n");
}
# add the extra global options # add the extra global options
if($options{extracmds}) if($options{extracmds})
{ {
@ -477,6 +512,8 @@ sub mainThread
# regexp for a possibly floating point, possibly scientific notation number # regexp for a possibly floating point, possibly scientific notation number
my $numRE = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?'; my $numRE = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?';
my $domainRE = $options{timefmt_regex} || $numRE;
# a point may be preceded by an id # a point may be preceded by an id
my $pointRE = $options{dataid} ? '(\S+)\s+' : '()'; my $pointRE = $options{dataid} ? '(\S+)\s+' : '()';
@ -510,7 +547,7 @@ sub mainThread
if($options{domain}) if($options{domain})
{ {
/($numRE)/go or next; /($domainRE)/go or next;
$domain[0] = $1; $domain[0] = $1;
if($options{'3d'}) if($options{'3d'})
{ {
@ -647,7 +684,13 @@ sub updateCurveOptions
my $histoptions = $curveoptions->{histoptions} || ''; my $histoptions = $curveoptions->{histoptions} || '';
$curveoptions->{options} = "$histoptions $titleoption $curveoptions->{extraoptions} $curvestyleall"; my $usingoptions = '';
if( $options{timefmt} )
{
$usingoptions = "using 1:" . ($options{timefmt_Ncols}+1);
}
$curveoptions->{options} = "$histoptions $usingoptions $titleoption $curveoptions->{extraoptions} $curvestyleall";
} }
sub getCurve sub getCurve