Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

55_InfoPanel.pm: updated

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7924 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-02-09 14:56:56 +00:00
parent fad9463767
commit 28a16b39e1
1 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fhem/FHEM/55_InfoPanel.pm
View File

@ -5,7 +5,7 @@
# forked from 02_RSS.pm by Dr. Boris Neubert # forked from 02_RSS.pm by Dr. Boris Neubert
# #
############################################## ##############################################
# $Id: 55_InfoPanel.pm 7921 2015-02-08 20:34:48Z betateilchen $ # $Id$
package main; package main;
use strict; use strict;
@ -478,17 +478,17 @@ sub btIP_itemText {
$id = ($id eq '-') ? createUniqueId() : $id; $id = ($id eq '-') ? createUniqueId() : $id;
my ($r,$g,$b,$a) = btIP_color($params{rgb}); my ($r,$g,$b,$a) = btIP_color($params{rgb});
my $output = "<text id=\”$id\” x=\"$x\" y=\"$y\" ". my $output = "<text id=\”$id\” x=\"$x\" y=\"$y\" ".
"fill=\"rgb($r,$g,$b)\" fill-opacity=\"$a\" ". "fill=\"rgb($r,$g,$b)\" fill-opacity=\"$a\" ".
"font-family=\"$params{font}\" ". "font-family=\"$params{font}\" ".
"font-style=\"$params{fontstyle}\" ". "font-style=\"$params{fontstyle}\" ".
"font-size=\"$params{pt}px\" ". "font-size=\"$params{pt}px\" ".
"font-weight=\"$params{fontweight}\" ". "font-weight=\"$params{fontweight}\" ".
"text-anchor=\"$params{thalign}\" ". "text-anchor=\"$params{thalign}\" ".
"text-decoration=\"$params{textdecoration}\" ". "text-decoration=\"$params{textdecoration}\" ".
"alignment-baseline=\"$params{tvalign}\" ". "alignment-baseline=\"$params{tvalign}\" >\n".
">\n$text\n</text>\n"; "$text\n".
"</text>\n";
return $output; return $output;
} }
@ -532,6 +532,37 @@ sub btIP_itemTextBox {
return $output; return $output;
} }
sub btIP_itemTicker {
# btIP_itemTicker($id,$x,$y,$width,$speed,$text,%params);
my ($id,$x,$y,$width,$speed,$text,%params)= @_;
return unless(defined($text));
$id = ($id eq '-') ? createUniqueId() : $id;
$speed = ($speed) ? $speed : AttrVal($params{name},'refresh',60);
my $end = $x+$width;
my ($r,$g,$b,$a) = btIP_color($params{rgb});
my $output = "<defs><path id=\"tickerPath\" d=\"M$x,$y L$end,$y\" /></defs>\n";
$output .= "<text id=\”$id\” x=\"$x\" y=\"$y\" ".
"fill=\"rgb($r,$g,$b)\" fill-opacity=\"$a\" ".
"font-family=\"$params{font}\" ".
"font-style=\"$params{fontstyle}\" ".
"font-size=\"$params{pt}px\" ".
"font-weight=\"$params{fontweight}\" ".
"text-anchor=\"$params{thalign}\" ".
"text-decoration=\"$params{textdecoration}\" ".
"alignment-baseline=\"$params{tvalign}\" >\n".
# "$text\n".
# "</text>\n".
"<textPath xlink:href=\"#tickerPath\">\n$text\n".
"<animate attributeName=\"startOffset\" values=\"$end;$x\" dur=\"${speed}s\" repeatCount=\"indefinite\" />".
"</textPath>".
"</text>";
# my $animate = "<animate id=\"${id}_anim\" attributeName=\"x\" from=\"$end\" to=\"$x\" dur=\"${speed}s\" repeatCount=\"indefinite\" />";
# return btIP_itemText("${id}_text",$x,$y,"$text\n$animate",%params);
return $output;
}
sub btIP_itemTime { sub btIP_itemTime {
my ($id,$x,$y,%params)= @_; my ($id,$x,$y,%params)= @_;
$id = ($id eq '-') ? createUniqueId() : $id; $id = ($id eq '-') ? createUniqueId() : $id;
@ -999,6 +1030,15 @@ sub btIP_evalLayout($$@) {
} }
} }
when("ticker") {
($id,$x,$y,$width,$arg,$text)= split("[ \t]+", $def, 6);
($x,$y)= btIP_xy($x,$y,%params);
$params{xx} = $x;
$params{yy} = $y;
$text= AnalyzePerlCommand(undef, $text);
$svg .= btIP_itemTicker($id,$x,$y,$width,$arg,$text,%params);
}
when("time") { when("time") {
($id,$x,$y)= split("[ \t]+", $def, 3); ($id,$x,$y)= split("[ \t]+", $def, 3);
($x,$y)= btIP_xy($x,$y,%params); ($x,$y)= btIP_xy($x,$y,%params);