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

contrib/InfoPanel: updated

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7872 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-02-04 19:50:40 +00:00
parent 759b70dbca
commit 99b584bf0d
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fhem/contrib/InfoPanel/55_InfoPanel.pm
View File

@ -330,7 +330,8 @@ sub btIP_itemImg {
# $url = "$FW_ME/SVG_showLog?dev=". $plotName[0].
# "&logdev=". InternalVal($plotName[0], "LOGDEVICE", "").
# "&gplotfile=". InternalVal($plotName[0], "GPLOTFILE", "").
# "&logfile=". InternalVal($plotName[0], "LOGFILE", "CURRENT");
# "&logfile=". InternalVal($plotName[0], "LOGFILE", "CURRENT").
# "&plotsize=". "$newWidth,$newHeight";
# $url .= "&pos=". ($plotName[1]) ? $plotName[1] : 'day';
# $url .= "&zoom=". ($plotName[2]) ? $plotName[2] : undef;
#
@ -384,32 +385,44 @@ sub btIP_itemPlot {
}
}
# my ($hasPlotsize) = split(",", AttrVal($plotName[0],"plotsize",0));
($width,$height) = split(",", AttrVal($plotName[0],"plotsize","800,160"));
($newWidth,$newHeight) = _btIP_imgRescale($width,$height,$scale);
# $attr{$plotName[0]}{plotsize} = "$newWidth,$newHeight";
$FW_RET = undef;
$FW_webArgs{dev} = $plotName[0];
$FW_webArgs{logdev} = InternalVal($plotName[0], "LOGDEVICE", "");
$FW_webArgs{gplotfile} = InternalVal($plotName[0], "GPLOTFILE", "");
$FW_webArgs{logfile} = InternalVal($plotName[0], "LOGFILE", "CURRENT");
$FW_pos{zoom} = ($plotName[1]) ? $plotName[1] : 'day';
$FW_pos{off} = ($plotName[2]) ? $plotName[2] : undef;
$FW_plotsize = "$newWidth,$newHeight";
if($inline == 1) {
($mimetype, $svgdata) = SVG_showLog("unused");
# $attr{$plotName[0]}{plotsize} = undef;
# $attr{$plotName[0]}{plotsize} = "$width,$height" if $hasPlotsize;
$FW_RET = undef;
$FW_webArgs{dev} = $plotName[0];
$FW_webArgs{logdev} = InternalVal($plotName[0], "LOGDEVICE", "");
$FW_webArgs{gplotfile} = InternalVal($plotName[0], "GPLOTFILE", "");
$FW_webArgs{logfile} = InternalVal($plotName[0], "LOGFILE", "CURRENT");
# $FW_pos{zoom} = ($plotName[1]) ? $plotName[1] : 'day';
# $FW_pos{off} = ($plotName[2]) ? $plotName[2] : undef;
$FW_plotsize = "$newWidth,$newHeight";
$svgdata =~ s/<\/svg>/<polyline opacity="0" points="0,0 $width,$height"\/><\/svg>/;
(undef,undef,undef,$svgdata) = _btIP_imgData($svgdata,1);
($mimetype, $svgdata) = SVG_showLog("unused");
$output = "<!-- w: $width h: $height nw: $newWidth nh: $newHeight t: $mimetype -->\n";
$output .= "<image id=\"$id\" x=\"$x\" y=\"$y\" width=\"${newWidth}px\" height=\"${newHeight}px\" \n";
$output .= "xlink:href=\"$svgdata\" />\n";
$svgdata =~ s/<\/svg>/<polyline opacity="0" points="0,0 $newWidth,$newHeight"\/><\/svg>/;
(undef,undef,undef,$svgdata) = _btIP_imgData($svgdata,1);
$output = "<!-- w: $width h: $height nw: $newWidth nh: $newHeight t: $mimetype -->\n";
$output .= "<image id=\"$id\" x=\"$x\" y=\"$y\" width=\"${newWidth}px\" height=\"${newHeight}px\" \n";
$output .= "xlink:href=\"$svgdata\" />\n";
} else {
# embed link to plot
#
my $url;
$url = "$FW_ME/SVG_showLog?dev=". $plotName[0].
"&amp;logdev=". InternalVal($plotName[0], "LOGDEVICE", "").
"&amp;gplotfile=". InternalVal($plotName[0], "GPLOTFILE", "").
"&amp;logfile=". InternalVal($plotName[0], "LOGFILE", "CURRENT").
"&amp;plotsize=". "$newWidth,$newHeight";
# $url .= "&amp;pos=". ($plotName[1]) ? $plotName[1] : 'day';
# $url .= "&amp;zoom=". ($plotName[2]) ? $plotName[2] : undef;
$output = "<image id=\"$id\" x=\"$x\" y=\"$y\" width=\"${newWidth}px\" height=\"${newHeight}px\" \nxlink:href=\"$url\" />\n";
}
return $output;
}
sub btIP_itemRect {