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

maxnoderadius is now based on dynamic size calc

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-30 22:42:09 +00:00
parent 0af415e391
commit f3ba260142
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -93,6 +93,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
grep { defined } @{ $devgrp }; grep { defined } @{ $devgrp };
my %ok_dev = (); my %ok_dev = ();
my %logvals = ();
my %metadata = (); my %metadata = ();
my %data = ( nodes => [], links => [] ); my %data = ( nodes => [], links => [] );
my $domain = quotemeta( setting('domain_suffix') || '' ); my $domain = quotemeta( setting('domain_suffix') || '' );
@@ -152,7 +153,9 @@ ajax '/ajax/data/device/netmap' => require_login sub {
first { check_acl_only($device, setting('host_groups')->{$_}) } @hgrplist; first { check_acl_only($device, setting('host_groups')->{$_}) } @hgrplist;
next DEVICE if $mapshow eq 'only' and not $first_hgrp; next DEVICE if $mapshow eq 'only' and not $first_hgrp;
++$logvals{ $device->get_column('log') || 1 };
(my $name = lc($device->dns || $device->name || $device->ip)) =~ s/$domain$//; (my $name = lc($device->dns || $device->name || $device->ip)) =~ s/$domain$//;
my $node = { my $node = {
ID => $device->ip, ID => $device->ip,
SIZEVALUE => (param('dynamicsize') ? SIZEVALUE => (param('dynamicsize') ?
@@ -178,6 +181,9 @@ ajax '/ajax/data/device/netmap' => require_login sub {
if $qdev and $qdev->in_storage and $device->ip eq $qdev->ip; if $qdev and $qdev->in_storage and $device->ip eq $qdev->ip;
} }
# to help get a sensible range of node sizes
$metadata{'numsizes'} = scalar keys %logvals;
content_type('application/json'); content_type('application/json');
to_json({ data => \%data, %metadata }); to_json({ data => \%data, %metadata });
}; };

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

@@ -30,7 +30,7 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]?[% my_query %]', function(m
.nodeEventToOpenLink('dblclick') .nodeEventToOpenLink('dblclick')
.nodeLinkTarget('none') .nodeLinkTarget('none')
.minNodeRadius(4) .minNodeRadius(4)
.maxNodeRadius(12) .maxNodeRadius(4 + (mapdata['numsizes'] || 0))
.minZoomFactor(0.1) .minZoomFactor(0.1)
.maxZoomFactor(10) .maxZoomFactor(10)
.labelDistance(2) .labelDistance(2)