add time interval to graph legends

This commit is contained in:
zzz
2012-03-05 15:00:52 +00:00
parent ee22244b53
commit 6c2d4ded1c
4 changed files with 21 additions and 1 deletions

View File

@ -6,7 +6,9 @@ import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@ -326,6 +328,9 @@ public class StatSummarizer implements Runnable {
def.gprint(sendName, "MAX", ' ' + _("max") + ": %.2f %S" + _("Bps") + "\\r"); def.gprint(sendName, "MAX", ' ' + _("max") + ": %.2f %S" + _("Bps") + "\\r");
def.gprint(recvName, SummaryListener.CF, _("In average") + ": %.2f %S" + _("Bps")); def.gprint(recvName, SummaryListener.CF, _("In average") + ": %.2f %S" + _("Bps"));
def.gprint(recvName, "MAX", ' ' + _("max") + ": %.2f %S" + _("Bps") + "\\r"); def.gprint(recvName, "MAX", ' ' + _("max") + ": %.2f %S" + _("Bps") + "\\r");
// '07-Jul 21:09 UTC' with month name in the system locale
SimpleDateFormat sdf = new SimpleDateFormat("dd-MMM HH:mm");
def.comment(sdf.format(new Date(start)) + " -- " + sdf.format(new Date(end)) + " UTC\\r");
} }
if (!showCredit) if (!showCredit)
def.setShowSignature(false); def.setShowSignature(false);

View File

@ -5,6 +5,8 @@ import java.awt.Graphics;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.stream.ImageOutputStream; import javax.imageio.stream.ImageOutputStream;
@ -149,6 +151,9 @@ class SummaryRenderer {
def.gprint(plotName, SummaryListener.CF, _("avg") + ": %.2f %s"); def.gprint(plotName, SummaryListener.CF, _("avg") + ": %.2f %s");
def.gprint(plotName, "MAX", ' ' + _("max") + ": %.2f %S"); def.gprint(plotName, "MAX", ' ' + _("max") + ": %.2f %S");
def.gprint(plotName, "LAST", ' ' + _("now") + ": %.2f %S\\r"); def.gprint(plotName, "LAST", ' ' + _("now") + ": %.2f %S\\r");
// '07-Jul 21:09 UTC' with month name in the system locale
SimpleDateFormat sdf = new SimpleDateFormat("dd-MMM HH:mm");
def.comment(sdf.format(new Date(start)) + " -- " + sdf.format(new Date(end)) + " UTC\\r");
} }
if (!showCredit) if (!showCredit)
def.setShowSignature(false); def.setShowSignature(false);

View File

@ -1,3 +1,13 @@
2012-03-05 zzz
* Build: Make windows and non-windows installers for release
* configclients: Tweaks
* Graphs: Add time interval to legend
* NetDB: Increase min ff to 250
* Plugins: Fix setting webapp classpath on Jetty 6
* UDP: Log tweaks
* viewstat.jsp: Set Connection: Close to work around Jetty bug
http://jira.codehaus.org/browse/JETTY-1346
2012-03-04 zzz 2012-03-04 zzz
* Jetty: Upgrade to Jetty 6.1.26, Tomcat 6.0.35, and JSTL 1.2. * Jetty: Upgrade to Jetty 6.1.26, Tomcat 6.0.35, and JSTL 1.2.
- Supports Servlet 2.5 / JSP 2.1 standards - Supports Servlet 2.5 / JSP 2.1 standards

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 4; public final static long BUILD = 5;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";