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

98_DOIF.pm: svg function uring: improvements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24067 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-03-23 18:24:34 +00:00
parent b4a92795b8
commit 2b09c88ad7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_DOIF.pm
View File

@ -4824,7 +4824,7 @@ sub ring
$out.= sprintf('<linearGradient id="grad_ring1_%d_%d_%d" x1="%d%%" y1="%d%%" x2="%d%%" y2="%d%%"><stop offset="0" style="stop-color:%s; stop-opacity:1"/>\ $out.= sprintf('<linearGradient id="grad_ring1_%d_%d_%d" x1="%d%%" y1="%d%%" x2="%d%%" y2="%d%%"><stop offset="0" style="stop-color:%s; stop-opacity:1"/>\
<stop offset="1" style="stop-color:%s;stop-opacity:0.5"/></linearGradient>',$currColor,$minColor,(defined $lr ? $lr:0),$x1,$y1,$x2,$y2,color($currColor,$lr),color($minColor,$lr)); <stop offset="1" style="stop-color:%s;stop-opacity:0.5"/></linearGradient>',$currColor,$minColor,(defined $lr ? $lr:0),$x1,$y1,$x2,$y2,color($currColor,$lr),color($minColor,$lr));
} }
if (defined $innerRing and $innerRing==1 and ref($func) ne "ARRAY") { if (defined $innerRing and $innerRing and ref($func) ne "ARRAY") {
$out.= sprintf('<linearGradient id="grad_ring_max_%d_%d_%d" x1="%d%%" y1="%d%%" x2="%d%%" y2="%d%%"><stop offset="0" style="stop-color:%s; stop-opacity:1"/>\ $out.= sprintf('<linearGradient id="grad_ring_max_%d_%d_%d" x1="%d%%" y1="%d%%" x2="%d%%" y2="%d%%"><stop offset="0" style="stop-color:%s; stop-opacity:1"/>\
<stop offset="1" style="stop-color:%s;stop-opacity:1"/></linearGradient>',$minCol,$maxColor,(defined $lr ? $lr:0),100,0,0,0,color($maxColor,$lr),color($minCol,$lr)); <stop offset="1" style="stop-color:%s;stop-opacity:1"/></linearGradient>',$minCol,$maxColor,(defined $lr ? $lr:0),100,0,0,0,color($maxColor,$lr),color($minCol,$lr));
} }
@ -4844,7 +4844,7 @@ sub ring
} }
$out.='</g>'; $out.='</g>';
if (defined $innerRing and $innerRing==1) { if (defined $innerRing and $innerRing) {
if (ref($func) eq "ARRAY"){ if (ref($func) eq "ARRAY"){
my $from=0; my $from=0;
my $diff=$max-$min; my $diff=$max-$min;
@ -4852,14 +4852,14 @@ sub ring
my $curr=${$func}[$i]; my $curr=${$func}[$i];
my $color=${$func}[$i+1]; my $color=${$func}[$i+1];
my $to=int(($curr-$min)/$diff*280); my $to=int(($curr-$min)/$diff*280);
$out.='<g stroke="'.color($color,$lr).'" fill="none" stroke-width="1" opacity="0.9">'; $out.=sprintf('<g %s stroke="%s" fill="none" stroke-width="1" opacity="0.8">',($innerRing eq "1" ? "":$innerRing),color($color,$lr));
$out.=describeArc(41, 30, 25.5, $from, $to); $out.=describeArc(41, 30, 25.5, $from, $to);
$out.='</g>'; $out.='</g>';
$from=$to+2; $from=$to+2;
} }
} else { } else {
$out.='</g>'; $out.='</g>';
$out.=sprintf('<g stroke="url(#grad_ring_max_%d_%d_%d)" fill="none" stroke-width="1" opacity="0.9">',$minCol,$maxColor,(defined $lr ? $lr:0)); $out.=sprintf('<g %s stroke="url(#grad_ring_max_%d_%d_%d)" fill="none" stroke-width="1" opacity="0.8">',($innerRing eq "1" ? "":$innerRing),$minCol,$maxColor,(defined $lr ? $lr:0));
$out.=describeArc(41, 30, 25.5, 0, 280); $out.=describeArc(41, 30, 25.5, 0, 280);
$out.='</g>'; $out.='</g>';
} }
@ -4889,8 +4889,8 @@ sub ring
($icflag ? 53:47),color($currColor,$ln),($icflag ? 9:12),$unitformat,$unit) if (defined $unit); ($icflag ? 53:47),color($currColor,$ln),($icflag ? 9:12),$unitformat,$unit) if (defined $unit);
if (defined $minMax and $minMax) { if (defined $minMax and $minMax) {
$out.= sprintf('<text text-anchor="middle" x="23" y="58" style="fill:%s;font-size:5.5px;%s">%s</text>',color($minCol,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$min)); $out.= sprintf('<text text-anchor="middle" x="23" y="58" style="fill:%s;font-size:6px;%s">%s</text>',color($minCol,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$min));
$out.= sprintf('<text text-anchor="middle" x="59" y="58" style="fill:%s;font-size:5.5px;%s">%s</text>',color($maxColor,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$max)); $out.= sprintf('<text text-anchor="middle" x="59" y="58" style="fill:%s;font-size:6px;%s">%s</text>',color($maxColor,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$max));
} }
$out.= '</svg>'; $out.= '</svg>';