From b85682a62247278da21404075bb39d030bdd6d64 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 7 Sep 2019 15:49:36 +0200 Subject: [PATCH] move human formatting code into sival() function --- barcat | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/barcat b/barcat index 5ac55ba..69f4516 100755 --- a/barcat +++ b/barcat @@ -125,6 +125,11 @@ if ($opt{markers} // 1 and $size > 0) { } } +sub sival { + my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1)); + sprintf "%3.1f%1s", $_[0] / 1000 ** $unit, $opt{units}->[$unit]; +} + while ($nr <= $#lines) { $nr >= $opt{hidemax} and last if $opt{hidemax}; my $val = $values[$nr]; @@ -133,9 +138,7 @@ while ($nr <= $#lines) { $val == $order[0] ? 32 : # max $val == $order[-1] ? 31 : # min 90; - $val = sprintf "%3.1f%1s", $val / 1000**$_, $opt{units}->[$_] - for $opt{units} ? int(log($val) / log(1000) - ($val < 1)) : (); - $val = sprintf "%*s", $lenval, $val; + $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val; $val = "\e[${color}m$val\e[0m" if $color; } my $line = $lines[$nr] =~ s/\n/$val/r; -- 2.30.0