--- db2gantt.cgi	2002/09/13 13:57:32	1.7
+++ db2gantt.cgi	2002/09/13 22:48:19	1.13
@@ -5,12 +5,13 @@
 use Data::Dumper;
 use Date::Parse;
 use CGI qw/:standard/;
+use CGI::Carp qw(fatalsToBrowser);
 use POSIX qw(strftime);
 
 my $debug = 0;
 
 my $width = 600;	# width of bar
-my $height = 12;	# height of bar
+my $height = 19;	# height of bar
 my $use_js = 1;		# use JavaScript pop-up
 
 # status colors
@@ -25,6 +26,7 @@
 	'Completed/Errors'	=> '255,128,0',
 	'Completed/Failure'	=> '128,0,128',
 	'Mount Request'		=> '128,128,255',
+	'Mount/Errors'		=> '255,64,128',
 	);
 
 my $int_t = (12 * 60 * 60);	# interval to display on one screen
@@ -34,14 +36,21 @@
 
 # time range
 
+$int_t = m_round($int_t);
+
 my ($from_t,$to_t) = (time()-$int_t,time());
 
 $to_t = param('to_t') if (param('to_t'));
 $from_t = param('from_t') if (param('from_t'));
 
 # round to nearest minute
-$to_t = $to_t - ($to_t % 60);
-$from_t = $from_t - ($from_t % 60) + 60;
+sub m_round {
+	my $t = shift @_;
+	return ($t - ($t % 60));
+}
+
+$to_t = m_round($to_t);
+$from_t = m_round($from_t);
 
 my $to=strftime("%Y-%m-%d %H:%M",localtime ($to_t));
 my $from=strftime("%Y-%m-%d %H:%M",localtime ($from_t));
@@ -103,7 +112,7 @@
 	return "<a href=\"".$q->url(-relative=>1)."?from_t=${f}&to_t=${t}\">$ch</a>";
 }
 
-print "<table>";
+print "<table cellspacing=0 cellpadding=0>";
 print "<tr bgcolor=#e0e0e0><td>Specification</td><td align=left>";
 print mknav(($from_t-$int_t),$to_t,'<small>&lt;&lt;</small>'),$from;
 print mknav(($from_t+$int_t),$to_t,'<small>&gt;&gt;</small>') if ($from_t+$int_t < $to_t);
@@ -111,36 +120,78 @@
 print mknav($from_t,($to_t-$int_t),'<small>&lt;&lt;</small>') if ($to_t-$int_t > $from_t);
 print $to,mknav($from_t,($to_t+$int_t),'<small>&gt;&gt;</small>'),"</td></tr>\n";
 
-my $fix_d = 0;	# used to fix graph len
+# draw hour grid
+sub hour_grid {
+	print "<tr><td align=right><small>hour grid</small></td><td colspan=2>";
+	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<int(($to_t-$from_t)/3600); $i++) {
+		print color_bar(3600,$c[1],sprintf("%02d",$hr++ % 24));
+		push @c, shift @c;
+	}
+	print color_bar($from_t % 3600,$c[1],sprintf("%02d",$hr % 24));
+	print "</td></tr>\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;
-		$fix_d += $min_l;
 	}
 	if ($fix_d && $size > $fix_d+$min_l) {
 		$size -= $fix_d;
 		$fix_d = 0;
+		print STDERR "fix_d: $fix_d\n" if ($debug);
 	}
 
-	print STDERR "bar[$status] len:$l s scale:",($len_t/$width)," size:$size px<br> alt:$alt\n" if ($debug);
+	print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px<br> alt:$alt\n" if ($debug);
 
-	my $html = "<img src=\"".$q->url(-relative=>1)."?pic=";
-
-	if ($status) {
-		$html .= $cols{$status};
-		$count{$status}++;
-	} else {
-#		$html .= '240,240,240';
-		$html .= '220,220,220';
-	}
+	my $html = "<img src=\"".$q->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) {
@@ -178,6 +229,7 @@
 		}
 
 		print "</td></tr>\n" if ($curr_t != $from_t);
+		($fix_s,$fix_d) = (0,0); # init fix vars for bar
 		print "<tr><td>", $row->{specification},"</td><td colspan=2>";
 
 		$curr_t = $from_t;	# init timeline
@@ -188,7 +240,8 @@
 	my $start_t = str2time($row->{start});
 	my $fin_t = str2time($row->{finish});
 
-	if ($start_t > $curr_t) {
+	# 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);
@@ -241,7 +294,9 @@
 undef $sth;
 $dbh->disconnect;
 
-print "</td></tr>\n</table>";
+print "</td></tr>\n";
+hour_grid();
+print "</table>";
 
 
 # label and usage
@@ -251,9 +306,11 @@
 print "<table border=0><tr bgcolor=#e0e0e0><th>status</th><th>#</th><th>color</th></tr>\n";
 foreach my $status (keys %count) {
 #foreach my $status (keys %cols) {
-	print "<tr bgcolor=#e0e0e0><td><small>$status</small></td><td><small>",$count{$status}-1,"</small></td><td>",bar($count{$status},$status),"</td></tr>\n" if ($status ne "");
-	# -1 in line above is a cludge to display correct number on
-	# occurences on graph and without one on legend!
+	print "<tr bgcolor=#e0e0e0><td><small>$status</small></td><td><small>",$count{$status}*1,"</small></td><td>",bar($count{$status},$status),"</td></tr>\n" if ($status ne "");
+	# *1 in line above is a cludge to display correct number on
+	# occurences on graph and without one on legend! If you remove * op
+	# it will first evaluate bar sub (thus increasing number by one) and
+	# then display number (wrongly).
 }
 print "</table>\n<p>Reload <a href=\"",$q->url(-relative=>1),"\">current</a>.</p></body></html>";