Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

git-svn-id: https://svn.fhem.de/fhem/trunk@6049 2b470e98-0d58-463d-a4d8-8e2adae1ed80

Browse Source
This commit is contained in:
tpoitzsch 2014-06-03 19:39:37 +00:00
parent 754b2d09d1
commit 9999ffd4a3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/98_statistics.pm
View File

@ -603,6 +603,8 @@ statistics_doStatisticDelta ($$$$$)
$stat[5] += $deltaValue; $stat[5] += $deltaValue;
$stat[7] += $deltaValue; $stat[7] += $deltaValue;
if ($periodSwitch>=1) { statistics_doStatisticSpecialPeriod ( $hash, $dev, $readingName, $decPlaces, $stat[1] ); }
# Determine if "since" value has to be shown in current and last reading # Determine if "since" value has to be shown in current and last reading
# If change of year, change yearly statistic # If change of year, change yearly statistic
if ($periodSwitch == 4 || $periodSwitch == -4) { if ($periodSwitch == 4 || $periodSwitch == -4) {
@ -677,8 +679,6 @@ statistics_doStatisticDelta ($$$$$)
$statValue = sprintf "%.".$decPlaces."f", $stat[7]; $statValue = sprintf "%.".$decPlaces."f", $stat[7];
statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Year",$statValue,$last[7],$periodSwitch == 4 || $periodSwitch == -4); statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Year",$statValue,$last[7],$periodSwitch == 4 || $periodSwitch == -4);
} }
if ($periodSwitch>=1) { statistics_doStatisticSpecialPeriod ( $hash, $dev, $readingName, $decPlaces, $stat[1] ); }
return ; return ;
} }
@ -696,17 +696,25 @@ statistics_doStatisticSpecialPeriod ($$$$$)
my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "SpecialPeriod"; my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "SpecialPeriod";
my $hiddenReadingName = ".".$dev->{NAME} . ":" . $readingName . "SpecialPeriod"; my $hiddenReadingName = ".".$dev->{NAME} . ":" . $readingName . "SpecialPeriod";
my $result = $value; my $result = $value;
Log3 $name,4,"$name: Add $value to $hiddenReadingName";
if (exists ($hash->{READINGS}{$hiddenReadingName}{VAL})) { $result .= " " . $hash->{READINGS}{$hiddenReadingName}{VAL}; } if (exists ($hash->{READINGS}{$hiddenReadingName}{VAL})) { $result .= " " . $hash->{READINGS}{$hiddenReadingName}{VAL}; }
my @hidden = split / /, $result; # Internal values my @hidden = split / /, $result; # Internal values
if ( exists($hidden[$specialPeriod]) ) { delete $hidden[$specialPeriod]; } if ( exists($hidden[$specialPeriod]) ) {
Log3 $name,4,"$name: Remove last value ".$hidden[$specialPeriod]." from '$hiddenReadingName'";
delete $hidden[$specialPeriod];
}
$result = 0; $result = 0;
foreach my $val (@hidden) { $result += $val; } foreach my $val (@hidden) { $result += $val; }
$result = sprintf "%.".$decPlaces."f", $result; $result = sprintf "%.".$decPlaces."f", $result;
if ($#hidden != $specialPeriod) { $result .= " (".($#hidden+1).".hours)"; } if ($#hidden != $specialPeriod) { $result .= " (".($#hidden+1).".hours)"; }
readingsBulkUpdate($dev, $statReadingName, $result, 1); readingsBulkUpdate($dev, $statReadingName, $result, 1);
$result = join( " ", @hidden ); $result = join( " ", @hidden );
readingsSingleUpdate($hash, $hiddenReadingName, $result, 0); readingsSingleUpdate($hash, $hiddenReadingName, $result, 0);
Log3 $name,4,"$name: Set '$hiddenReadingName = $result'";
} }