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

Merge PR #736: Drop blurred label

Browse Source
This commit is contained in:
Jenkins nymea 2021-12-16 01:33:52 +01:00
commit e33ebfc5dd
9 changed files with 13 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nymea-app/resources.qrc
View File

@ -257,7 +257,6 @@
<file>ui/components/CircleBackground.qml</file>
<file>ui/devicepages/CoolingThingPage.qml</file>
<file>ui/devicepages/EvChargerThingPage.qml</file>
<file>ui/components/BlurredLabel.qml</file>
<file>ui/components/NymeaSpinBox.qml</file>
<file>ui/mainviews/EnergyPieChartDelegate.qml</file>
<file>ui/mainviews/energy/PowerConsumptionBalanceHistory.qml</file>

38
nymea-app/ui/components/BlurredLabel.qml
View File

@ -1,38 +0,0 @@
import QtQuick 2.5
import QtQuick.Controls 2.1
import QtGraphicalEffects 1.0
import Nymea 1.0
Item {
id: root
implicitWidth: label.implicitWidth + Style.margins * 2
implicitHeight: label.implicitHeight + Style.margins * 2
property alias text: label.text
property alias font: label.font
property alias wrapMode: label.wrapMode
property alias horizontalAlignment: label.horizontalAlignment
property alias textFormat: label.textFormat
property bool blurred: false
Label {
id: label
anchors.fill: parent
}
ShaderEffectSource {
id: effectSource
anchors.fill: parent
sourceItem: label
hideSource: true
visible: false
}
FastBlur {
anchors.fill: parent
source: effectSource
radius: root.blurred ? 32 : 0
Behavior on radius { NumberAnimation { duration: Style.animationDuration } }
}
}

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

@ -220,54 +220,6 @@ ThingPageBase {
: isDischarging ? qsTr("At the current rate, the battery will last until %1.").arg('<span style="font-size:' + Style.bigFont.pixelSize + 'px">' + endTime.toLocaleTimeString(Locale.ShortFormat) + "</span>")
: ""
}
BlurredLabel {
Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
visible: isEnergyMeter || isConsumer
blurred: periodConsumptionModel.busy
font: Style.smallFont
text: isConsumer ?
qsTr("A total of %1 kWh has been <b>consumed</b> in the last 24 hours.").arg('<span style="font-size:' + Style.bigFont.pixelSize + 'px">' + (totalPeriodConsumption).toFixed(1) + '</span>')
: qsTr("A total of %1 kWh has been <b>obtained</b> in the last 24 hours.").arg('<span style="font-size:' + Style.bigFont.pixelSize + 'px">' + (totalPeriodConsumption).toFixed(1) + '</span>')
textFormat: Text.RichText
LogsModel {
id: periodConsumptionModel
engine: root.isEnergyMeter || root.isConsumer ? _engine : null
thingId: root.thing.id
typeIds: isEnergyMeter ? [root.totalEnergyConsumedStateType.id] : []
viewStartTime: root.startTime
live: true
}
property LogEntry logEntryAtStart: periodConsumptionModel.busy ? null : periodConsumptionModel.findClosest(periodConsumptionModel.viewStartTime)
property double totalPeriodConsumption: logEntryAtStart && totalEnergyConsumedState ? totalEnergyConsumedState.value - logEntryAtStart.value : 0
}
BlurredLabel {
visible: isEnergyMeter || isProducer
Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
blurred: periodProductionModel.busy
font: Style.smallFont
text: isProducer ?
qsTr("A total of %1 kWh has been <b>produced</b> in the last 24 hours.").arg('<span style="font-size:' + Style.bigFont.pixelSize + 'px">' + (totalPeriodProduction).toFixed(1) + '</span>')
: qsTr("A total of %1 kWh has been <b>returned</b> in the last 24 hours.").arg('<span style="font-size:' + Style.bigFont.pixelSize + 'px">' + (totalPeriodProduction).toFixed(1) + '</span>')
textFormat: Text.RichText
LogsModel {
id: periodProductionModel
engine: root.isEnergyMeter || root.isProducer ? _engine : null
thingId: root.thing.id
typeIds: isEnergyMeter ? [root.totalEnergyProducedStateType.id] : []
viewStartTime: root.startTime
live: true
}
property LogEntry logEntryAtStart: periodProductionModel.busy ? null : periodProductionModel.findClosest(periodProductionModel.viewStartTime)
property double totalPeriodProduction: logEntryAtStart && totalEnergyProducedState ? totalEnergyProducedState.value - logEntryAtStart.value : 0
}
}
}
}

2
nymea-app/ui/mainviews/energy/ConsumerStats.qml
View File

@ -388,7 +388,7 @@ StatsBase {
backgroundRect: Qt.rect(chartView.plotArea.x + toolTip.x, chartView.plotArea.y + toolTip.y, toolTip.width, toolTip.height)
property int idx: Math.floor(mouseArea.mouseX * categoryAxis.count / mouseArea.width)
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
x: Math.min(idx * mouseArea.width / categoryAxis.count, mouseArea.width - width)
property double setMaxValue: {

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

@ -269,12 +269,12 @@ Item {
width: 1
color: Style.foregroundColor
x: mouseArea.mouseX
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
}
NymeaToolTip {
id: toolTip
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
backgroundItem: chartView
backgroundRect: Qt.rect(mouseArea.x + toolTip.x, mouseArea.y + toolTip.y, toolTip.width, toolTip.height)

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

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

2
nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
View File

@ -343,7 +343,7 @@ StatsBase {
backgroundRect: Qt.rect(chartView.plotArea.x + toolTip.x, chartView.plotArea.y + toolTip.y, toolTip.width, toolTip.height)
property int idx: Math.floor(mouseArea.mouseX * categoryAxis.count / mouseArea.width)
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
x: Math.min(idx * mouseArea.width / categoryAxis.count, mouseArea.width - width)
property double setMaxValue: d.consumptionSet && d.productionSet && d.acquisitionSet && d.returnSet ?

4
nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml
View File

@ -260,13 +260,13 @@ Item {
width: 1
color: Style.foregroundColor
x: mouseArea.mouseX
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
}
NymeaToolTip {
id: toolTip
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
backgroundItem: chartView
backgroundRect: Qt.rect(mouseArea.x + toolTip.x, mouseArea.y + toolTip.y, toolTip.width, toolTip.height)

4
nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml
View File

@ -252,12 +252,12 @@ Item {
width: 1
color: Style.foregroundColor
x: mouseArea.mouseX
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
}
NymeaToolTip {
id: toolTip
visible: mouseArea.containsMouse
visible: mouseArea.containsMouse || mouseArea.preventStealing
backgroundItem: chartView
backgroundRect: Qt.rect(mouseArea.x + toolTip.x, mouseArea.y + toolTip.y, toolTip.width, toolTip.height)