135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement show link speeds on links

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-30 08:58:04 +00:00
parent 72961f172d
commit 93f8181fc8
6 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
share/views/ajax/device/netmap.tt
View File

@@ -153,9 +153,25 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]?[% my_query %]', function(m
graph.inspect().main.force.on('end.setupfornetdisco', null);
});
graph.inspect().main.force.on('tick.movelinklabel', function() {
graph.inspect().dom.svg.selectAll('text.nd_netmap-linklabel')
.attr('x', function(d) {
var text = d3.select(this);
var sx = graph.nodeDataById(text.attr('data-source')).x;
var tx = graph.nodeDataById(text.attr('data-target')).x;
return ((sx + tx) / 2);
})
.attr('y', function(d) {
var text = d3.select(this);
var sy = graph.nodeDataById(text.attr('data-source')).y;
var ty = graph.nodeDataById(text.attr('data-target')).y;
return ((sy + ty) / 2);
});
});
graph.inspect().dom.svg
.append("svg:text")
.attr("id", "nd2_fullscreen_netmap")
.attr("id", "nd2_fullscreen-netmap")
.attr("class", "link")
.attr("x", (graph.width() - 17))
.attr("y", 17)
@@ -183,6 +199,21 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]?[% my_query %]', function(m
graph.start(netmapdata);
d3.select("#nd2_netmap-spinner").call(spin);
graph.inspect().main.links.each(function(l) {
var link = d3.select(this);
var data = link.datum();
graph.inspect().dom.svg.select('g.graph')
.append('svg:text')
.attr('class', 'nd_netmap-linklabel')
.attr('x', function(d) { return data.source.x; })
.attr('y', function(d) { return data.source.y; })
.attr('data-source', function(d) { return data.source.ID; })
.attr('data-target', function(d) { return data.target.ID; })
.attr('text-anchor', 'middle')
[% ".attr('fill', 'black')" IF params.showspeed %]
.text(function(d) { return data.SPEED; });
});
if ('[% params.mapshow %]' == 'neighbors') {
setTimeout(function() {
if ('[% params.dynamicsize %]' == 'on') {
@@ -191,7 +222,7 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]?[% my_query %]', function(m
var node = graph.nodeDataById( graph['nd2']['centernode'] );
graph.zoomSmooth(node.x, node.y, node.radius * 100);
}
}, 1000);
}, 1500);
}
});

5
share/views/js/device.js
View File

@@ -123,6 +123,11 @@
graph.wrapLabels(false).start();
}
});
$('#nd_showspeed').change(function() {
$('.nd_netmap-linklabel').css('fill',
($(this).prop('checked') ? 'black' : 'none')
);
});
// netmap pin/release controls
$('#nd_netmap-releaseall').on('click', function(event) {

2
share/views/sidebar/device/netmap.tt
View File

@@ -12,6 +12,7 @@
<div class="checkbox pull-left">
<label>
<input type="checkbox" name="showips" id="nd_showips"
[% 'checked="checked"' IF vars.sidebar_defaults.device_netmap.showips %]
data-toggle="toggle" data-size="small" data-width="30"
data-on="Show" data-off=" " data-onstyle="success">
<span onclick="$('#nd_showips').bootstrapToggle('toggle')">&nbsp;Management IPs</span>
@@ -20,6 +21,7 @@
<div class="checkbox pull-left">
<label>
<input type="checkbox" name="showspeed" id="nd_showspeed"
[% 'checked="checked"' IF vars.sidebar_defaults.device_netmap.showspeed %]
data-toggle="toggle" data-size="small" data-width="30"
data-on="Show" data-off=" " data-onstyle="success">
<span onclick="$('#nd_showspeed').bootstrapToggle('toggle')">&nbsp;Link Speed</span>