";
print "Specification | ";
print mknav(($from_t-$int_t),$to_t,'<<'),$from;
print mknav(($from_t+$int_t),$to_t,'>>') if ($from_t+$int_t < $to_t);
@@ -119,15 +120,64 @@
print mknav($from_t,($to_t-$int_t),'<<') if ($to_t-$int_t > $from_t);
print $to,mknav($from_t,($to_t+$int_t),'>>')," |
\n";
-my $fix_d = 0; # used to fix graph len
+# draw hour grid
+sub hour_grid {
+ print "hour grid | ";
+ my @c = ("255,255,128","255,192,128");
+ my $hr=strftime("%H",localtime ($from_t));
+ my $min_l=1;
+ print color_bar(3600 - $from_t % 3600,$c[0],sprintf("%02d",$hr++ % 24));
+ for (my $i=1; $i |
\n";
+}
+
+hour_grid();
+
+my $fix_d = 0; # used to fix graph len (in pixels)
+my $fix_s = 0; # used to collect round errors of size
sub bar {
- my $l = shift @_; # lenght of event utime
- my $status = shift @_ || undef; # what to draw
+ my $l = shift @_;
+ my $status = shift @_;
+ my $alt = shift @_;
+
+ my $col;
+
+ if ($status) {
+ if ($cols{$status}) {
+ $col .= $cols{$status};
+ } else {
+ $col .= "0,0,0"; # unknown status, black
+ }
+ $count{$status}++;
+ } else {
+# $col .= '240,240,240';
+ $col .= '220,220,220';
+ }
+ return color_bar($l,$col,$alt,$min_l);
+}
+
+sub color_bar {
+ my $l = shift @_; # lenght of event utime
+ my $col = shift @_ || '240,240,240'; # default color (filler)
my $alt = shift @_ || undef;
+ my $min_l = shift @_ || 1;
+
+ my $size = $l / ($len_t / $width);
+ $fix_s += $size - int($size);
+ $size=int($size);
+ # add rounding error to size
+ if ($fix_s > 1) {
+ my $i = $fix_s ; $i = int($i);
+ $fix_s -= $i;
+ $size += $i;
+ }
- my $size = int($l / ($len_t / $width));
- if ($size < $min_l) {
+ if ($alt && $size < $min_l) {
$fix_d += ($min_l - $size);
print STDERR "fix_d: $fix_d\n" if ($debug);
$size = $min_l;
@@ -138,23 +188,10 @@
print STDERR "fix_d: $fix_d\n" if ($debug);
}
- print STDERR "bar[$status] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug);
-
- my $html = "url(-relative=>1)."?pic=";
+ print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug);
- if ($status) {
- if ($cols{$status}) {
- $html .= $cols{$status};
- } else {
- $html .= "0,0,0"; # unknown status, black
- }
- $count{$status}++;
- } else {
-# $html .= '240,240,240';
- $html .= '220,220,220';
- }
+ my $html = "url(-relative=>1)."?pic=$col\" width=\"$size\" height=\"$height\"";
- $html .= "\" width=\"$size\" height=\"$height\"";
if ($use_js && $alt) {
$html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\"";
} elsif ($alt) {
@@ -192,6 +229,7 @@
}
print "\n" if ($curr_t != $from_t);
+ ($fix_s,$fix_d) = (0,0); # init fix vars for bar
print "", $row->{specification}," | ";
$curr_t = $from_t; # init timeline
@@ -199,10 +237,11 @@
}
- my $start_t = m_round(str2time($row->{start}));
- my $fin_t = m_round(str2time($row->{finish}));
+ my $start_t = str2time($row->{start});
+ my $fin_t = str2time($row->{finish});
- if ($start_t > $curr_t + 60) {
+ # Can I squeeze here 1 pixel of time (many seconds) ?
+ if ($start_t > $curr_t + ($len_t / $width)) {
my $t = $start_t - $curr_t;
print STDERR "[middle filler $curr_t:$t]" if ($debug);
print bar($t);
@@ -255,7 +294,9 @@
undef $sth;
$dbh->disconnect;
-print " |
\n
";
+print "\n";
+hour_grid();
+print "