FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 04:36:36 +00:00
Code Issues Releases Wiki Activity

FHMWEB_JS_UMBAU: fixing longpollSVG

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7514 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-11 09:43:59 +00:00
parent d1bdf69a13
commit bd08150bd9
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_SVG.pm
View File

@ -1239,9 +1239,13 @@ SVG_render($$$$$$$$$;$$)
my $w = $ow-$nr_left_axis*$axis_width-$nr_right_axis*$axis_width;
my $h = $oh-2*$y; # Rect size
my $filter = $srcDesc->{all};
$filter =~ s/[^: ]*:([^: ]):[^ ]*/$1/g;
$filter = AttrVal($parent_name, "longpollSVG", 0) ? "flog=\" $filter \"" : "";
my $filter = $srcDesc->{all}." ";
$filter =~ s/ [^: ]*:/ /g;
$filter =~ s/:[^ ]* / /g;
$filter =~ s/(^ | $)//g;
$filter =~ s/ /|/g;
$filter =~ s/"/./g;
$filter = AttrVal($parent_name, "longpollSVG", 0) ? "flog=\"$filter\"" : "";
my %dataIdx; # Build a reverse Index for the dataSource
@ -1250,7 +1254,7 @@ SVG_render($$$$$$$$$;$$)
# SVG Header
my $svghdr = 'version="1.1" xmlns="http://www.w3.org/2000/svg" '.
'xmlns:xlink="http://www.w3.org/1999/xlink" '.
'id="SVGPLOT_'.(++$SVG_id).'"'.$filter;
'id="SVGPLOT_'.(++$SVG_id).'" '.$filter;
if(!$styleW) {
SVG_pO '<?xml version="1.0" encoding="UTF-8"?>';
SVG_pO '<!DOCTYPE svg>';

2
fhem/www/pgm2/fhemweb.js
View File

@ -334,7 +334,7 @@ FW_doUpdate()
FW_widgets[w].updateLine(d);
if(d[0].indexOf("-") == -1) // Wont contain -
devs.push(d[0]);
devs.push(d);
}
for(var w in FW_widgets)

6
fhem/www/pgm2/svg.js
View File

@ -268,8 +268,12 @@ FW_svgUpdateDevs(devs)
if(!svg || !svg.firstChild || !svg.firstChild.nextSibling)
continue;
var flog = svg.firstChild.nextSibling.getAttribute("flog");
if(!flog)
continue;
log("longpollSVG filter:"+flog);
for(var j=0; j < devs.length; j++) {
if(flog !== null && flog.match(" "+devs[j]+" ")) {
var ev = devs[0]+":"+devs[1];
if(ev.match(flog)) {
var e = embArr[i];
var newE = document.createElement("embed");
for(var k=0; k<e.attributes.length; k++)