--- db2gantt.cgi	2002/09/13 18:35:50	1.11
+++ db2gantt.cgi	2002/09/13 23:59:38	1.14
@@ -11,7 +11,7 @@
 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
@@ -75,10 +75,12 @@
 }
 
 print "Content-type: text/html
+Cache-Control: max-age=60, must-revalidate
 
 <html>
 <head>
-<title>OmniBack Gantt: $from - $to</title>";
+<title>OmniBack Gantt: $from - $to</title>
+<meta HTTP-EQUIV=\"Refresh\" CONTENT=60>";
 if ($use_js) {
 print '
 <script type="text/javascript" language="javascript" src="1k.js"></script>
@@ -112,7 +114,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);
@@ -125,6 +127,7 @@
 	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));
@@ -136,7 +139,8 @@
 
 hour_grid();
 
-my $fix_d = 0;	# used to fix graph len
+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 @_;
@@ -156,16 +160,26 @@
 #		$col .= '240,240,240';
 		$col .= '220,220,220';
 	}
-	return color_bar($l,$col,$alt);
+	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 = int($l / ($len_t / $width));
-	if ($size < $min_l) {
+	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;
+	}
+
+	if ($alt && $size < $min_l) {
 		$fix_d += ($min_l - $size);
 		print STDERR "fix_d: $fix_d\n" if ($debug);
 		$size = $min_l;
@@ -217,6 +231,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
@@ -224,14 +239,18 @@
 
 	}
 
-	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);
 		$curr_t = $start_t;
+	} else {
+		# prepend too few seconds to next event
+		$start_t = $curr_t;
 	}
 
 	my $len = $fin_t - $start_t;
@@ -298,5 +317,5 @@
 	# 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>";
+print "</table>\n<p>Reload <a href=\"",$q->url(-relative=>1),"\">current</a> or see <a href=\"db2gantt_help.html\">help</a>.</p></body></html>";
 

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); @@ -125,6 +127,7 @@ 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 1) { + my $i = $fix_s ; $i = int($i); + $fix_s -= $i; + $size += $i; + } + + if ($alt && $size < $min_l) { $fix_d += ($min_l - $size); print STDERR "fix_d: $fix_d\n" if ($debug); $size = $min_l; @@ -217,6 +231,7 @@ } print "
", $row->{specification},"	"; $curr_t = $from_t; # init timeline @@ -224,14 +239,18 @@ } - 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); $curr_t = $start_t; + } else { + # prepend too few seconds to next event + $start_t = $curr_t; } my $len = $fin_t - $start_t; @@ -298,5 +317,5 @@ # it will first evaluate bar sub (thus increasing number by one) and # then display number (wrongly). } -print "