Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv22541/src/freenet
Modified Files:
OpenConnectionManager.java
Log Message:
Initialize bitmaps with proper viewport (a viewport of (0,0,1,1) isn't of much use for
anything).
Draw estimator lines with lines instead of with dots.
Modify bitmap viewport scale calculation to enable drawing to (0,Y).
Fix bug in OCM PeerHandler HTML causing duplicate rendering of 'Transfer rate
(min/max) Xbytes/second/Xbytes/second' section on max detail level.
Darker colors in the PeerHandler HTML routing graphs. Easier to read and better for
flux lines drawing.
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -w -r1.159 -r1.160
--- OpenConnectionManager.java 3 Nov 2003 16:32:25 -0000 1.159
+++ OpenConnectionManager.java 4 Nov 2003 12:32:11 -0000 1.160
@@ -1756,10 +1756,10 @@
}
PeerHTMLRenderer()
{
- rtColors.put("tSuccessSearch", new Color(255,0,0));
- rtColors.put("tTransferRate", new Color(100,100,0));
- rtColors.put("pDNF", new Color(0,180,0));
- rtColors.put("tDNF", new Color(0,0,255));
+ rtColors.put("tSuccessSearch", new Color(155,0,0));
+ rtColors.put("tTransferRate", new Color(80,80,0));
+ rtColors.put("pDNF", new Color(0,130,0));
+ rtColors.put("tDNF", new Color(0,0,155));
}
protected void doRenderBody(PrintWriter pw, HttpServletRequest req) {
pw.println(renderViewLevelSelectorLink(req.getRequestURI()));
@@ -1974,7 +1974,6 @@
vG1 = new Value("min",
e.getHTMLReportingTool().getEstimator("tTransferRate").getHTMLReportingTool().lowestString(TimeEstimator.TRANSFER_RATE),
((Color) rtColors.get("tTransferRate")).toHexString(), -1);
vG2 = new Value("max",
e.getHTMLReportingTool().getEstimator("tTransferRate").getHTMLReportingTool().highestString(TimeEstimator.TRANSFER_RATE),
((Color) rtColors.get("tTransferRate")).toHexString(), -1);
gLabel =
e.getHTMLReportingTool().graphNiceName("tTransferRate");
- ;
id = null;
}
}
@@ -1993,9 +1992,9 @@
v1 = new
Value("sucesses",String.valueOf(p.messagesSent),"7810D0",calculateBarLength(p.messagesSent,normalizeTo.messagesSent,normalizeTo.messagesSendFailed));
v2 = new
Value("failures",String.valueOf(p.messagesSendFailed),"252597",calculateBarLength(p.messagesSendFailed,normalizeTo.messagesSendFailed,normalizeTo.messagesSent));
renderPeerHandlerCell(pw,req,"Messages sent",v1,v2,id,vG1,vG2,gLabel);
- v1 = new
Value("sucesses",String.valueOf(p.messagesReceived),"7810D0",calculateBarLength(p.messagesReceived,normalizeTo.messagesReceived,normalizeTo.messagesReceiveFailed));
- v2 = new
Value("failures",String.valueOf(p.messagesReceiveFailed),"252597",calculateBarLength(p.messagesReceiveFailed,normalizeTo.messagesReceiveFailed,normalizeTo.messagesReceived));
- renderPeerHandlerCell(pw,req,"Messages
received",v1,v2,id,vG1,vG2,gLabel);
+ //v1 = new
Value("sucesses",String.valueOf(p.messagesReceived),"7810D0",calculateBarLength(p.messagesReceived,normalizeTo.messagesReceived,normalizeTo.messagesReceiveFailed));
+ //v2 = new
Value("failures",String.valueOf(p.messagesReceiveFailed),"252597",calculateBarLength(p.messagesReceiveFailed,normalizeTo.messagesReceiveFailed,normalizeTo.messagesReceived));
+ //renderPeerHandlerCell(pw,req,"Messages
received",v1,v2,id,vG1,vG2,gLabel);
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs