2007-07-14 zzz

* Clean up graphs.jsp - set K=1024 where appropriate,
      output image sizes in html, catch ooms, other minor tweaks
    * Fix current event count truncation which fixes graphs with low
      60-sec event counts displaying high values
      (bw.* and router.* graphs for example were 1.5x too high)
      Affects all "events per period" (non-lifetime) counts.

apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

@@ -55,10 +55,13 @@ public class GraphHelper {
     
     public String getImages() { 
         try {
-            _out.write("<img src=\"viewstat.jsp?stat=bw.combined"
+            if (!_showEvents)
+                _out.write("<img width=\""
+                           + (_width + 83) + "\" height=\"" + (_height + 92)
+                           + "\" src=\"viewstat.jsp?stat=bw.combined"
                            + "&amp;periodCount=" + _periodCount 
                            + "&amp;width=" + _width
-                           + "&amp;height=" + _height
+                           + "&amp;height=" + (_height - 14)
                            + "\" title=\"Combined bandwidth graph\" />\n");
             
             List listeners = StatSummarizer.instance().getListeners();
@@ -68,7 +71,10 @@ public class GraphHelper {
                 SummaryListener lsnr = (SummaryListener)iter.next();
                 Rate r = lsnr.getRate();
                 String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod());
-                _out.write("<img src=\"viewstat.jsp?stat=" + r.getRateStat().getName() 
+                _out.write("<img width=\""
+                           + (_width + 83) + "\" height=\"" + (_height + 92)
+                           + "\" src=\"viewstat.jsp?stat="
+                           + r.getRateStat().getName() 
                            + "&amp;showEvents=" + _showEvents
                            + "&amp;period=" + r.getPeriod() 
                            + "&amp;periodCount=" + _periodCount 
@@ -119,4 +125,4 @@ class AlphaComparator implements Comparator {
         String rName = r.getRate().getRateStat().getName() + "." + r.getRate().getPeriod();
         return lName.compareTo(rName);
     }
-}
+}