From 8908f677169ce49d9c26d5d85b7e452ce2ee5547 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 25 Nov 2021 10:47:37 +0100 Subject: [PATCH] Reenable energy views --- nymea-app/ui/mainviews/EnergyView.qml | 78 +++++++++++++-------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml index 7e69341a..6fdfd931 100644 --- a/nymea-app/ui/mainviews/EnergyView.qml +++ b/nymea-app/ui/mainviews/EnergyView.qml @@ -97,54 +97,54 @@ MainViewBase { columnSpacing: 0 -// CurrentConsumptionBalancePieChart { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: producers.count > 0 -// } -// CurrentProductionBalancePieChart { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: producers.count > 0 -// } + CurrentConsumptionBalancePieChart { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: producers.count > 0 + } + CurrentProductionBalancePieChart { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: producers.count > 0 + } -// PowerConsumptionBalanceHistory { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// visible: producers.count > 0 -// } + PowerConsumptionBalanceHistory { + Layout.fillWidth: true + Layout.preferredHeight: width + 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 + } -// ConsumersBarChart { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: consumers.count > 0 -// } -// ConsumersHistory { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// visible: consumers.count > 0 -// } + ConsumersBarChart { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: consumers.count > 0 + } + ConsumersHistory { + Layout.fillWidth: true + Layout.preferredHeight: width + visible: consumers.count > 0 + } PowerBalanceStats { Layout.fillWidth: true Layout.preferredHeight: width energyManager: energyManager } -// ConsumerStats { -// Layout.fillWidth: true -// Layout.preferredHeight: width -// energyManager: energyManager -// visible: consumers.count > 0 -// } + ConsumerStats { + Layout.fillWidth: true + Layout.preferredHeight: width + energyManager: energyManager + visible: consumers.count > 0 + } } }