boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

enhanced network graphic

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7446 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 14 years ago
parent 30df013c2b
commit 991b92f4ae
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File

6
htroot/Network.html
Unescape View File

@ -11,7 +11,7 @@
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
imagestub = "NetworkPicture.png?width=768&height=576&bgcolor=FFFFFF&ct=5000&coronaangle="; imagestub = "NetworkPicture.png?width=1024&height=576&bgcolor=FFFFFF&ct=5000&coronaangle=";
imageanimindex = 0; imageanimindex = 0;
imageloadindex = 0; imageloadindex = 0;
imagecycles = 0; imagecycles = 0;
@ -23,7 +23,7 @@
for (j = 0; j < 6; j++) initanimationphase(j, handle); for (j = 0; j < 6; j++) initanimationphase(j, handle);
} }
function initanimationphase(phase, handle) { function initanimationphase(phase, handle) {
imagearray[phase] = new Image(768, 576); imagearray[phase] = new Image(1024, 576);
angle = phase * 60; angle = phase * 60;
imagearray[phase].src = imagestub + angle + "&handle=" + handle; imagearray[phase].src = imagestub + angle + "&handle=" + handle;
} }
@ -222,7 +222,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<div class="left"> <div class="left">
<p> <p>
<a href="NetworkPicture.png?width=768&amp;height=576&amp;bgcolor=FFFFFF"><img id="NetworkPicture" src="NetworkPicture.png?width=768&amp;height=576&amp;bgcolor=FFFFFF&amp;coronaangle=0" alt="The YaCy Network" width="768" height="576" /></a> <a href="NetworkPicture.png?width=1024&amp;height=576&amp;bgcolor=FFFFFF"><img id="NetworkPicture" src="NetworkPicture.png?width=1024&amp;height=576&amp;bgcolor=FFFFFF&amp;coronaangle=0" alt="The YaCy Network" width="1024" height="576" /></a>
</p> </p>
</div> </div>
<div class="left"> <div class="left">

18
htroot/NetworkPicture.java
Unescape View File

@ -62,10 +62,10 @@ public class NetworkPicture {
return buffer; return buffer;
} }
int width = 768; int width = 1024; // 640x480 = VGA, 768x576 = SD/4:3, 1024x576 =SD/16:9 1280x720 = HD/16:9, 1920x1080 = FULL HD/16:9
int height = 576; int height = 576;
int passiveLimit = 720; // 12 hours int passiveLimit = 10080; // minutes; 1440 = 1 day; 720 = 12 hours; 10080 = 1 week;
int potentialLimit = 720; int potentialLimit = 10080;
int maxCount = 1000; int maxCount = 1000;
String bgcolor = NetworkGraph.COL_BACKGROUND; String bgcolor = NetworkGraph.COL_BACKGROUND;
boolean corona = true; boolean corona = true;
@ -73,11 +73,11 @@ public class NetworkPicture {
long communicationTimeout = -1; long communicationTimeout = -1;
if (post != null) { if (post != null) {
width = post.getInt("width", 768); width = post.getInt("width", width);
height = post.getInt("height", 576); height = post.getInt("height", height);
passiveLimit = post.getInt("pal", 1440); passiveLimit = post.getInt("pal", passiveLimit);
potentialLimit = post.getInt("pol", 1440); potentialLimit = post.getInt("pol", potentialLimit);
maxCount = post.getInt("max", 1000); maxCount = post.getInt("max", maxCount);
corona = post.get("corona", "true").equals("true"); corona = post.get("corona", "true").equals("true");
coronaangle = (corona) ? post.getInt("coronaangle", 0) : -1; coronaangle = (corona) ? post.getInt("coronaangle", 0) : -1;
communicationTimeout = post.getLong("ct", -1); communicationTimeout = post.getLong("ct", -1);
@ -88,7 +88,7 @@ public class NetworkPicture {
if (width < 320 ) width = 320; if (width < 320 ) width = 320;
if (width > 1920) width = 1920; if (width > 1920) width = 1920;
if (height < 240) height = 240; if (height < 240) height = 240;
if (height > 1920) height = 1920; if (height > 1080) height = 1080;
if (!authorized) { if (!authorized) {
width = Math.min(768, width); width = Math.min(768, width);
height = Math.min(576, height); height = Math.min(576, height);

22
source/de/anomic/yacy/graphics/NetworkGraph.java
Unescape View File

@ -174,14 +174,14 @@ public class NetworkGraph {
RasterPlotter networkPicture = new RasterPlotter(width, height, (bgcolor.equals("000000")) ? RasterPlotter.DrawMode.MODE_ADD : RasterPlotter.DrawMode.MODE_SUB, bgcolor); RasterPlotter networkPicture = new RasterPlotter(width, height, (bgcolor.equals("000000")) ? RasterPlotter.DrawMode.MODE_ADD : RasterPlotter.DrawMode.MODE_SUB, bgcolor);
if (seedDB == null) return networkPicture; // no other peers known if (seedDB == null) return networkPicture; // no other peers known
final int innerradius = Math.min(width, height) / 5; final int maxradius = Math.min(width, height) / 2;
int outerradius = innerradius + innerradius * seedDB.sizeConnected() / 100; final int innerradius = maxradius * 4 / 10;
if (outerradius > innerradius * 2) outerradius = innerradius * 2; int outerradius = maxradius - 20;
// draw network circle // draw network circle
networkPicture.setColor(COL_DHTCIRCLE); networkPicture.setColor(COL_DHTCIRCLE);
networkPicture.arc(width / 2, height / 2 + 20, innerradius - 20, innerradius + 20, 0, 360); networkPicture.arc(width / 2, height / 2, innerradius - 20, innerradius + 20, 0, 360);
//System.out.println("Seed Maximum distance is " + yacySeed.maxDHTDistance); //System.out.println("Seed Maximum distance is " + yacySeed.maxDHTDistance);
//System.out.println("Seed Minimum distance is " + yacySeed.minDHTNumber); //System.out.println("Seed Minimum distance is " + yacySeed.minDHTNumber);
@ -200,7 +200,7 @@ public class NetworkGraph {
continue; continue;
} }
//Log.logInfo("NetworkGraph", "drawing peer " + seed.getName()); //Log.logInfo("NetworkGraph", "drawing peer " + seed.getName());
drawNetworkPicturePeer(networkPicture, width / 2, height / 2 + 20, innerradius, outerradius, seed, COL_ACTIVE_DOT, COL_ACTIVE_LINE, COL_ACTIVE_TEXT, coronaangle); drawNetworkPicturePeer(networkPicture, width / 2, height / 2, innerradius, outerradius, seed, COL_ACTIVE_DOT, COL_ACTIVE_LINE, COL_ACTIVE_TEXT, coronaangle);
count++; count++;
} }
totalCount += count; totalCount += count;
@ -218,7 +218,7 @@ public class NetworkGraph {
if (lastseen > passiveLimit) { if (lastseen > passiveLimit) {
break; // we have enough, this list is sorted so we don't miss anything break; // we have enough, this list is sorted so we don't miss anything
} }
drawNetworkPicturePeer(networkPicture, width / 2, height / 2 + 20, innerradius, outerradius, seed, COL_PASSIVE_DOT, COL_PASSIVE_LINE, COL_PASSIVE_TEXT, coronaangle); drawNetworkPicturePeer(networkPicture, width / 2, height / 2, innerradius, outerradius, seed, COL_PASSIVE_DOT, COL_PASSIVE_LINE, COL_PASSIVE_TEXT, coronaangle);
count++; count++;
} }
totalCount += count; totalCount += count;
@ -236,13 +236,13 @@ public class NetworkGraph {
if (lastseen > potentialLimit) { if (lastseen > potentialLimit) {
break; // we have enough, this list is sorted so we don't miss anything break; // we have enough, this list is sorted so we don't miss anything
} }
drawNetworkPicturePeer(networkPicture, width / 2, height / 2 + 20, innerradius, outerradius, seed, COL_POTENTIAL_DOT, COL_POTENTIAL_LINE, COL_POTENTIAL_TEXT, coronaangle); drawNetworkPicturePeer(networkPicture, width / 2, height / 2, innerradius, outerradius, seed, COL_POTENTIAL_DOT, COL_POTENTIAL_LINE, COL_POTENTIAL_TEXT, coronaangle);
count++; count++;
} }
totalCount += count; totalCount += count;
// draw my own peer // draw my own peer
drawNetworkPicturePeer(networkPicture, width / 2, height / 2 + 20, innerradius, outerradius, seedDB.mySeed(), COL_MYPEER_DOT, COL_MYPEER_LINE, COL_MYPEER_TEXT, coronaangle); drawNetworkPicturePeer(networkPicture, width / 2, height / 2, innerradius, outerradius, seedDB.mySeed(), COL_MYPEER_DOT, COL_MYPEER_LINE, COL_MYPEER_TEXT, coronaangle);
// draw DHT activity // draw DHT activity
if (communicationTimeout >= 0) { if (communicationTimeout >= 0) {
@ -253,14 +253,14 @@ public class NetworkGraph {
if (event == null || event.getPubDate() == null) continue; if (event == null || event.getPubDate() == null) continue;
if (event.getPubDate().after(horizon)) { if (event.getPubDate().after(horizon)) {
//System.out.println("*** NETWORK-DHTRECEIVE: " + event.getLink()); //System.out.println("*** NETWORK-DHTRECEIVE: " + event.getLink());
drawNetworkPictureConnection(networkPicture, width / 2, height / 2 + 20, innerradius, seedDB.mySeed(), seedDB.get(event.getLink()), COL_DHTIN); drawNetworkPictureConnection(networkPicture, width / 2, height / 2, innerradius, seedDB.mySeed(), seedDB.get(event.getLink()), COL_DHTIN);
} }
} }
for (Hit event: yacyChannel.channels(yacyChannel.DHTSEND)) { for (Hit event: yacyChannel.channels(yacyChannel.DHTSEND)) {
if (event == null || event.getPubDate() == null) continue; if (event == null || event.getPubDate() == null) continue;
if (event.getPubDate().after(horizon)) { if (event.getPubDate().after(horizon)) {
//System.out.println("*** NETWORK-DHTSEND: " + event.getLink()); //System.out.println("*** NETWORK-DHTSEND: " + event.getLink());
drawNetworkPictureConnection(networkPicture, width / 2, height / 2 + 20, innerradius, seedDB.mySeed(), seedDB.get(event.getLink()), COL_DHTOUT); drawNetworkPictureConnection(networkPicture, width / 2, height / 2, innerradius, seedDB.mySeed(), seedDB.get(event.getLink()), COL_DHTOUT);
} }
} }
} }

6
source/net/yacy/visualization/PrintTool.java
Unescape View File

@ -58,7 +58,7 @@ public class PrintTool {
for (int j = 0; j < 5; j++) { for (int j = 0; j < 5; j++) {
c = row & 3L; c = row & 3L;
if (c == 3) matrix.plot(x + 5 - j, y, 100); if (c == 3) matrix.plot(x + 5 - j, y, 100);
if (c == 2) matrix.plot(x + 5 - j, y, 36); else if (c == 2) matrix.plot(x + 5 - j, y, 36);
row = row >> 2; row = row >> 2;
} }
y--; y--;
@ -67,7 +67,7 @@ public class PrintTool {
for (int j = 0; j < 5; j++) { for (int j = 0; j < 5; j++) {
c = row & 3L; c = row & 3L;
if (c == 3) matrix.plot(x, y - 5 + j, 100); if (c == 3) matrix.plot(x, y - 5 + j, 100);
if (c == 2) matrix.plot(x, y - 5 + j, 36); else if (c == 2) matrix.plot(x, y - 5 + j, 36);
row = row >> 2; row = row >> 2;
} }
x--; x--;
@ -76,7 +76,7 @@ public class PrintTool {
for (int j = 0; j < 5; j++) { for (int j = 0; j < 5; j++) {
c = row & 3L; c = row & 3L;
if (c == 3) { matrix.plot(x + 5 - j, y + 5 - j, 100); matrix.plot(x + 6 - j, y + 5 - j, 50); matrix.plot(x + 5 - j, y + 6 - j, 50); } if (c == 3) { matrix.plot(x + 5 - j, y + 5 - j, 100); matrix.plot(x + 6 - j, y + 5 - j, 50); matrix.plot(x + 5 - j, y + 6 - j, 50); }
if (c == 2) { matrix.plot(x + 5 - j, y + 5 - j, 36); matrix.plot(x + 6 - j, y + 5 - j, 18); matrix.plot(x + 5 - j, y + 6 - j, 18); } else if (c == 2) { matrix.plot(x + 5 - j, y + 5 - j, 36); matrix.plot(x + 6 - j, y + 5 - j, 18); matrix.plot(x + 5 - j, y + 6 - j, 18); }
row = row >> 2; row = row >> 2;
} }
x++; x++;

Write Preview
Loading…
Cancel
Save