git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
value placeholder in contents
[barcat.git]
/
graph
diff --git
a/graph
b/graph
index 41d858a0bdbbf52159f3dc06797ed24f13d4d2cf..309510615e9edbb3b573102e2fb280fb4557c3bf 100755
(executable)
--- a/
graph
+++ b/
graph
@@
-16,6
+16,7
@@
sub podexit {
my %opt;
GetOptions(\%opt,
'color|c!',
my %opt;
GetOptions(\%opt,
'color|c!',
+ 'C' => sub { $opt{color} = 0 },
'interval|t:i',
'trim|length|l=s' => sub {
my ($optname, $optval) = @_;
'interval|t:i',
'trim|length|l=s' => sub {
my ($optname, $optval) = @_;
@@
-52,7
+53,7
@@
my (@lines, @values);
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
- push @values, s/^ ( \h* -? [0-9]* \.? [0-9]+ |)//x && $1;
+ push @values, s/^ ( \h* -? [0-9]* \.? [0-9]+ |)/
\n
/x && $1;
if (defined $opt{trim}) {
my $trimpos = abs $opt{trim};
if ($trimpos <= 1) {
if (defined $opt{trim}) {
my $trimpos = abs $opt{trim};
if ($trimpos <= 1) {
@@
-77,7
+78,7
@@
my $maxval = $order[0];
my $minval = min $order[-1], 0;
my $lenval = max map { length } @order;
my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
my $minval = min $order[-1], 0;
my $lenval = max map { length } @order;
my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
-
1 + max map { length } @
lines; # left padding
+
max map { length $values[$_] && length $lines[$_] } 0 .. $#
lines; # left padding
my $size = ($maxval - $minval) &&
($opt{width} - $lenval - $len) / ($maxval - $minval); # bar multiplication
my $size = ($maxval - $minval) &&
($opt{width} - $lenval - $len) / ($maxval - $minval); # bar multiplication
@@
-112,12
+113,12
@@
while ($nr <= $#lines) {
$val == $order[0] ? 32 : # max
$val == $order[-1] ? 31 : # min
90;
$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;
+ $val = sprintf "%*s", $lenval, $val;
+ $val = "\e[${color}m$val\e[0m" if $color;
}
}
- printf '%-*s', $len, $lines[$nr];
- print $barmark[$_] // '-' for 1 .. $size && (($val || 0) - $minval) * $size;
+ $lines[$nr] =~ s/\n/$val/;
+ printf '%-*s', $len + length($val), $lines[$nr];
+ print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size;
say '';
$nr++;
}
say '';
$nr++;
}