X-Git-Url: http://git.shiar.net/barcat.git/blobdiff_plain/21e2b568838b102ee7be38af599a3f7a6ab61b77..e178db6520bafa9ba6c2a89804310982940e7b13:/graph

diff --git a/graph b/graph
index 2212926..20ce299 100755
--- a/graph
+++ b/graph
@@ -20,29 +20,35 @@ $opt{color} //= 1;
 my @lines = readline or exit;
 chomp for @lines;
 my @values = map { s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x and $1 } @lines;
-my @order  = sort { $b <=> $a } @values;
-my $maxval = max $order[0], -$order[-1];
+my @order  = sort { $b <=> $a } grep { length } @values;
+my $maxval = $order[0];
+my $minval = min $order[-1], 0;
+
 my $lenval = max map { length } @order;
 my $len    = 1 + max map { length } @lines;  # left padding
-my $size   = $maxval && ($opt{width} - $lenval - $len) / $maxval;  # bar multiplication
+my $size   = ($maxval - $minval) &&
+	($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
-sub orderpos { ($order[$_[0]] + $order[$_[0] + .5]) / 2 * $size }
+sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size }
 my @barmark;
-$barmark[ sum(@values) / @values * $size ] = '=';  # average
+$barmark[ (sum(@order) / @order - $minval) * $size ] = '=';  # average
 $barmark[ orderpos($#order / 2) ] = '+';  # mean
+$barmark[ -$minval * $size ] = '|' if $minval < 0;  # zero
 defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark;
 
 for my $nr (0 .. $#lines) {
 	my $val = $values[$nr];
-	my $color = !$opt{color} ? 0 :
-		$val == $order[0] ? 32 : # max
-		$val == $order[-1] ? 31 : # min
-		90;
-	printf "\e[%sm", $color if $color;
-	printf "%*s", $lenval, $val;
-	print "\e[0m" if $color;
+	if (length $val) {
+		my $color = !$opt{color} ? 0 :
+			$val == $order[0] ? 32 : # max
+			$val == $order[-1] ? 31 : # min
+			90;
+		printf "\e[%sm", $color if $color;
+		printf "%*s", $lenval, $val;
+		print "\e[0m" if $color;
+	}
 	printf '%-*s', $len, $lines[$nr];
-	print $barmark[$_] // '-' for 1 .. abs $val * $size;
+	print $barmark[$_] // '-' for 1 .. (($val || 0) - $minval) * $size;
 	say '';
 }