git.shiar.nl
/
barcat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e1e2b1
)
align human values, reserve constant length
author
Mischa POSLAWSKY
<perl@shiar.org>
Sat, 7 Sep 2019 14:14:50 +0000
(16:14 +0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Sat, 7 Sep 2019 18:16:38 +0000
(20:16 +0200)
barcat
patch
|
blob
|
history
diff --git
a/barcat
b/barcat
index b75bf987f48ae4fe2f6de7473893ca540d074232..40f332d980ed308a3b41b45a161a662e5af63bf9 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-58,6
+58,7
@@
$opt{color} //= -t *STDOUT; # enable on tty
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
$opt{units} = $opt{'human-readable'} && ['', qw( k M G T P E Z Y y z a f p n μ m )];
$opt{anchor} //= qr/\A/;
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
$opt{units} = $opt{'human-readable'} && ['', qw( k M G T P E Z Y y z a f p n μ m )];
$opt{anchor} //= qr/\A/;
+$opt{'value-length'} = 6 if $opt{units};
if (defined $opt{interval}) {
$opt{interval} ||= 1;
if (defined $opt{interval}) {
$opt{interval} ||= 1;
@@
-131,8
+132,13
@@
if ($opt{markers} // 1 and $size > 0) {
sub sival {
my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
sub sival {
my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
- sprintf "%3.1f%1s", $_[0] / 1000 ** $unit,
- $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit];
+ my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x;
+ sprintf('%*.*f%*s',
+ $float ? 5 : 3, $float, # length and tenths
+ $_[0] / 1000 ** $unit, # number
+ $float ? 1 : 3, # unit size
+ $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit]
+ );
}
while ($nr <= $#lines) {
}
while ($nr <= $#lines) {
@@
-200,6
+206,7
@@
for example I<-f'(\d+)'> for the first digits anywhere.
Format values using SI unit prefixes,
turning long numbers like I<12356789> into I<12.4M>.
Also changes an exponent I<1.602176634e-19> to I<160.2z>.
Format values using SI unit prefixes,
turning long numbers like I<12356789> into I<12.4M>.
Also changes an exponent I<1.602176634e-19> to I<160.2z>.
+Short integers are aligned but kept without decimal point.
=item -t, --interval[=<seconds>]
=item -t, --interval[=<seconds>]