98_DOIF.pm: fixed ring2 icon color, card: min, max now last value

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@24905 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-09-01 18:35:54 +00:00
parent 8fb4a243c0
commit 930ef5da87

View File

@ -1426,13 +1426,13 @@ sub collect_setValue
my $value=${$va}[$i];
my $time=${$ta}[$i];
if (defined $value and defined $time) {
if (!defined $maxVal or $value > $maxVal) {
if (!defined $maxVal or $value >= $maxVal) {
$maxVal=$value;
$maxValTime=$time;
$maxValSlot=$i;
}
if (!defined $minVal or $value < $minVal) {
if (!defined $minVal or $value <= $minVal) {
$minVal=$value;
$minValTime=$time;
$minValSlot=$i;
@ -5907,6 +5907,16 @@ sub ring2
$ic="" if (!defined($ic));
}
if (defined $icon and $icon ne "") {
if ($ic !~ /@/) {
$ic="$ic\@".color($currColor,$li);
} elsif ($ic =~ /^(.*\@)colorVal1/) {
$ic="$1".color($currColor,$li);
} elsif ($ic =~ /^(.*\@)colorVal2/) {
$ic="$1".color($currColor2,$li);
}
}
$out.= sprintf('<svg xmlns="http://www.w3.org/2000/svg" viewBox="10 0 63 58" width="%d" height="%d" style="width:%dpx; height:%dpx">',$width,$height,$width,$height);
$out.= '<defs>';
$out.= '<linearGradient id="gradbackring2" x1="0" y1="1" x2="0" y2="0"><stop offset="0" style="stop-color:rgb(64,64,64);stop-opacity:0.9"/><stop offset="1" style="stop-color:rgb(24,24,24);stop-opacity:0.9"/></linearGradient>';