negative value support

[barcat.git] / graph

diff --git a/graph b/graph
index 5b61e53a5c8d978b3b0922c10d49e66c43f7aac0..01f68463e0c8779f8d974b8d0dfe679673da9444 100755 (executable)
--- a/graph
+++ b/graph
@@ -2,35 +2,39 @@
 use 5.014;
 use warnings;
 use List::Util qw( max sum );
+use open qw( :std :utf8 );
 
 our $VERSION = '1.00';
 
 use Getopt::Long '2.33';
 sub podexit { require Pod::Usage; Pod::Usage::pod2usage(-exitval => 0, @_) }
 GetOptions(\my %opt,
+       'color|c!',
        'width|w=i',
        'usage|h' => sub { podexit() },
        'help'    => sub { podexit(-verbose => 2) },
 ) or exit 64;  # EX_USAGE
 $opt{width} ||= $ENV{COLUMNS} || 80;
+$opt{color} //= 1;
 
 my @lines = readline or exit;
 chomp for @lines;
-my @values = map { s/^\h*([0-9]*)// and $1 } @lines;
+my @values = map { s/^\h*(-?[0-9]*)// and $1 } @lines;
 my @order  = sort { $b <=> $a } @values;
-my $lenval = 1 + int log($order[0]) / log 10;  # max string length
+my $maxval = max $order[0], -$order[-1];
+my $lenval = 1 + ($order[-1] < 0) + int log($maxval || 1) / log 10;  # max string length
 my $len    = 1 + max map { length } @lines;  # left padding
-my $size   = ($opt{width} - $lenval - $len) / $order[0];  # bar multiplication
+my $size   = ($opt{width} - $lenval - $len) / $maxval;  # bar multiplication
 
 sub orderpos { ($order[$_[0]] + $order[$_[0] + .5]) / 2 * $size }
 my @barmark;
 $barmark[ sum(@values) / @values * $size ] = '=';  # average
 $barmark[ orderpos($#order / 2) ] = '+';  # mean
-defined and $_ = "\e[36m$_\e[0m" for @barmark;
+defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark;
 
 for my $nr (0 .. $#lines) {
        my $val = $values[$nr];
-       my $color =
+       my $color = !$opt{color} ? 0 :
                $val == $order[0] ? 32 : # max
                $val == $order[-1] ? 31 : # min
                90;
@@ -38,7 +42,7 @@ for my $nr (0 .. $#lines) {
        printf "%*s", $lenval, $val;
        print "\e[0m" if $color;
        printf '%-*s', $len, $lines[$nr];
-       print $barmark[$_] // '-' for 1 .. $val * $size;
+       print $barmark[$_] // '-' for 1 .. abs $val * $size;
        say '';
 }
 
@@ -60,6 +64,10 @@ Each line starting with a number is given a bar to visualise relative sizes.
 
 =over
 
+=item --no-color
+
+Disable colored output of values and bar markers.
+
 =item -w, --width=<columns>
 
 Override the maximum number of columns to use.