From 3d7c7754993dcb8749e7b9a10287e737cc22b962 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sun, 23 Dec 2018 10:15:22 +0000 Subject: [PATCH] 10_MQTT2_DEVICE.pm: some graphviz changes (Forum #91394) git-svn-id: https://svn.fhem.de/fhem/trunk@18033 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_MQTT2_DEVICE.pm | 8 +++++--- fhem/www/pgm2/zwave_neighborlist.js | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm index 5ea1dda84..e4b76cd0f 100644 --- a/fhem/FHEM/10_MQTT2_DEVICE.pm +++ b/fhem/FHEM/10_MQTT2_DEVICE.pm @@ -530,6 +530,7 @@ MQTT2_DEVICE_nlData($) } } + my $div = ($FW_userAgent =~ m/WebKit/ ? "
" : " "); my $gv = ReadingsVal($d, ".graphviz", ReadingsVal($d, "graphviz", "")); for my $l (split(/[\r\n]/, $gv)) { @@ -555,8 +556,8 @@ MQTT2_DEVICE_nlData($) $h{$n}{class}="zwBox"; } - $v =~ s/[{}]//; - $v =~ s/\|/
/g; + $v =~ s/[{}]//g; + $v =~ s/\|/$div/g; $h{$n}{txt} = $nv; $h{$n}{title} = $v; @@ -564,8 +565,9 @@ MQTT2_DEVICE_nlData($) my @a; $h{$n}{neighbors} = \@a; - } elsif($l =~ m/^\s*"([^"]+)"\s*->\s*"([^"]+)"/) { + } elsif($l =~ m/^\s*"([^"]+)"\s*->\s*"([^"]+)"\s\[label="([^"]*)"/) { push @{$h{$1}{neighbors}}, $2; + $h{$1}{title} .= "${div}lqi:$3"; } } diff --git a/fhem/www/pgm2/zwave_neighborlist.js b/fhem/www/pgm2/zwave_neighborlist.js index e6d17b427..e689a6350 100644 --- a/fhem/www/pgm2/zwave_neighborlist.js +++ b/fhem/www/pgm2/zwave_neighborlist.js @@ -147,6 +147,9 @@ zw_draw(fnRet, width, height) } zw_adjustLines(h, o.name); }); + $("svg.zw_nr g text").click(function(){ + location.href = FW_root+"?detail="+$(this).text(); + }); } function