From 047d20c16603fb80b5abfe2fe1d1bb073e117eab Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sun, 8 Sep 2019 16:39:03 +0200 Subject: [PATCH] optional decimal point for human-readable integers Retain input value precision. --- barcat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/barcat b/barcat index bdddf65..a664d0d 100755 --- a/barcat +++ b/barcat @@ -143,10 +143,11 @@ if ($opt{markers} // 1 and $size > 0) { @lines > $nr or return if $opt{hidemin}; sub sival { - my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1)); - my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x; + my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1) + 1e-15); + my $float = sprintf '%e', $_[0] / 1000 ** $unit; #TODO: or $_[0] =~ /\./ + $float -= int($float); sprintf('%*.*f%*s', - $float ? 5 : 3, $float, # length and tenths + $float ? (5,1) : (3,0), # length and tenths $_[0] / 1000 ** $unit, # number $float ? 0 : 3, # unit size $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit] -- 2.30.0