ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes in the energy view

Browse Source
This commit is contained in:
Michael Zanetti 2022-02-10 14:04:16 +01:00
parent feb7b08b78
commit f77845f835
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app/translations/nymea-app-de.ts
View File

@ -5218,7 +5218,7 @@ Möchtest Du fortfahren?</translation>
</message> </message>
<message> <message>
<source>From battery</source> <source>From battery</source>
<translation>Betterie</translation> <translation>Batterie</translation>
</message> </message>
<message> <message>
<source>From grid</source> <source>From grid</source>

8
nymea-app/ui/mainviews/EnergyView.qml
View File

@ -60,7 +60,7 @@ MainViewBase {
engine: _engine engine: _engine
} }
property var thingColors: [Style.blue, Style.green, Style.red, Style.yellow, Style.purple, Style.yellow, Style.lime] property var thingColors: [Style.blue, Style.green, Style.red, Style.yellow, Style.purple, Style.orange, Style.lime]
ThingsProxy { ThingsProxy {
@ -90,12 +90,6 @@ MainViewBase {
shownInterfaces: ["smartmeterproducer"] shownInterfaces: ["smartmeterproducer"]
} }
ThingsProxy {
id: batteries
engine: _engine
shownInterfaces: ["energystorage"]
}
Flickable { Flickable {
id: flickable id: flickable
anchors.fill: parent anchors.fill: parent

1
nymea-app/ui/mainviews/energy/ConsumersHistory.qml
View File

@ -162,7 +162,6 @@ Item {
legend.labelColor: Style.foregroundColor legend.labelColor: Style.foregroundColor
legend.font: Style.extraSmallFont legend.font: Style.extraSmallFont
ValueAxis { ValueAxis {
id: valueAxis id: valueAxis
min: 0 min: 0

5
nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
View File

@ -16,6 +16,11 @@ ChartView {
property EnergyManager energyManager: null property EnergyManager energyManager: null
ThingsProxy {
id: batteries
engine: _engine
shownInterfaces: ["energystorage"]
}
PieSeries { PieSeries {
id: productionBalanceSeries id: productionBalanceSeries
size: 0.9 size: 0.9

2
nymea-app/ui/utils/NymeaUtils.qml
View File

@ -147,6 +147,6 @@ Item {
return (permissions & requestedScope) === requestedScope; return (permissions & requestedScope) === requestedScope;
} }
property bool inhibitChartsAnimation: ["SM-G950x", "SM-G955x", "SM-G892A"].indexOf(PlatformHelper.deviceModel) >= 0 property bool inhibitChartsAnimation: PlatformHelper.deviceModel.startsWith("SM-G950") // Samsung S8 has a buggy GPU driver :(
property int chartsAnimationOptions: !inhibitChartsAnimation ? ChartView.SeriesAnimations : ChartView.NoAnimation property int chartsAnimationOptions: !inhibitChartsAnimation ? ChartView.SeriesAnimations : ChartView.NoAnimation
} }