FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 17:12:32 +00:00
Code Issues Releases Wiki Activity

98_DOIF.pm: ring-SVG-functions improvements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23738 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-02-13 21:15:20 +00:00
parent 0eec0ef1ad
commit d5d3635f79
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/98_DOIF.pm
View File

@ -4625,7 +4625,7 @@ sub ring
my ($val,$min,$max,$minColor,$maxColor,$unit,$size,$func,$dec,$model,$lr,$ln,$icon) = @_; my ($val,$min,$max,$minColor,$maxColor,$unit,$size,$func,$dec,$model,$lr,$ln,$icon) = @_;
my $out; my $out;
my ($ic,$iscale,$ix,$iy); my ($ic,$iscale,$ix,$iy)=();
if (defined ($icon)) { if (defined ($icon)) {
($ic,$iscale,$ix,$iy,)=split(",",$icon); ($ic,$iscale,$ix,$iy,)=split(",",$icon);
@ -4640,6 +4640,7 @@ sub ring
$iy=9; $iy=9;
}; };
$iscale=1 if (!defined($iscale)); $iscale=1 if (!defined($iscale));
$ic="" if (!defined($ic));
} }
my ($format,$value); my ($format,$value);
@ -4685,8 +4686,9 @@ sub ring
$minColor=$currColor; $minColor=$currColor;
} }
} }
if (defined $icon and $icon ne "") {
$ic="$ic\@".color($currColor,$ln) if (defined($icon) and $icon !~ /@/); $ic="$ic\@".color($currColor,$ln) if ($icon !~ /@/);
}
$out.= sprintf('<svg xmlns="http://www.w3.org/2000/svg" viewBox="10 0 '.(defined($icon)?61:60).' '.(defined($icon)?57:55).'" style="width:%dpx; height:%dpx;">',$size/100*(defined($icon)?61:60),$size/100*(defined($icon)?57:55)); $out.= sprintf('<svg xmlns="http://www.w3.org/2000/svg" viewBox="10 0 '.(defined($icon)?61:60).' '.(defined($icon)?57:55).'" style="width:%dpx; height:%dpx;">',$size/100*(defined($icon)?61:60),$size/100*(defined($icon)?57:55));
$out.= '<defs>'; $out.= '<defs>';
@ -4698,8 +4700,8 @@ sub ring
<stop offset="1" style="stop-color:rgb(48,48,48); stop-opacity:0.8"/><linearGradient>'; <stop offset="1" style="stop-color:rgb(48,48,48); stop-opacity:0.8"/><linearGradient>';
$out.='</defs>'; $out.='</defs>';
$out.='<circle cx="40" cy="30" r="'.(defined($icon)?26.5:24).'" fill="url(#gradbackring)" />'; $out.='<circle cx="40" cy="30" r="'.(defined($icon)?26.5:25).'" fill="url(#gradbackring)" />';
$out.=sprintf('<g stroke="url(#gradtemp_ring2)" fill="none" stroke-width="'.(defined($icon)?2:5).'">'); $out.=sprintf('<g stroke="url(#gradtemp_ring2)" fill="none" stroke-width="'.(defined($icon)?2:4).'">');
$out.=describeArc(40, 30, (defined($icon)?27.5:26.5), 0, 280); $out.=describeArc(40, 30, (defined($icon)?27.5:26.5), 0, 280);
$out.='</g>'; $out.='</g>';
##$out.=sprintf('<g stroke="rgb(128,128,128)" fill="none" stroke-width="0.5">'); ##$out.=sprintf('<g stroke="rgb(128,128,128)" fill="none" stroke-width="0.5">');
@ -4717,10 +4719,10 @@ sub ring
#$out.=sprintf('<g stroke="%s" fill="none" stroke-width="6">',color ($maxColor)); #$out.=sprintf('<g stroke="%s" fill="none" stroke-width="6">',color ($maxColor));
#$out.=describeArc(40, 30, 26, 270, 280); #$out.=describeArc(40, 30, 26, 270, 280);
#$out.='</g>'; #$out.='</g>';
$out.=sprintf('<g stroke="url(#gradtemp_ring1_%d_%d_%d)" fill="none" stroke-width="'.(defined($icon)?2:5).'">',$currColor,$minColor,(defined $lr ? $lr:-1)); $out.=sprintf('<g stroke="url(#gradtemp_ring1_%d_%d_%d)" fill="none" stroke-width="'.(defined($icon)?2:4).'">',$currColor,$minColor,(defined $lr ? $lr:-1));
$out.=describeArc(40, 30, (defined($icon)?27.5:26.5), 0, int($prop*280)); $out.=describeArc(40, 30, (defined($icon)?27.5:26.5), 0, int($prop*280));
$out.='</g>'; $out.='</g>';
if (defined $icon and $icon ne "") { if (defined $icon and $icon ne "" and $icon ne " ") {
$out.='<symbol id="Image_'.$ic.'" x="'.$ix.'" y="'.$iy.'" viewBox="0 0 '.int(640/$iscale).' '.int(640/$iscale).'">'; $out.='<symbol id="Image_'.$ic.'" x="'.$ix.'" y="'.$iy.'" viewBox="0 0 '.int(640/$iscale).' '.int(640/$iscale).'">';
$out.= ::FW_makeImage($ic); $out.= ::FW_makeImage($ic);
$out.='</symbol>'; $out.='</symbol>';
@ -4728,8 +4730,8 @@ sub ring
$out.='<use href="#Image_'.$ic.'" height="22" width="22" />';#height="18" width="18" $out.='<use href="#Image_'.$ic.'" height="22" width="22" />';#height="18" width="18"
##$out.='</g>'; ##$out.='</g>';
} }
$out.= sprintf('<text text-anchor="middle" x="40" y="%s" style="fill:%s;font-size:%spx;font-weight:bold;">%s</text>',(defined ($icon) ? 43:34),color($currColor,$ln),(defined ($icon) ? 14:18),sprintf($format,$val)); $out.= sprintf('<text text-anchor="middle" x="40" y="%s" style="fill:%s;font-size:%spx;font-weight:bold;">%s</text>',((defined ($icon) and $icon ne "") ? 43:34),color($currColor,$ln),(defined ($icon) ? 14:18),sprintf($format,$val));
$out.= sprintf('<text text-anchor="middle" x="40" y="%s" style="fill:%s;font-size:10px;">%s</text>',(defined ($icon) ? 53:47),color($currColor,$ln),$unit) if (defined $unit); $out.= sprintf('<text text-anchor="middle" x="40" y="%s" style="fill:%s;font-size:10px;">%s</text>',((defined ($icon) and $icon ne "") ? 53:47),color($currColor,$ln),$unit) if (defined $unit);
$out.= '</svg>'; $out.= '</svg>';
return ($out); return ($out);
} }