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

Don't show a positive currentPower for producers in thing page

Browse Source
This commit is contained in:
Michael Zanetti 2023-02-25 14:03:09 +01:00
parent e86d06f862
commit f126da61e8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nymea-app/ui/devicepages/SmartMeterDevicePage.qml
View File

@ -63,9 +63,11 @@ ThingPageBase {
property bool isProduction: currentPowerState.value < 0
property bool isConsumption: currentPowerState.value > 0
property double absValue: Math.abs(currentPowerState.value)
property double cleanVale: (absValue / (absValue > 1000 ? 1000 : 1)).toFixed(1)
property string unit: absValue > 1000 ? "kW" : "W"
property double normalizedValue: isProducer
? Math.max(0, -currentPowerState.value)
: Math.abs(currentPowerState.value)
property double cleanValue: (normalizedValue / (normalizedValue > 1000 ? 1000 : 1)).toFixed(1)
property string unit: normalizedValue > 1000 ? "kW" : "W"
readonly property bool isCharging: root.chargingState && root.chargingState.value === "charging"
readonly property bool isDischarging: root.chargingState && root.chargingState.value === "discharging"
@ -159,7 +161,7 @@ ThingPageBase {
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
font: Style.largeFont
text: "%1 %2".arg(root.cleanVale).arg(root.unit)
text: "%1 %2".arg(root.cleanValue).arg(root.unit)
}
Label {
@ -177,7 +179,7 @@ ThingPageBase {
}
}
if (root.isProducer) {
return qsTr("Producing")
return root.currentPowerState.value < 0 ? qsTr("Producing") : qsTr("Idle")
}
if (root.isConsumer) {
return qsTr("Consuming")

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

@ -118,7 +118,7 @@ MainViewBase {
energyManager: energyManager
visible: rootMeter != null || producers.count > 0
animationsEnabled: Qt.application.active && root.isCurrentItem && flickable.contentY < height
onAnimationsEnabledChanged: print("animations for power balance chart", animationsEnabled ? "enabled" : "disabled")
// onAnimationsEnabledChanged: print("animations for power balance chart", animationsEnabled ? "enabled" : "disabled")
}
PowerBalanceHistory {