Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_DOIF.pm:card: "N/A" value improvements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@24543 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-05-30 12:42:13 +00:00
parent 0677ba52cf
commit 1f7b3e3541
1 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FHEM/98_DOIF.pm
View File

@ -1363,17 +1363,15 @@ sub collect_setValue
$r = ($r =~ /(-?\d+(\.\d+)?)/ ? $1 : "N/A"); $r = ($r =~ /(-?\d+(\.\d+)?)/ ? $1 : "N/A");
${$collect}{value}=$r; ${$collect}{value}=$r;
${$collect}{time}=$seconds; ${$collect}{time}=$seconds;
return if ($r eq "N/A");
my $diff_slots=1; my $diff_slots=1;
my $last_slot; my $last_slot;
my $dim=${$collect}{dim}; my $dim=${$collect}{dim};
my $va=${$collect}{values}; my $va=${$collect}{values};
my $ta=${$collect}{times}; my $ta=${$collect}{times};
if ($r ne "N/A") {
my $seconds_per_slot=$hours*3600/$dim; my $seconds_per_slot=$hours*3600/$dim;
if (@{$ta} == $dim) { if (@{$ta} == $dim) {
@ -1410,8 +1408,7 @@ sub collect_setValue
${$va}[$dim-1]=$r; ${$va}[$dim-1]=$r;
${$ta}[$dim-1]=$seconds; ${$ta}[$dim-1]=$seconds;
} }
}
my $maxVal; my $maxVal;
my $maxValTime; my $maxValTime;
@ -4652,13 +4649,23 @@ sub card
if ($plot ne "1" and $minVal ne $maxVal) { if ($plot ne "1" and $minVal ne $maxVal) {
$scaling=1; $scaling=1;
if ($val ne "N/A") {
$minPlot=($value < $minVal ? $value : $minVal); $minPlot=($value < $minVal ? $value : $minVal);
$maxPlot=($value > $maxVal ? $value : $maxVal); $maxPlot=($value > $maxVal ? $value : $maxVal);
} else { } else {
$minPlot=$minVal;
my $minimum=(($value<$min and $value<$minVal) ? $value:($min<$minVal) ? $min:$minVal); $maxPlot=$maxVal;
my $maximum=(($value>$max and $value>$maxVal) ? $value:($max>$maxVal) ? $max:$maxVal); }
} else {
my $minimum;
my $maximum;
if ($val ne "N/A") {
$minimum=(($value<$min and $value<$minVal) ? $value:($min<$minVal) ? $min:$minVal);
$maximum=(($value>$max and $value>$maxVal) ? $value:($max>$maxVal) ? $max:$maxVal);
} else {
$minimum=(($min<$minVal) ? $min:$minVal);
$maximum=(($max>$maxVal) ? $max:$maxVal);
}
$minPlot=(($min < 0 and $minVal > 0) ? 0 : $minimum); $minPlot=(($min < 0 and $minVal > 0) ? 0 : $minimum);
$maxPlot=(($max > 0 and $maxVal < 0) ? 0 : $maximum); $maxPlot=(($max > 0 and $maxVal < 0) ? 0 : $maximum);
} }