From 34ee6caaf93d94bdcc4ad4ef44827d261446c599 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 15 Sep 2022 19:21:48 +0200 Subject: [PATCH] Re-enable energy charts --- nymea-app/ui/mainviews/EnergyView.qml | 100 +++++++++++++------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml index 5ed7daf9..e3555292 100644 --- a/nymea-app/ui/mainviews/EnergyView.qml +++ b/nymea-app/ui/mainviews/EnergyView.qml @@ -113,20 +113,20 @@ MainViewBase { columnSpacing: 0 -// CurrentConsumptionBalancePieChart { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: producers.count > 0 -// animationsEnabled: Qt.application.active && root.isCurrentItem -// } -// CurrentProductionBalancePieChart { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: producers.count > 0 -// animationsEnabled: Qt.application.active && root.isCurrentItem -// } + CurrentConsumptionBalancePieChart { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: producers.count > 0 + animationsEnabled: Qt.application.active && root.isCurrentItem + } + CurrentProductionBalancePieChart { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: producers.count > 0 + animationsEnabled: Qt.application.active && root.isCurrentItem + } PowerConsumptionBalanceHistory { Layout.fillWidth: true @@ -134,46 +134,46 @@ MainViewBase { visible: producers.count > 0 } -// PowerProductionBalanceHistory { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// visible: producers.count > 0 -// } + PowerProductionBalanceHistory { + Layout.fillWidth: true + Layout.preferredHeight: width + visible: producers.count > 0 + } -// ConsumersPieChart { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: consumers.count > 0 -// colors: root.thingColors -// consumers: consumers -// animationsEnabled: Qt.application.active && root.isCurrentItem -// } + ConsumersPieChart { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: consumers.count > 0 + colors: root.thingColors + consumers: consumers + animationsEnabled: Qt.application.active && root.isCurrentItem + } -// ConsumersHistory { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// visible: consumers.count > 0 || rootMeter != null -// colors: root.thingColors -// consumers: consumers -// } + ConsumersHistory { + Layout.fillWidth: true + Layout.preferredHeight: width + visible: consumers.count > 0 || rootMeter != null + colors: root.thingColors + consumers: consumers + } -// PowerBalanceStats { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: rootMeter != null || producers.count > 0 -// producers: producers -// } + PowerBalanceStats { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: rootMeter != null || producers.count > 0 + producers: producers + } -// ConsumerStats { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: consumers.count > 0 -// colors: root.thingColors -// consumers: consumers -// } + ConsumerStats { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: consumers.count > 0 + colors: root.thingColors + consumers: consumers + } } } }