enlarged by 20% also PerformaceGraph, ProfilingGraph

NetworkHistory, ChartPlotter and the Status page.

10 files changed, 37 insertions, 37 deletions

diff --git a/htroot/Performance_p.html b/htroot/Performance_p.html
index 9531e7be6..c411cdb5e 100644
--- a/htroot/Performance_p.html
+++ b/htroot/Performance_p.html
@@ -18,7 +18,7 @@
     #%env/templates/submenuMaintenance.template%#

     <h2>Performance Settings</h2>

 

-    <p><img src="PerformanceGraph.png?nopeers=" id="graph" alt="PerformanceGraph" width="660" height="240"/></p>

+    <p><img src="PerformanceGraph.png?nopeers=" id="graph" alt="PerformanceGraph" width="825" height="300"/></p>

     <form id="optionreloadGraph" action="" method="get"><p><input type="checkbox" name="option" id="autoreload"/> <label for="autoreload">refresh graph</label></p></form>

 

     <form action="Performance_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">

diff --git a/htroot/Status.html b/htroot/Status.html
index 8f550d92e..e2933c49f 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -49,10 +49,10 @@
        <div class="pull-left"><img class="media-object" src="env/grafics/kaskelix.png" width="128" height="64" alt="YaCy Websearch"></div>
        <div class="media-body" style="text-align:left;padding-left:100px;"><h1>Welcome to YaCy!</h1></div>
      </div>
-     <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,DHTRECEIVE,DHTSEND,PROXY&amp;width=600px&amp;height=180px&amp;maxlines=20&amp;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 />
+     <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,DHTRECEIVE,DHTSEND,PROXY&amp;width=750px&amp;height=180px&amp;maxlines=20&amp;maxwidth=120"
+              style="width:750px;height:180px;margin:0px;border:1px solid black;" scrolling="no" name="newsframe"></iframe><br />
+      <img src="PerformanceGraph.png?nomem=" id="graph" alt="PerformanceGraph" width="825" height="300"/><br />
+      <img src="NetworkHistory.png?columns=cI&scale=1&maxtime=24&width=825" width="825" height="300"/><br />
       <img src="Banner.png?textcolor=000000&amp;bgcolor=e7effc&amp;bordercolor=5090d0" alt="banner" width="468" height="60"/>
     </div>
 
diff --git a/htroot/env/base.css b/htroot/env/base.css
index a82e0b998..87b6062db 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -485,7 +485,7 @@ div.welcome { /* The heading in Status.html */
   margin: 0;
   padding-top:0px;
   text-align:left;
-  width:680px;
+  width:850px;
 }
 
 div.rightbar { /* sidebar on the right side */
diff --git a/htroot/rssTerminal.html b/htroot/rssTerminal.html
index a073e8a51..fc43cdc26 100644
--- a/htroot/rssTerminal.html
+++ b/htroot/rssTerminal.html
@@ -10,7 +10,7 @@ div#feedbox {
   margin: 0;

   background: #fff;

   text-align:left;

-  font:9px 'Droid Sans', 'Lucida Console', 'Courier New', monospace;

+  font:10px 'Droid Sans', 'Lucida Console', 'Courier New', monospace;

 }

 

 div#feedbox p {

diff --git a/htroot/terminal_p.html b/htroot/terminal_p.html
index d45806c76..4ca74cc64 100644
--- a/htroot/terminal_p.html
+++ b/htroot/terminal_p.html
@@ -22,7 +22,7 @@ function loadPerformance() {
   document.images[1].src = "PerformanceGraph.png?cnt=" + cnt++;

 }

 function loadNetwork() {

-  document.images[3].src = "NetworkPicture.png?width=660&amp;height=360&amp;bgcolor=000000&amp;cnt=" + cnt++;

+  document.images[3].src = "NetworkPicture.png?width=825&amp;height=450&amp;bgcolor=000000&amp;cnt=" + cnt++;

 }

 

 function init() {

@@ -127,12 +127,12 @@ function init() {
 </div>

 

 <h1>Resource Monitor</h1>

-<a href="PerformanceGraph.png" onclick="return hs.expand(this)"><img src="PerformanceGraph.png" style="width:330px;height:120px;border-width:0;" id="graph" alt="PerformanceGraph"/></a>

-<a href="WebStructurePicture_p.png?host=auto&amp;depth=2&amp;width=660&amp;height=240&amp;nodes=100&amp;time=1000" onclick="return hs.expand(this)"><img src="WebStructurePicture_p.png?host=auto&amp;depth=2&amp;width=660&amp;height=240&amp;nodes=100&amp;time=1000" style="width:330px;height:120px;border-width:0;" alt="WebStructurePicture"/></a>

+<a href="PerformanceGraph.png" onclick="return hs.expand(this)"><img src="PerformanceGraph.png" style="width:412px;height:150px;border-width:0;" id="graph" alt="PerformanceGraph"/></a>

+<a href="WebStructurePicture_p.png?host=auto&amp;depth=2&amp;width=8250&amp;height=300&amp;nodes=100&amp;time=1000" onclick="return hs.expand(this)"><img src="WebStructurePicture_p.png?host=auto&amp;depth=2&amp;width=825&amp;height=300&amp;nodes=100&amp;time=1000" style="width:330px;height:120px;border-width:0;" alt="WebStructurePicture"/></a>

 

 <h1>Network Monitor</h1>

 <div style="text-align:left;margin:0;padding:0;">

-<a href="NetworkPicture.png?width=660&amp;height=360&amp;bgcolor=000000" onclick="return hs.expand(this)"><img src="NetworkPicture.png?width=660&amp;height=360&amp;bgcolor=000000" style="width:330px;height:180px;border-width:0;" alt="The yacy Network" /></a>

+<a href="NetworkPicture.png?width=825&amp;height=450&amp;bgcolor=000000" onclick="return hs.expand(this)"><img src="NetworkPicture.png?width=825&amp;height=450&amp;bgcolor=000000" style="width:330px;height:180px;border-width:0;" alt="The yacy Network" /></a>

 <!--<embed src="http://widgets.amung.us/flash/v2map.swf" quality="high" pluginspage="http://www.macromedia.com/go/getflashplayer" wmode="transparent" allowScriptAccess="always" allowNetworking="all" type="application/x-shockwave-flash" flashvars="wausitehash=qp3j5gox&amp;map=night&amp;pin=star-orange&amp;link=no" width="330" height="180" />-->

 <!-- Because embed is not XHTML 1.0 Transitional replaced by object -->

 <script type="text/javascript" src="http://widgets.amung.us/map.js"></script><script type="text/javascript">WAU_map('qp3j5gox', 330, 180, 'night', 'star-orange')</script>

diff --git a/htroot/yacyinteractive.html b/htroot/yacyinteractive.html
index e9ef174f8..ab4247873 100644
--- a/htroot/yacyinteractive.html
+++ b/htroot/yacyinteractive.html
@@ -45,7 +45,7 @@ To see a list of all APIs, please visit the <a href="https://wiki.yacy.net/index
 </div>
 <div id="downloadscript" style="clear:both;"></div>
 <div id="searchresults" class="searchresults" style="clear:both;">
-<!-- <div><img src="PerformanceGraph.png" id="graph" alt="PerformanceGraph" width="660" height="240"/></div> -->
+<!-- <div><img src="PerformanceGraph.png" id="graph" alt="PerformanceGraph" width="825" height="300"/></div> -->
 </div>
 <div id="serverlist" style="clear:both;">
 #(serverlist)#::
diff --git a/source/net/yacy/htroot/NetworkHistory.java b/source/net/yacy/htroot/NetworkHistory.java
index 83b981777..4610f8b0f 100644
--- a/source/net/yacy/htroot/NetworkHistory.java
+++ b/source/net/yacy/htroot/NetworkHistory.java
@@ -111,13 +111,13 @@ public class NetworkHistory {
         minpeers=(minpeers/scale)*scale;
         maxpeers=((maxpeers/scale)+1)*scale;
         if ((maxpeers-minpeers)/scale < 3) scale=Math.max(5,scale/2);
-        final int leftborder = 30;
-        final int rightborder = 10;
+        final int leftborder = 64;
+        final int rightborder = 24;
         final int width = post.getInt("width", 768 + leftborder + rightborder);
         final int hspace = width - leftborder - rightborder;
-        final int height = post.getInt("height", 240);
-        final int topborder = 20;
-        final int bottomborder = 20;
+        final int height = post.getInt("height", 300);
+        final int topborder = 24;
+        final int bottomborder = 24;
         final int vspace = height - topborder - bottomborder;
         final int leftscale = scale;
         String timestr = maxtime + " HOURS";
diff --git a/source/net/yacy/htroot/PerformanceGraph.java b/source/net/yacy/htroot/PerformanceGraph.java
index dc8cc7224..10f187522 100644
--- a/source/net/yacy/htroot/PerformanceGraph.java
+++ b/source/net/yacy/htroot/PerformanceGraph.java
@@ -45,8 +45,8 @@ public class PerformanceGraph {
 
         if (post == null) post = new serverObjects();
 
-        final int width = post.getInt("width", 660);
-        final int height = post.getInt("height", 240);
+        final int width = post.getInt("width", 825);
+        final int height = post.getInt("height", 300);
         final boolean showMemory = !post.containsKey("nomem");
         final boolean showPeers = !post.containsKey("nopeers");
 
diff --git a/source/net/yacy/peers/graphics/ProfilingGraph.java b/source/net/yacy/peers/graphics/ProfilingGraph.java
index 6871b50dd..ad841826b 100644
--- a/source/net/yacy/peers/graphics/ProfilingGraph.java
+++ b/source/net/yacy/peers/graphics/ProfilingGraph.java
@@ -75,10 +75,10 @@ public class ProfilingGraph {
         final int maxmbytes = (int)(maxbytes / 1024 / 1024);
 
         // declare graph and set dimensions
-        final int leftborder = 30;
-        final int rightborder = 30;
-        final int topborder = 20;
-        final int bottomborder = 20;
+        final int leftborder = 64;
+        final int rightborder = 48;
+        final int topborder = 24;
+        final int bottomborder = 24;
         final int leftscale = (maxwords > 150000) ? maxwords / 150000 * 20000 : 10000;
         final int rightscale = showMemory ? ((maxmbytes > 1500) ? maxmbytes / 1500 * 200 : 100) : Math.max(100, maxppm / 100 * 100);
         final int anotscale = 1000;
diff --git a/source/net/yacy/visualization/ChartPlotter.java b/source/net/yacy/visualization/ChartPlotter.java
index f9544804c..d98407d1c 100644
--- a/source/net/yacy/visualization/ChartPlotter.java
+++ b/source/net/yacy/visualization/ChartPlotter.java
@@ -30,7 +30,7 @@ import net.yacy.cora.util.ConcurrentLog;
 public class ChartPlotter extends RasterPlotter {

 

     public static final int DIMENSION_RIGHT  = 0;

-    public static final int DIMENSION_TOP    = 1;

+    //public static final int DIMENSION_TOP    = 1;

     public static final int DIMENSION_LEFT   = 2;

     public static final int DIMENSION_BOTTOM = 3;

     public static final int DIMENSION_ANOT0  = 4;

@@ -62,11 +62,11 @@ public class ChartPlotter extends RasterPlotter {
         //this.foregroundColor = foregroundColor;

         if (name != null) {

             if (foregroundColor != null) this.setColor(foregroundColor);

-            PrintTool.print5(this, width / 2 - name.length() * 3, 6, 0, name, -1, 100);

+            PrintTool.print7(this, width / 2 - name.length() * 4, 10, 0, name, -1, 100);

         }

         if (subline != null) {

             if (lightColor != null) this.setColor(lightColor);

-            PrintTool.print5(this, width / 2 - subline.length() * 3, 14, 0, subline, -1, 100);

+            PrintTool.print7(this, width / 2 - subline.length() * 4, 20, 0, subline, -1, 100);

         }

     }

 

@@ -88,10 +88,10 @@ public class ChartPlotter extends RasterPlotter {
         this.colscale[dimensionType] = colorScale;

         this.tablenames[dimensionType] = name;

         if ((dimensionType == DIMENSION_LEFT) || (dimensionType == DIMENSION_RIGHT)) {

-            drawVerticalScale((dimensionType == DIMENSION_LEFT), scale, pixelperscale, offset, colorNaming, colorScale, name);

+            drawVerticalScale(scale, pixelperscale, offset, colorNaming, colorScale, name, (dimensionType == DIMENSION_LEFT));

         }

-        if ((dimensionType == DIMENSION_TOP) || (dimensionType == DIMENSION_BOTTOM)) {

-            drawHorizontalScale((dimensionType == DIMENSION_TOP), scale, pixelperscale, offset, colorNaming, colorScale, name);

+        if (/*(dimensionType == DIMENSION_TOP) ||*/ (dimensionType == DIMENSION_BOTTOM)) {

+            drawHorizontalScale(scale, pixelperscale, offset, colorNaming, colorScale, name);

         }

     }

 

@@ -101,7 +101,7 @@ public class ChartPlotter extends RasterPlotter {
         final int y = (int)((long)(coord_y - this.offsets[dimension_y]) * (long)(this.pixels[dimension_y]) / (this.scales[dimension_y]));

         if (dotsize == 1) plot(this.leftborder + x, this.height - this.bottomborder - y, 100);

                       else dot(this.leftborder + x, this.height - this.bottomborder - y, dotsize, true, 100);

-        if (anot != null) PrintTool.print5(this, this.leftborder + x + dotsize + 2 + ((anotAngle == 315) ? -9 : 0), this.height - this.bottomborder - y + ((anotAngle == 315) ? -3 : 0), anotAngle, anot, (anotAngle == 0) ? (anot.length() * 6 + x > this.width ? 1 : -1) : ((anotAngle == 315) ? 1 : 0), 100);

+        if (anot != null) PrintTool.print7(this, this.leftborder + x + dotsize + 2 + ((anotAngle == 315) ? -9 : 0), this.height - this.bottomborder - y + ((anotAngle == 315) ? -3 : 0), anotAngle, anot, (anotAngle == 0) ? (anot.length() * 6 + x > this.width ? 1 : -1) : ((anotAngle == 315) ? 1 : 0), 100);

     }

 

     public void chartLine(final int dimension_x, final int dimension_y, final float coord_x1, final int coord_y1, final float coord_x2, final int coord_y2) {

@@ -122,8 +122,8 @@ public class ChartPlotter extends RasterPlotter {
      * @param colorScale the colour of the line drawing for the vertical scale

      * @param name printed on the vertical bar

      */

-    private void drawHorizontalScale(final boolean top, final int scale, final int pixelperscale, final int offset, final Long colorNaming, final Long colorScale, final String name) {

-        final int y = (top) ? this.topborder : this.height - this.bottomborder;

+    private void drawHorizontalScale(final int scale, final int pixelperscale, final int offset, final Long colorNaming, final Long colorScale, final String name) {

+        final int y = this.height - this.bottomborder;

         int x = this.leftborder;

         int s = offset;

         while (x < this.width - this.rightborder) {

@@ -133,12 +133,12 @@ public class ChartPlotter extends RasterPlotter {
             }

             setColor(colorNaming);

             line(x, y - 3, x, y + 3, 100);

-            PrintTool.print5(this, x, (top) ? y - 3 : y + 9, 0, Integer.toString(s), -1, 80);

+            PrintTool.print7(this, x, y + 10, 0, Integer.toString(s), -1, 80);

             x += pixelperscale;

             s += scale;

         }

         setColor(colorNaming);

-        PrintTool.print5(this, this.width - this.rightborder, (top) ? y - 9 : y + 15, 0, name, 1, 80);

+        PrintTool.print7(this, this.width - this.rightborder, y + 20, 0, name, 1, 80);

         line(this.leftborder - 4, y, this.width - this.rightborder + 4, y, 100);

     }

 

@@ -152,7 +152,7 @@ public class ChartPlotter extends RasterPlotter {
      * @param colorScale the colour of the line drawing for the vertical scale

      * @param name printed on the vertical bar

      */

-    private void drawVerticalScale(final boolean left, final int scale, final int pixelperscale, final int offset, final Long colorNaming, final Long colorScale, final String name) {

+    private void drawVerticalScale(final int scale, final int pixelperscale, final int offset, final Long colorNaming, final Long colorScale, final String name, final boolean left) {

         assert pixelperscale > 0;

         assert scale > 0;

         if (pixelperscale <= 0) return; // this would not meet the termination condition in the while loop

@@ -170,12 +170,12 @@ public class ChartPlotter extends RasterPlotter {
             line(x - 3, y, x + 3, y, 100);

             s1 = (s >= 1000000 && s % 1000000 == 0) ? Integer.toString(s / 1000000) + "M" : (s >= 1000 && s % 1000 == 0) ? Integer.toString(s / 1000) + "K" : Integer.toString(s);

             if (s1.length() > s1max) s1max = s1.length();

-            PrintTool.print5(this, (left) ? this.leftborder - 4 : this.width - this.rightborder + 4, y, 0, s1, (left) ? 1 : -1, 80);

+            PrintTool.print7(this, (left) ? this.leftborder - 4 : this.width - this.rightborder + 4, y, 0, s1, (left) ? 1 : -1, 80);

             y -= pixelperscale;

             s += scale;

         }

         setColor(colorNaming);

-        PrintTool.print5(this, (left) ? Math.max(6, x - s1max * 6 - 6) : x + s1max * 6 + 9, this.height - this.bottomborder, 90, name, -1, 80);

+        PrintTool.print7(this, (left) ? Math.max(8, x - s1max * 8 - 12) : x + s1max * 8 + 12, this.height - this.bottomborder, 90, name, -1, 80);

         line(x, this.topborder - 4, x, this.height - this.bottomborder + 4, 100);

     }