ignore length of valueless lines in padding

[barcat.git] / graph

diff --git a/graph b/graph
index 373bbfdef4fc9424664201bbd1446b285d6fce10..c069dd3d49d145f6b9f3b652dd2f23dd79667b55 100755 (executable)
--- a/graph
+++ b/graph
@@ -16,7 +16,8 @@ sub podexit {
 my %opt;
 GetOptions(\%opt,
        'color|c!',
-       'follow|f:i',
+       'C' => sub { $opt{color} = 0 },
+       'interval|t:i',
        'trim|length|l=s' => sub {
                my ($optname, $optval) = @_;
                $optval =~ s/%$// and $opt{trimpct}++;
@@ -37,13 +38,13 @@ $opt{width} ||= $ENV{COLUMNS} || 80;
 $opt{color} //= -t *STDOUT;  # enable on tty
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
 
-if (defined $opt{follow}) {
-       $opt{follow} ||= 1;
+if (defined $opt{interval}) {
+       $opt{interval} ||= 1;
        $SIG{ALRM} = sub {
                show_lines();
-               alarm $opt{follow};
+               alarm $opt{interval};
        };
-       alarm $opt{follow};
+       alarm $opt{interval};
 }
 
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
@@ -77,7 +78,7 @@ my $maxval = $order[0];
 my $minval = min $order[-1], 0;
 my $lenval = max map { length } @order;
 my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
-       1 + max map { length } @lines;  # left padding
+       1 + max map { length $values[$_] && length $lines[$_] } 0 .. $#lines;  # left padding
 my $size   = ($maxval - $minval) &&
        ($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
@@ -149,9 +150,9 @@ Force colored output of values and bar markers.
 Defaults on if output is a tty,
 disabled otherwise such as when piped or redirected.
 
-=item -f, --follow[=<seconds>]
+=item -t, --interval[=<seconds>]
 
-Interval to output partial progress.
+Interval time to output partial progress.
 
 =item -l, --length=[-]<size>[%]
 
@@ -254,6 +255,11 @@ Movies per year from prepared JSON data:
     curl https://github.com/prust/wikipedia-movie-data/raw/master/movies.json |
     jq '.[].year' | uniq -c | graph
 
+Pokémon height comparison:
+
+       curl https://github.com/Biuni/PokemonGO-Pokedex/raw/master/pokedex.json |
+       jq -r '.pokemon[] | [.height,.num,.name] | join(" ")' | graph
+
 Git statistics, such commit count by year:
 
     git log --pretty=%ci | cut -b-4 | uniq -c | graph
@@ -265,7 +271,7 @@ Or the most frequent authors:
 Latency history:
 
     ping google.com |
-    perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -f
+    perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -t
 
 =head1 AUTHOR