mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-04 11:26:55 +00:00
98_DOIF.pm: card without ring
git-svn-id: https://svn.fhem.de/fhem/trunk@26158 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
e3ded3017e
commit
ac3c5f70f5
@ -4848,7 +4848,7 @@ sub card
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
my $chart_dim = $hring eq "1" ? $bwidth-36: $bwidth-90 ;
|
my $chart_dim = $hring eq "" ? $bwidth-90: $bwidth-36 ;
|
||||||
|
|
||||||
$chart_dim -= defined $collect2 ? ($hring eq "1" ? 13 : 15):0;
|
$chart_dim -= defined $collect2 ? ($hring eq "1" ? 13 : 15):0;
|
||||||
|
|
||||||
@ -4934,8 +4934,8 @@ sub card
|
|||||||
|
|
||||||
|
|
||||||
$out.='<polyline points="11,23 '.($bwidth+9).',23" style="stroke:gray; stroke-width:0.7" />' if (defined $header or $hring);
|
$out.='<polyline points="11,23 '.($bwidth+9).',23" style="stroke:gray; stroke-width:0.7" />' if (defined $header or $hring);
|
||||||
if (defined $header or $hring) {
|
if (defined $header or $hring ne "") {
|
||||||
$out.= sprintf('<text text-anchor="start" x="%s" y="19" style="fill:#CCCCCC; font-size:12.5px;%s">%s</text>',$hring eq "1" ? 34:14,$header_style,$header_txt) if (defined $header);
|
$out.= sprintf('<text text-anchor="start" x="%s" y="19" style="fill:#CCCCCC; font-size:12.5px;%s">%s</text>',($hring eq "1" and defined $ic) ? 34:14,$header_style,$header_txt) if (defined $header);
|
||||||
if (defined $icon and $icon ne "" and $icon ne " ") {
|
if (defined $icon and $icon ne "" and $icon ne " ") {
|
||||||
my $svg_icon=::FW_makeImage($ic);
|
my $svg_icon=::FW_makeImage($ic);
|
||||||
if(!($svg_icon =~ s/\sheight="[^"]*"/ height="18"/)) {
|
if(!($svg_icon =~ s/\sheight="[^"]*"/ height="18"/)) {
|
||||||
@ -5075,7 +5075,7 @@ sub card
|
|||||||
$out.= '</g>';
|
$out.= '</g>';
|
||||||
$out.= '</svg>';
|
$out.= '</svg>';
|
||||||
|
|
||||||
if (!$hring) {
|
if ($hring eq "") {
|
||||||
$out.=sprintf('<g transform="translate(%s,6)">',$bwidth-49);
|
$out.=sprintf('<g transform="translate(%s,6)">',$bwidth-49);
|
||||||
if (!defined $collect2) {
|
if (!defined $collect2) {
|
||||||
if (ref($col) eq "ARRAY" and scalar (@{$col}) >= 2 ) {
|
if (ref($col) eq "ARRAY" and scalar (@{$col}) >= 2 ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user