diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-12-03 15:17:05 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 16:26:20 +0100 |
| commit | 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 (patch) | |
| tree | 35e16f100466e4e00657199b38bb3d87d52bf73f /applications/luci-app-olsr-viz | |
| parent | 9edd0e46c3f880727738ce8ca6ff1c8b85f99ef4 (diff) | |
Rework LuCI build system
* Rename subdirectories to their repective OpenWrt package names
* Make each LuCI module its own standalone package
* Deploy a shared luci.mk which is used by each module Makefile
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'applications/luci-app-olsr-viz')
12 files changed, 935 insertions, 0 deletions
diff --git a/applications/luci-app-olsr-viz/Makefile b/applications/luci-app-olsr-viz/Makefile new file mode 100644 index 000000000..e1a118509 --- /dev/null +++ b/applications/luci-app-olsr-viz/Makefile @@ -0,0 +1,14 @@ +# +# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=OLSR Visualisation +LUCI_DEPENDS:=+luci-app-olsr +olsrd +olsrd-mod-txtinfo + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-olsr-viz/htdocs/cgi-bin/olsr-viz.sh b/applications/luci-app-olsr-viz/htdocs/cgi-bin/olsr-viz.sh new file mode 100755 index 000000000..e33c63246 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/cgi-bin/olsr-viz.sh @@ -0,0 +1,40 @@ +#!/bin/sh +echo Content-type: text/html +echo + +cat << EOF +<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> +var css=document.styleSheets[0]; +if (null!=css.insertRule) { +css.insertRule(".label {color:black;background-color:white}", css.cssRules.length); +} +else { +css.addRule(".label", "color:black"); +css.addRule(".label", "background-color:white"); +} +</SCRIPT> +<SCRIPT SRC="/luci-static/resources/olsr-viz.js" LANGUAGE="JavaScript1.2" TYPE="text/javascript"></SCRIPT> +<DIV ID="main" +STYLE="width: 100%; height: 93%; border: 1px solid #ccc; margin-left:auto; margin-right:auto; text-align:center; overflow: scroll"> +<DIV ID="edges" STYLE="width: 1px; height: 1px; position: relative; z-index:2"></DIV> +<DIV ID="nodes" STYLE="width: 1px; height: 1px; position: relative; z-index:4"></DIV> +</DIV> +<DIV STYLE="z-index:99"> +<FORM ACTION=""> +<P><B TITLE="Bestimmt die Vergrößerungsstufe.">Zoom</B> <A HREF="javascript:set_scale(scale+0.1)">+</A> <A HREF="javascript:set_scale(scale-0.1)">–</A> <INPUT ID="zoom" NAME="zoom" TYPE="text" VALUE="2.0" SIZE="5" ONCHANGE="set_scale()">  +|  <B TITLE="Beschränkt die Anzeige auf eine maximale Hop-Entfernung.">Metrik</B> <A HREF="javascript:set_maxmetric(maxmetric+1)">+</A> <A HREF="javascript:if(0<maxmetric)set_maxmetric(maxmetric-1)">–</A> <INPUT ID="maxmetric" NAME="maxmetric" TYPE="text" VALUE="3" SIZE="4" ONCHANGE="set_maxmetric(this.value)">  +|  <B TITLE="Schaltet die automatischen Layout-Optimierung ein.">Optimierung</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" CHECKED="CHECKED">  +|  <B TITLE="Zeige Hostnamen an.">Hostnamen</B><INPUT ID="show_hostnames" NAME="show_hostnames" TYPE="checkbox" ONCHANGE="set_showdesc(this.checked)" CHECKED="CHECKED">  +|  <A HREF="javascript:viz_save()" TITLE="Speichert die aktuellen Einstellungen in einem Cookie.">Speichern</A>  +|  <A HREF="javascript:viz_reset()" TITLE="Startet das Viz-Skriptprogramm neu.">Zurücksetzen</A></P> +</FORM></DIV> +<SPAN ID="debug" STYLE="visibility:hidden;"></SPAN> +<IFRAME ID="RSIFrame" NAME="RSIFrame" STYLE="border:0px; width:0px; height:0px; visibility:hidden;"> +</IFRAME> +<SCRIPT LANGUAGE="JavaScript1.2" TYPE="text/javascript"> + +viz_setup("RSIFrame","main","nodes","edges"); +viz_update(); + +</SCRIPT> +EOF diff --git a/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh b/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh new file mode 100755 index 000000000..5a74f2be9 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh @@ -0,0 +1,48 @@ +#!/bin/sh +echo Content-type: text/html +echo + +cat<<EOF +<HTML> +<HEAD> + <TITLE>OLSR-VIZ Data</TITLE> + <META CONTENT="text/html; charset=iso-8859-1" HTTP-EQUIV="Content-Type"> + <META CONTENT="no-cache" HTTP-EQUIV="cache-control"> +</HEAD> +<BODY> + +<script langauge='JavaScript1.2' type='text/javascript'> +EOF + +# sed + txtinfo plugin +re_ip='[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}' +re_sep='[[:space:]]\{1,\}' +re_nosep='[^[:space:]]\{1,\}' +wget http://127.0.0.1:2006/all -qO - | sed -n " +/^Table: Links$/,/^$/ { +s# # - #g +s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{3\}$re_sep\($re_nosep\)#parent.touch_edge(parent.touch_node('\1').set_metric(1).update(),parent.touch_node('\2').set_metric(1).update(),'\4');#p +} +/^Table: Topology$/,/^$/ { +s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{2\}$re_sep\($re_nosep\)#parent.touch_edge(parent.touch_node('\1').update(),parent.touch_node('\2').update(),'\4');#p +} +/^Table: HNA$/,/^$/ { +s#\($re_ip\)/\([0-9]\{1,\}\)$re_sep\($re_ip\)#parent.touch_hna(parent.touch_node('\3'),'\1','\2');#p +} +/^Table: Routes$/,/^$/ { +s#\($re_ip\)/32$re_sep$re_nosep$re_sep\($re_nosep\).*#parent.touch_node('\1').set_metric('\2').update();#p +} +" + +hosts=$(uci show olsrd|grep hosts_file|cut -d "=" -f 2) +if [ -n $hosts ]; then +sed -n " +s#\($re_ip\)$re_sep\($re_nosep\)$re_sep.*#parent.touch_node('\1').set_desc('\2');#p +" < $hosts +fi + +cat<<EOF + parent.viz_callback(); +</script> +</BODY></HTML> +EOF diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js new file mode 100644 index 000000000..49435a4a3 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js @@ -0,0 +1,818 @@ +/* +Copyright (c) 2006, Lorenz Schori <lo@znerol.ch> +All rights reserved (Naja: Ich hab' trotzdem was geaendert. Sven-Ola). (Naja: +diese Rechte garantiert dir die BSD-Lizenz ja ausdrücklich. Lorenz) + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +- Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +- Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +- Neither the name of the <ORGANIZATION> nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +OLSR-Viz is inspired by Wi-viz: http://wiviz.natetrue.com + +Changes: +2007-10-04: Added hostname display option -- Stefan Katerkamp <stefan@katerkamp.de>. +2007-10-04: Optimized display by moving presentation css out of js -- lo +2010-12-11: Changed some paths to make it work with Kamikaze and Luci -- soma +*/ + +var cgi_url = "/cgi-bin/vizdata.sh"; + +var maxmetric = 3; +var iconvariant = "-mini"; +var nodes = new Array(); +var ncount = 0; +var newnodes = new Array(); +var edges = new Array(); +var iel = 220; // ideal edge length +var optsize = 10; // boundingbox around nodes + +var vwidth = 0; +var vheight = 0; + +var xoff = 0; +var yoff = 0; +var scale = 1.0; + +var idle_timeout = 15; +var erase_timeout = 60; +var dcl_timeout = 250; +var dcllow_timeout = 500; +var auto_declump = true; +var showdesc = true; +var auto_save = 1; +var now_secs = 5; + +// dom elements +var IFrameObj; +var maindiv; +var nodediv; +var edgediv; + +/******* CALL TO SERVER ********/ +function callToServer(URL) { + var IFrameDoc; + + if (IFrameObj.document) { + // For IE5 + opera + IFrameDoc = IFrameObj.document; + } + else if (IFrameObj.contentDocument) { + // For NS6 + IFrameDoc = IFrameObj.contentDocument; + } + else if (IFrameObj.contentWindow) { + // For IE5.5 and IE6 + IFrameDoc = IFrameObj.contentWindow.document; + } + else { + // opera? hmmmm + return true; + } + + IFrameDoc.location.replace(URL); + return false; +} + + +/******** EDGE CLASS ********/ +function edge(n1,n2){ + this.getHTML = function() + { + var nh = ""; + + if(this.n1.metric > maxmetric || this.n2.metric > maxmetric) { + return ""; + } + + x = this.n1.x*scale; + y = this.n1.y*scale; + dx = this.n2.x*scale - x; + dy = this.n2.y*scale - y; + + x += xoff*scale + 75; + y += yoff*scale + 15; + + imgtag = "<img src='/luci-static/resources/olsr-viz/dot_" + if (this.etx > 0 && this.etx < 2) { + imgtag += "good.gif'"; + } + else if(this.etx > 2 && this.etx < 5) { + imgtag += "ok.gif'"; + } + else if(this.etx > 5 && this.etx < 10) { + imgtag += "weak.gif'"; + } + else { + imgtag += "down.gif'"; + } + imgtag += " alt='ETX: " + this.etx + "' title='ETX: " + this.etx + "' "; + + d = Math.sqrt(dx*dx+dy*dy); + + for (j = 0; j < d; j += 15) { + nh += imgtag + "style='top:" + + parseInt(y+dy * j / d) + "px; left:" + + parseInt(x+dx * j / d) + "px; " + + "width: 4px; height: 4px; position: absolute; z-index: 2' >"; + } + + nh += "<div style='top:" + + parseInt(y+dy * 0.5 - 5) + "px; left:" + + parseInt(x+dx * 0.5 - 24) + "px; " + + "position: absolute; z-index: 3; width: 48px; text-align: center;' >" + + "<span class='label etx' >" + this.etx + "</span></div>"; + + return nh; + } + + this.isIdle = function() + { + return (now_secs - this.lastseen > idle_timeout); + } + + this.isDead = function() + { + return (now_secs - this.lastseen > erase_timeout); + } + + this.cleanup = function() + { + if(this.n1 && this.n1.weight) { + this.n1.weight--; + } + if(this.n2 && this.n2.weight) { + this.n2.weight--; + } + if(this.n1 && this.n2) { + delete this.n1.edges[n2.ip]; + delete this.n2.edges[n1.ip]; + } + } + + this.n1 = n1; + this.n2 = n2; + + // setup edges within node objects + this.n1.weight++; + this.n1.edges[n2.ip] = this; + this.n2.weight++; + this.n2.edges[n1.ip] = this; + + return this; +} + +function getEdgeKey(ip1,ip2) +{ + key = ""; + if(ip1 > ip2) { + key = ip2 + "-" + ip1; + } + else { + key = ip1 + "-" + ip2; + } + return key; +} + +function touch_edge(n1,n2,etx) +{ + var key = getEdgeKey(n1.ip,n2.ip); + var e = edges[key]; + if(!e) { + e = new edge(n1,n2); + edges[key] = e; + } + e.etx = etx; + e.lastseen = now_secs; + return e; +} + +/******** NODE CLASS ********/ +function node(ip) { + this.getHTML = function() + { + var nh; + + if(this.metric > maxmetric) { + return ""; + } + var igw = 0; + for(h in this.hna) { + if(h == "0.0.0.0") { + igw = 1; + break; + } + } + nh = + "<div id='node_" + this.ip + "' onmousedown='dragstart(this)' style=" + + "'top: " + parseInt((this.y+yoff)*scale) + "px; " + + "left: " + parseInt((this.x+xoff)*scale) + "px; " + + "width: 150px; height: 1px; z-index: 4; " + + "position: absolute; background-color: transparent;' >" + + "<div><img src='/luci-static/resources/olsr-viz/node"+(igw ? "-hna" : "")+iconvariant + ".gif'" + + " alt='node " + this.ip + "' style='border: none;'><br>" + + "<a href='http://" + this.ip + "/'>" + + "<span class='label ip'>" + this.ip + "</span></a>" + + (showdesc && this.desc != "" ? + "<br><span class='label desc'>" + this.desc + "</span>" : "") + + "</div></div>"; + return nh; + } + + this.isIdle = function() + { + return (now_secs - this.lastseen > idle_timeout); + } + + this.isDead = function() + { + return (now_secs - this.lastseen > erase_timeout); + } + + this.cleanup = function() + { + ncount--; + } + + this.set_metric = function(metric) { + this.metric = metric; + return this; + } + + this.set_desc = function(desc) { + this.desc = desc + return this; + } + + this.update = function() { + this.lastseen = now_secs; + return this; + } + + this.ip = ip; + this.x = 0; + this.y = 0; + this.dx_last=0; + this.dy_last=0; + this.placed = false; + this.weight = 0; + this.edges = new Array(); + this.hna = new Array(); + this.pinned = false; + this.metric = 999; + this.desc = ""; + + ncount++; + return this; +} + +function touch_node(ip) { + n = nodes[ip]; + if(!n) { + n = new node(ip); + nodes[ip] = n; + // newnodes.push(n); + // push and pop not supported in old ie. shit. + newnodes[newnodes.length] = n; + } + return n; +} + +function place_new_nodes() { + var nc = 0; + for(i = 0;i<newnodes.length;i++){ + n = newnodes[i]; + if(n.placed){continue;} + if(sp = getCookie("node_"+n.ip)) { + xy = sp.split("x"); + debug_writeln("sp: "+sp+" xy[0]: "+xy[0]+" xy[1]: "+xy[1]); + n.x = parseFloat(xy[0]); + n.y = parseFloat(xy[1]); + } + else if(n.weight>1){ + // see if we find allredy placed nodes + ox=0,oy=0;dx=0,dy=0;c=0; + for(e in n.edges){ + if(nodes[e] && nodes[e].placed){ + if(!ox && !oy) { + ox = nodes[e].x; + oy = nodes[e].y; + } + else { + dx += nodes[e].x - ox; + dy += nodes[e].y - oy; + } + c++; + } + } + if(c>0) { + n.x = ox + dx/c + Math.random()*iel/2-iel/4; + n.y = oy + dy/c + Math.random()*iel/2-iel/4; + } + } + else { + // beginn somewhere + n.x = Math.random()*400; + n.y = Math.random()*400; + } + n.placed = true; + nc++; + } + newnodes.length=0; + return nc; +} + +/******** HNA CLASS ********/ +function hna(gw,net,mask) { + this.gw = gw; + this.net = net; + this.mask = mask; + return this; +} + +function touch_hna(node,net,mask) { + h = node.hna[net]; + if(!h) { + h = new hna(node.ip,net,mask); + node.hna[net] = h; + } + + h.lastseen = now_secs; + return h; +} + +/******** VIZ SETUP AND SETTINGS ********/ +function viz_setup(iframeid,maindivid,nodedivid,edgedivid) { + // assign a reference to the + // object to our global variable IFrameObj. + IFrameObj=document.getElementById(iframeid); + if (document.frames) { + // this is for IE5 Mac, because it will only + // allow access to the document object + // of the IFrame if we access it through + // the document.frames array + IFrameObj = document.frames[iframeid]; + } + + draginit(); + + maindiv=document.getElementById(maindivid); + nodediv=document.getElementById(nodedivid); + edgediv=document.getElementById(edgedivid); + + // autosave on exit? + if((autosave = getCookie("prefs_autosave"))) { + auto_save = parseInt(autosave); + } + viz_autosave(auto_save); + + // maximum metric of surrounding nodes + if(mmx = getCookie("prefs_maxmetric")) { + set_maxmetric(mmx,true,true); + } + + // scale of view + if((savescale = getCookie("prefs_scale")) && + (savescale = parseFloat(savescale))) { + set_scale(savescale,true); + } + + // scroll - FIXME + /* + if(val = getCookie("prefs_innerview")) { + iv = val.split("x"); + if (iv[0] && (iv[0] = parseInt(iv[0])) && + iv[1] && (iv[2] = parseInt(iv[2])) && + iv[3] && (iv[3] = parseInt(iv[3])) && + iv[4] && (iv[4] = parseInt(iv[4]))) + { + maindiv.scrollLeft = iv[0] + "px"; + maindiv.scrollHeight = iv[1] + "px"; + } + } + */ +} + +function viz_save() +{ + // let cookie survive a month + exp = new Date(); + exp.setTime(exp.getTime() + 2592000000); + // save node positions + for(ip in nodes) + { + if(nodes[ip].metric > maxmetric) { + continue; + } + setCookie("node_"+ip,nodes[ip].x+"x"+nodes[ip].y,exp); + } + + // save maxmetric + setCookie("prefs_maxmetric",maxmetric,exp); + + // save zooming + setCookie("prefs_scale",scale,exp); + + // save scroll - FIXME + setCookie("prefs_innerview", + parseInt(maindiv.scrollLeft)+"x"+parseInt(maindiv.scrollTop)+"x"+ + parseInt(vwidth*scale)+"x"+parseInt(vheight*scale),exp); +} + +function viz_autosave(autosave) +{ + auto_save = autosave; + if(auto_save) { + document.body.onunload=viz_save; + } + else { + deleteCookie("prefs_autosave"); + } +} + +function viz_reset() +{ + deleteAllCookies(); + for(ip in nodes) { + delete nodes[ip]; + } + for(e in edges) { + delete edges[e]; + } + viz_update(); +} + +var updateTimer = 0; +function viz_update() { + if (updateTimer) { + clearTimeout(updateTimer); + } + now_secs = new Date().getTime()/1000; + callToServer(cgi_url); +} + +function viz_callback() { + if (updateTimer) { + clearTimeout(updateTimer); + } + + if(place_new_nodes() > 0 && auto_declump) { + declump(); + } + refresh(); + updateTimer = setTimeout('viz_update()', 5000); +} + +var refresh_running = false; +function refresh() { + if(refresh_running) { + return; + } + refresh_running = true; + + var nh = ""; + + // refresh nodes + nh = ""; + for (var n in nodes) { + if(nodes[n].isDead()) { + nodes[n].cleanup(); + delete nodes[n]; + } + else { + nh += nodes[n].getHTML(); + } + } + nodediv.innerHTML = nh; + + // refresh edges + + nh = ""; + for (var e in edges) { + if(edges[e].isDead()) { + edges[e].cleanup(); + delete edges[e]; + } + else { + nh += edges[e].getHTML(); + } + } + edgediv.innerHTML = nh; + refresh_running = false; +} + +function set_showdesc(doit) +{ + showdesc = doit; + if(!noupdate) refresh(); +} + +function set_autodeclump(doit) +{ + auto_declump = doit; + if(doit) { + declump(); + } + else { + clearTimeout(dclTimer); + } +} + +function set_scale(inscale,noupdate) +{ + if(!inscale) { + inscale = parseFloat(document.getElementById("zoom").value/2); + } + scale = Math.round(inscale*100)/100; + if(!scale || scale<0.1) { + scale = 0.1; + } + document.getElementById("zoom").value = scale*2; + if(!noupdate) refresh(); +} + +function set_maxmetric(inmetric,noupdate,noconfirm) +{ + inmetric = parseInt(inmetric); + if(inmetric > 0 || !noconfirm || confirm("warning. setting the maximum metric to zero can lead to expensive calculations if you are connected to a network with many nodes. do you want to proceed?")) { + maxmetric = inmetric; + } + document.getElementById("maxmetric").value = maxmetric; + if(!noupdate) refresh(); +} + +// k = area / nodes +function fr(x) { + return Math.pow((iel*iel)/x,2); +} + +function fa(x) { + return Math.pow((x*x)/iel,2); +} + +var dclTimer = 0; +var declump_running = false; +function declump(t) { + // clear declump timer + if(dclTimer) { + clearTimeout(dclTimer); + } + if(declump_running) { + return; + } + declump_running = true; + + // nodes + nc = 0; + for (var ip1 in nodes) { + nodes[ip1].fr_x=0; + nodes[ip1].fr_y=0; + nodes[ip1].fa_x=0; + nodes[ip1].fa_y=0; + nodes[ip1].x_next = nodes[ip1].x; + nodes[ip1].y_next = nodes[ip1].y; + nodes[ip1].randdisplace = 0; + } + for (var ip1 in nodes) { + if(nodes[ip1].metric > maxmetric || nodes[ip1].pinned) { + continue; + } + for (ip2 in nodes) { + if (nodes[ip2].metric > maxmetric || ip1 == ip2) { + continue; + } + dx = (nodes[ip1].x_next - nodes[ip2].x_next); + dy = (nodes[ip1].y_next - nodes[ip2].y_next); + d = Math.sqrt(dx*dx+dy*dy); + d = Math.max(d-optsize,(d+optsize)/optsize); + + nodes[ip1].fr_x += (dx/d) * fr(d); + nodes[ip1].fr_y += (dy/d) * fr(d); + } + + dx = nodes[ip1].fr_x; + dy = nodes[ip1].fr_y; + d = Math.sqrt(dx*dx+dy*dy); + md = Math.min(d,iel/nodes[ip1].weight); + nodes[ip1].x_next += (dx / d) * md; + nodes[ip1].y_next += (dy / d) * md; + nc++; + } + + // edges + ec = 0; + for (var e in edges) { + if (!edges[e].n1 || !edges[e].n2 || + edges[e].n1.metric > maxmetric || edges[e].n2.metric > maxmetric) { + continue; + } + dx = (edges[e].n1.x_next - edges[e].n2.x_next); + dy = (edges[e].n1.y_next - edges[e].n2.y_next); + d = Math.sqrt(dx*dx+dy*dy); +// d = Math.max(d-optsize,(d+optsize)/optsize); + + edges[e].n1.fa_x -= (dx/d) * fa(d); + edges[e].n1.fa_y -= (dy/d) * fa(d); + edges[e].n2.fa_x += (dx/d) * fa(d); + edges[e].n2.fa_y += (dy/d) * fa(d); + ec++; + } + + // displacement + xmin=-20;ymin=-20;xmax=20;ymax=20;dsum=0; + for (var ip in nodes) { + if(nodes[ip].metric > maxmetric || nodes[ip].pinned) { + continue; + } + + dx = nodes[ip].fa_x; + dy = nodes[ip].fa_y; + d = Math.sqrt(dx*dx+dy*dy); + dx = (dx / d) * Math.min(d,iel/nodes[ip].weight) * 0.75 + nodes[ip].dx_last * 0.25; + dy = (dy / d) * Math.min(d,iel/nodes[ip].weight) * 0.75 + nodes[ip].dy_last * 0.25; + + nodes[ip].dx_last = dx; + nodes[ip].dy_last = dy; + nodes[ip].x_next += dx; + nodes[ip].y_next += dy; + + if(!nodes[ip].x_next || !nodes[ip].y_next) { + continue; + } + + dx = (nodes[ip].x - nodes[ip].x_next); + dy = (nodes[ip].y - nodes[ip].y_next); + dsum += Math.sqrt(dx*dx+dy*dy); + + nodes[ip].x = nodes[ip].x_next; + nodes[ip].y = nodes[ip].y_next; + + xmin = Math.min(xmin,nodes[ip].x); + xmax = Math.max(xmax,nodes[ip].x); + ymin = Math.min(ymin,nodes[ip].y); + ymax = Math.max(ymax,nodes[ip].y); + } + vwidth=(xmax-xmin); + vheight=(ymax-ymin); + + xoff=-xmin; + yoff=-ymin; + /* + document.getElementById('debug').innerHTML = "<br>" + + "offset: " + xoff + "x" + yoff + " dsum: " + dsum + "<br>" + + "nc: " + nc + " ec: " + ec + "xmax: " + xmax + " xmin: " + xmin + "<br>" + + "optsize: " + optsize + "<br>"; + */ + refresh(); + if(auto_declump) { + dclTimer = setTimeout("declump()", dsum>ncount ? dcl_timeout : dcllow_timeout ); + } + declump_running = false; +} + +//Das Objekt, das gerade bewegt wird. +var dragip = null; + +// Position, an der das Objekt angeklickt wurde. +var dragx = 0; +var dragy = 0; + +// Mausposition +var posx = 0; +var posy = 0; + +function draginit() { + // Initialisierung der ãberwachung der Events + + document.onmousemove = drag; + document.onmouseup = dragstop; +} + + +function dragstart(element) { + //Wird aufgerufen, wenn ein Objekt bewegt werden soll. + dragip = element.id.split("_")[1]; + dragx = posx - element.offsetLeft; + dragy = posy - element.offsetTop; + + n = nodes[dragip]; + if(n) { + n.pinned = true; + } +} + + +function dragstop() { + //Wird aufgerufen, wenn ein Objekt nicht mehr bewegt werden soll. + + n = nodes[dragip]; + if(n) { + n.pinned = false; + } + refresh(); + dragip=null; +} + + +function drag(ereignis) { + //Wird aufgerufen, wenn die Maus bewegt wird und bewegt bei Bedarf das Objekt. + + posx = document.all ? window.event.clientX : ereignis.pageX; + posy = document.all ? window.event.clientY : ereignis.pageY; + if(dragip != null) { + n = nodes[dragip]; + if(n) { + n.x = (posx - dragx)/scale - xoff; + n.y = (posy - dragy)/scale - yoff; + } + e = document.getElementById('node_'+dragip); + e.style.left = parseInt((n.x+xoff)*scale) + "px"; + e.style.top = parseInt((n.y+yoff)*scale) + "px"; + } +} + +function debug_writeln(line) +{ + document.getElementById('debug').innerHTML = line + "<br>" + document.getElementById('debug').innerHTML; +} + +/** + * Sets a Cookie with the given name and value. + * + * name Name of the cookie + * value Value of the cookie + * [expires] Expiration date of the cookie (default: end of current session) + * [path] Path where the cookie is valid (default: path of calling document) + * [domain] Domain where the cookie is valid + * (default: domain of calling document) + * [secure] Boolean value indicating if the cookie transmission requires a + * secure transmission + */ + +function setCookie(name, value, expires, path, domain, secure) { + document.cookie= name + "=" + escape(value) + + ((expires) ? "; expires=" + expires.toGMTString() : "") + + ((path) ? "; path=" + path : "") + + ((domain) ? "; domain=" + domain : "") + + ((secure) ? "; secure" : ""); +} + +/** + * Gets the value of the specified cookie. + * + * name Name of the desired cookie. + * + * Returns a string containing value of specified cookie, + * or null if cookie does not exist. + */ + +function getCookie(name) +{ + var results = document.cookie.match ( name + '=(.*?)(;|$)' ); + if (results) { + return unescape(results[1]); + } + return null; +} + +/** + * Deletes the specified cookie. + * + * name name of the cookie + * [path] path of the cookie (must be same as path used to create cookie) + * [domain] domain of the cookie (must be same as domain used to create cookie) + */ + +function deleteCookie(name, path, domain) { + if (getCookie(name)) { + document.cookie = name + "=" + + ((path) ? "; path=" + path : "") + + ((domain) ? "; domain=" + domain : "") + + "; expires=Thu, 01-Jan-70 00:00:01 GMT"; + } +} + +function deleteAllCookies() { + cookies = document.cookie.split("; "); + for(i=0;i<cookies.length;i++) { + deleteCookie(cookies[i].split("=")[0]); + } +} diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif Binary files differnew file mode 100644 index 000000000..c4244202f --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif Binary files differnew file mode 100644 index 000000000..3a2be32b4 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif Binary files differnew file mode 100644 index 000000000..b5dd48da7 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif Binary files differnew file mode 100644 index 000000000..36542c4d6 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif Binary files differnew file mode 100644 index 000000000..529b3d7e9 --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif Binary files differnew file mode 100644 index 000000000..4d8b7c94e --- /dev/null +++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif diff --git a/applications/luci-app-olsr-viz/luasrc/controller/olsr-viz.lua b/applications/luci-app-olsr-viz/luasrc/controller/olsr-viz.lua new file mode 100644 index 000000000..672486c53 --- /dev/null +++ b/applications/luci-app-olsr-viz/luasrc/controller/olsr-viz.lua @@ -0,0 +1,5 @@ +module "luci.controller.olsr-viz" + +function index() + entry({"admin", "status", "olsr", "olsr-viz"}, template("olsr-viz/olsr-viz"), _("OLSR-Viz"), 90) +end diff --git a/applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm b/applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm new file mode 100644 index 000000000..47bd88405 --- /dev/null +++ b/applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm @@ -0,0 +1,10 @@ +<%+header%> +<noscript> + <div class="warning"> + <%:You need to allow javascript in your browser to show this page.%> + </div> +</noscript> + +<iframe style="width:100%; height:640px; border:none" scrolling="no" src="/cgi-bin/olsr-viz.sh"></iframe> + +<%+footer%> |
