76_SolarForecast: one more fix of color filling of svg icon
git-svn-id: https://svn.fhem.de/fhem/trunk@30370 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -11165,7 +11165,7 @@ sub _transferBatteryValues {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$bcapsum += $instcap; # Summe installierte Bat Kapazität
|
$bcapsum += $instcap; # Summe installierte Bat Kapazität
|
||||||
$data{$name}{batteries}{$bn}{binstcap} = $instcap; # Summe installierte Batterie Kapazität
|
$data{$name}{batteries}{$bn}{binstcap} = $instcap; # installierte Batterie Kapazität
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
delete $data{$name}{batteries}{$bn}{binstcap};
|
delete $data{$name}{batteries}{$bn}{binstcap};
|
||||||
@@ -11337,10 +11337,11 @@ sub _transferBatteryValues {
|
|||||||
|
|
||||||
limitArray ($data{$name}{current}{batsocslidereg}, SLIDENUMMAX);
|
limitArray ($data{$name}{current}{batsocslidereg}, SLIDENUMMAX);
|
||||||
|
|
||||||
$data{$name}{current}{batpowerinsum} = $pbisum; # summarische laufende Batterieladung
|
$data{$name}{current}{batpowerinsum} = $pbisum; # summarische laufende Batterieladung
|
||||||
$data{$name}{current}{batpoweroutsum} = $pbosum; # summarische laufende Batterieentladung
|
$data{$name}{current}{batpoweroutsum} = $pbosum; # summarische laufende Batterieentladung
|
||||||
$data{$name}{current}{batcapsum} = $bcapsum; # Summe installierte Batterie Kapazität in Wh
|
$data{$name}{current}{batcapsum} = $bcapsum; # Summe installierte Batterie Kapazität in Wh
|
||||||
$data{$name}{current}{batwhtotal} = $socwhsum; # Ladung in Wh über alle Batterien
|
$data{$name}{current}{batwhtotal} = $socwhsum; # Ladung in Wh über alle Batterien
|
||||||
|
$data{$name}{current}{batwhdeficitsum} = $bcapsum - $socwhsum; # Fehlbetrag bis volle Ladung über alle Batterien
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@@ -19648,7 +19649,7 @@ sub __normIconInnerScale {
|
|||||||
|
|
||||||
if ($fill) {
|
if ($fill) {
|
||||||
$inner =~ s/\bfill="[^"]*"/fill="$fill"/gi;
|
$inner =~ s/\bfill="[^"]*"/fill="$fill"/gi;
|
||||||
for my $tag (qw(path rect circle ellipse polygon polyline line)) {
|
for my $tag (qw(path rect circle ellipse polygon polyline line stroke)) {
|
||||||
$inner =~ s{<$tag(?![^>]*\bfill=)}{<$tag fill="$fill"}gi;
|
$inner =~ s{<$tag(?![^>]*\bfill=)}{<$tag fill="$fill"}gi;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user