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

93
FHEM/98_DOIF.pm
View File

@ -1363,56 +1363,53 @@ 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};
my $seconds_per_slot=$hours*3600/$dim; if ($r ne "N/A") {
my $seconds_per_slot=$hours*3600/$dim;
if (@{$ta} == $dim) {
$last_slot=int (${$ta}[-1]/$seconds_per_slot); if (@{$ta} == $dim) {
} $last_slot=int (${$ta}[-1]/$seconds_per_slot);
my $slot_nr=int ($seconds/$seconds_per_slot); }
if (defined $last_slot) { my $slot_nr=int ($seconds/$seconds_per_slot);
$diff_slots=$slot_nr-$last_slot; if (defined $last_slot) {
if ($diff_slots > 0) { $diff_slots=$slot_nr-$last_slot;
if ($diff_slots >= $dim) { if ($diff_slots > 0) {
${$collect}{last_value}=${$collect}{value} if (defined ${$collect}{value}); if ($diff_slots >= $dim) {
@{$va}=(); ${$collect}{last_value}=${$collect}{value} if (defined ${$collect}{value});
@{$ta}=(); @{$va}=();
} else { @{$ta}=();
my @rv=splice (@{$va},0,$diff_slots); } else {
my @rt=splice (@{$ta},0,$diff_slots); my @rv=splice (@{$va},0,$diff_slots);
if ($diff_slots > 1 and !defined ${$va}[$dim-$diff_slots] and defined ${$collect}{value} and ${$collect}{value} != ${$va}[$dim-$diff_slots-1]) { my @rt=splice (@{$ta},0,$diff_slots);
${$va}[$dim-$diff_slots]=${$collect}{value}; if ($diff_slots > 1 and !defined ${$va}[$dim-$diff_slots] and defined ${$collect}{value} and ${$collect}{value} != ${$va}[$dim-$diff_slots-1]) {
${$ta}[$dim-$diff_slots]=(int(${$ta}[$dim-$diff_slots-1]/$seconds_per_slot)+1)*60*$seconds_per_slot; ${$va}[$dim-$diff_slots]=${$collect}{value};
} ${$ta}[$dim-$diff_slots]=(int(${$ta}[$dim-$diff_slots-1]/$seconds_per_slot)+1)*60*$seconds_per_slot;
for (my $i=@rv-1;$i>=0;$i--) { }
if (defined ($rv[$i])) { for (my $i=@rv-1;$i>=0;$i--) {
${$collect}{last_value}=$rv[$i]; if (defined ($rv[$i])) {
last; ${$collect}{last_value}=$rv[$i];
last;
}
} }
} }
} }
} }
}
${$collect}{avg} = defined ${$collect}{max_value} ? (${$collect}{max_value}-${$collect}{min_value})/2 + ${$collect}{min_value}: $r;
if (!defined ${$va}[$dim-1] or $r >= ${$collect}{avg} and $r > ${$va}[$dim-1] or $r < ${$collect}{avg} and $r < ${$va}[$dim-1]) {
${$va}[$dim-1]=$r;
${$ta}[$dim-1]=$seconds;
}
${$collect}{avg} = defined ${$collect}{max_value} ? (${$collect}{max_value}-${$collect}{min_value})/2 + ${$collect}{min_value}: $r;
if (!defined ${$va}[$dim-1] or $r >= ${$collect}{avg} and $r > ${$va}[$dim-1] or $r < ${$collect}{avg} and $r < ${$va}[$dim-1]) {
${$va}[$dim-1]=$r;
${$ta}[$dim-1]=$seconds;
}
}
my $maxVal; my $maxVal;
my $maxValTime; my $maxValTime;
my $maxValSlot; my $maxValSlot;
@ -4651,16 +4648,26 @@ sub card
my $scaling=0; my $scaling=0;
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 {
$minPlot=$minVal;
$maxPlot=$maxVal;
}
} else { } else {
my $minimum;
my $minimum=(($value<$min and $value<$minVal) ? $value:($min<$minVal) ? $min:$minVal); my $maximum;
my $maximum=(($value>$max and $value>$maxVal) ? $value:($max>$maxVal) ? $max:$maxVal); if ($val ne "N/A") {
$minimum=(($value<$min and $value<$minVal) ? $value:($min<$minVal) ? $min:$minVal);
$minPlot=(($min < 0 and $minVal > 0) ? 0 : $minimum); $maximum=(($value>$max and $value>$maxVal) ? $value:($max>$maxVal) ? $max:$maxVal);
$maxPlot=(($max > 0 and $maxVal < 0) ? 0 : $maximum); } else {
$minimum=(($min<$minVal) ? $min:$minVal);
$maximum=(($max>$maxVal) ? $max:$maxVal);
}
$minPlot=(($min < 0 and $minVal > 0) ? 0 : $minimum);
$maxPlot=(($max > 0 and $maxVal < 0) ? 0 : $maximum);
} }
my ($m,$n)=m_n($minPlot,0,$maxPlot,50); my ($m,$n)=m_n($minPlot,0,$maxPlot,50);