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

Fix energy view when there is no root meter

Browse Source
This commit is contained in:
Michael Zanetti 2022-03-22 01:11:18 +01:00
parent e0066ef9fa
commit 7e8bcc7842
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,10 @@ Item {
var series = d.thingsSeriesMap[consumer.id]; var series = d.thingsSeriesMap[consumer.id];
series.upperSeries.append(timestamp, totalValue) series.upperSeries.append(timestamp, totalValue)
} }
thingPowerLogs.maxValue = Math.max(thingPowerLogs.maxValue, totalValue)
} }
property double maxValue: 0
} }
property PowerBalanceLogs powerBalanceLogs: PowerBalanceLogs { property PowerBalanceLogs powerBalanceLogs: PowerBalanceLogs {
@ -172,7 +175,7 @@ Item {
ValueAxis { ValueAxis {
id: valueAxis id: valueAxis
min: 0 min: 0
max: Math.ceil(powerBalanceLogs.maxValue / 1000) * 1000 max: Math.ceil(Math.max(powerBalanceLogs.maxValue, thingPowerLogs.maxValue) / 1000) * 1000
labelFormat: "" labelFormat: ""
gridLineColor: Style.tileOverlayColor gridLineColor: Style.tileOverlayColor
labelsVisible: false labelsVisible: false

10
nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
View File

@ -18,6 +18,9 @@ ChartView {
property ThingsProxy consumers: null property ThingsProxy consumers: null
property var colors: null property var colors: null
readonly property Thing rootMeter: engine.thingManager.fetchingData ? null : engine.thingManager.things.getThing(energyManager.rootMeterId)
onRootMeterChanged: updateConsumers()
Connections { Connections {
target: engine.thingManager target: engine.thingManager
onFetchingDataChanged: { onFetchingDataChanged: {
@ -80,8 +83,10 @@ ChartView {
unknownConsumption -= currentPowerState.value unknownConsumption -= currentPowerState.value
} }
d.unknownSlice = consumersBalanceSeries.append(qsTr("Unknown"), unknownConsumption) if (root.rootMeter) {
d.unknownSlice.color = Style.gray d.unknownSlice = consumersBalanceSeries.append(qsTr("Unknown"), unknownConsumption)
d.unknownSlice.color = Style.gray
}
d.thingsColorMap = colorMap d.thingsColorMap = colorMap
@ -109,6 +114,7 @@ ChartView {
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 0 spacing: 0
visible: root.rootMeter
Label { Label {
text: qsTr("Total") text: qsTr("Total")
font: Style.smallFont font: Style.smallFont