FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-24 15:19:21 +00:00
Code Issues Releases Wiki Activity

98_DOIF.pm: min/max value limitation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24095 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-03-26 21:58:04 +00:00
parent 9f2dd9bff5
commit bd29ff9320
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/FHEM/98_DOIF.pm
View File

@ -4365,8 +4365,8 @@ sub bar
$maxColor=0 if (!defined $maxColor); $maxColor=0 if (!defined $maxColor);
} }
$minCol=$minColor; $minCol=$minColor;
$max=$value if($value>$max); $value=$max if($value>$max);
$min=$value if ($value<$min); $value=$min if ($value<$min);
$size=100 if (!defined $size); $size=100 if (!defined $size);
my $prop=($value-$min)/($max-$min); my $prop=($value-$min)/($max-$min);
@ -4578,7 +4578,7 @@ sub color {
return ($hue); return ($hue);
} }
my $l; my $l;
if (defined $lightness) { if (defined $lightness and $lightness ne "") {
$l=$lightness; $l=$lightness;
} else { } else {
if ($hue>180 and $hue<290) { if ($hue>180 and $hue<290) {
@ -4777,8 +4777,8 @@ sub ring
$maxColor=0 if (!defined $maxColor); $maxColor=0 if (!defined $maxColor);
} }
$max=$value if ($value>$max); $value=$max if ($value>$max);
$min=$value if ($value<$min); $value=$min if ($value<$min);
$size=100 if (!defined $size); $size=100 if (!defined $size);
my $prop=($value-$min)/($max-$min); my $prop=($value-$min)/($max-$min);
@ -4952,8 +4952,8 @@ sub ring2
$minColor=120 if (!defined $minColor); $minColor=120 if (!defined $minColor);
$maxColor=0 if (!defined $maxColor); $maxColor=0 if (!defined $maxColor);
} }
$max=$value if($value>$max); $value=$max if($value>$max);
$min=$value if ($value<$min); $value=$min if ($value<$min);
$size=100 if (!defined $size); $size=100 if (!defined $size);
my $prop=($value-$min)/($max-$min); my $prop=($value-$min)/($max-$min);
@ -4983,8 +4983,8 @@ sub ring2
$minColor2=120 if (!defined $minColor2); $minColor2=120 if (!defined $minColor2);
$maxColor2=0 if (!defined $maxColor2); $maxColor2=0 if (!defined $maxColor2);
} }
$max2=$value2 if($value2>$max2); $value2=$max2 if($value2>$max2);
$min2=$value2 if ($value2<$min2); $value2=$min2 if ($value2<$min2);
my $prop2=($value2-$min2)/($max2-$min2); my $prop2=($value2-$min2)/($max2-$min2);
my ($x12,$y12,$x22,$y22); my ($x12,$y12,$x22,$y22);
($x12,$y12,$x22,$y22)=($prop2*100,0,0,(1-$prop2)*100); ($x12,$y12,$x22,$y22)=($prop2*100,0,0,(1-$prop2)*100);
@ -5030,8 +5030,8 @@ sub ring2
$out.='</g>'; $out.='</g>';
$out.=sprintf('<g stroke="url(#grad2_ring1_%d_%d_%d)" fill="none" stroke-width="2">',$currColor,$minColor,(defined $lr ? $lr:0)); $out.=sprintf('<g stroke="url(#grad2_ring1_%d_%d_%d)" fill="none" stroke-width="2.3">',$currColor,$minColor,(defined $lr ? $lr:0));
$out.=describeArc(41, 30, 28, 0, int($prop*280)); $out.=describeArc(41, 30, 28.2, 0, int($prop*280));
$out.='</g>'; $out.='</g>';
if (defined $icon and $icon ne "" and $icon ne " ") { if (defined $icon and $icon ne "" and $icon ne " ") {