diff options
| -rw-r--r-- | htroot/NetworkHistory.java | 4 | ||||
| -rw-r--r-- | htroot/Status.html | 1 | ||||
| -rw-r--r-- | source/net/yacy/visualization/ChartPlotter.java | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/htroot/NetworkHistory.java b/htroot/NetworkHistory.java index 56e16b72d..ea9ffb27f 100644 --- a/htroot/NetworkHistory.java +++ b/htroot/NetworkHistory.java @@ -100,7 +100,7 @@ public class NetworkHistory { if (v != null) maxpeers = Math.max(maxpeers, (int) v.longValue()); } } - final int leftborder = 40; + final int leftborder = 30; final int rightborder = 10; final int width = post.getInt("width", 768 + leftborder + rightborder); final int hspace = width - leftborder - rightborder; @@ -125,7 +125,7 @@ public class NetworkHistory { if (columns.contains("cR")) headline = "YACY INDEX SIZE HISTORY: NUMBER OF RWI ENTRIES"; ChartPlotter chart = new ChartPlotter(width, height, 0xFFFFFFl, 0x000000l, 0xAAAAAAl, leftborder, rightborder, topborder, bottomborder, headline, "IN THE LAST " + timestr); chart.declareDimension(ChartPlotter.DIMENSION_BOTTOM, bottomscale, hspace / (maxtime / bottomscale), -maxtime, 0x000000l, 0xCCCCCCl, "TIME/HOURS"); - chart.declareDimension(ChartPlotter.DIMENSION_LEFT, leftscale, vspace * leftscale / maxpeers, 0, 0x008800l, null , "PEERS"); + chart.declareDimension(ChartPlotter.DIMENSION_LEFT, leftscale, vspace * leftscale / maxpeers, 0, 0x008800l, null , columns.contains("cI") ? "DOCUMENTS" : columns.contains("cR") ? "RWIs" : "PEERS"); // write the data float x0, x1; diff --git a/htroot/Status.html b/htroot/Status.html index b5ba6ace1..0808cec96 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -52,6 +52,7 @@ <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,DHTRECEIVE,DHTSEND,PROXY&width=600px&height=180px&maxlines=20&maxwidth=120"
style="width:600px;height:180px;margin:0px;border:1px solid black;" scrolling="no" name="newsframe"></iframe><br />
<img src="PerformanceGraph.png?nomem=" id="graph" alt="PerformanceGraph" width="660" height="240"/><br />
+ <img src="/NetworkHistory.png?columns=cI&scale=1&maxtime=24&width=660" width="660" height="240"/><br />
<img src="Banner.png?textcolor=000000&bgcolor=e7effc&bordercolor=5090d0" alt="banner" width="468" height="60"/>
</div>
diff --git a/source/net/yacy/visualization/ChartPlotter.java b/source/net/yacy/visualization/ChartPlotter.java index bb01602af..58af8e5d1 100644 --- a/source/net/yacy/visualization/ChartPlotter.java +++ b/source/net/yacy/visualization/ChartPlotter.java @@ -178,7 +178,7 @@ public class ChartPlotter extends RasterPlotter { s += scale; } setColor(colorNaming); - PrintTool.print(this, (left) ? x - s1max * 6 - 6 : x + s1max * 6 + 9, this.topborder, 90, name, 1); + PrintTool.print(this, (left) ? Math.max(6, x - s1max * 6 - 6) : x + s1max * 6 + 9, this.height - this.bottomborder, 90, name, -1); line(x, this.topborder - 4, x, this.height - this.bottomborder + 4, 100); } |