2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 14:04:15 +00:00

contrib/InfoPanel: updated

git-svn-id: https://svn.fhem.de/fhem/trunk@7766 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-01-29 19:59:02 +00:00
parent ab9f8731e3
commit da7a6dc9db

View File

@ -45,6 +45,7 @@ sub btIP_itemButton;
sub btIP_itemCircle; sub btIP_itemCircle;
sub btIP_itemDate; sub btIP_itemDate;
sub btIP_itemEllipse; sub btIP_itemEllipse;
sub btIP_itemGroup;
sub btIP_itemImg; sub btIP_itemImg;
sub _btIP_imgData; sub _btIP_imgData;
sub _btIP_imgRescale; sub _btIP_imgRescale;
@ -249,11 +250,10 @@ sub btIP_itemEllipse {
} }
sub btIP_itemGroup { sub btIP_itemGroup {
my($id,$type,$arg) = @_; my($id,$type,$x,$y) = @_;
return "</g>\n" if $type eq 'close'; return "</g>\n" if $type eq 'close';
$arg = defined($arg) ? $arg : "";
$id = ($id eq '-') ? createUniqueId() : $id; $id = ($id eq '-') ? createUniqueId() : $id;
return "<g id=\"$id\" $arg >" if $type eq 'open'; return "<g id=\"$id\" transform=\"translate($x,$y)\" >" if $type eq 'open';
} }
sub btIP_itemImg { sub btIP_itemImg {
@ -715,9 +715,11 @@ sub btIP_evalLayout($$@) {
} }
when("group") { when("group") {
($id,$text,$arg) = split("[ \t]+", $def, 3); ($id,$text,$x,$y) = split("[ \t]+", $def, 4);
my $arg = AnalyzePerlCommand(undef, $arg) if($arg); ($x,$y)= btIP_xy($x,$y,%params);
$svg .= btIP_itemGroup($id,$text,$arg); $params{xx} = $x;
$params{yy} = $y;
$svg .= btIP_itemGroup($id,$text,$x,$y);
} }
when("img") { when("img") {