diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index 7f90a934..5d5f9239 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); application.installTranslator(&qtTranslator); - qCInfo(dcApplication()) << application.applicationName() << APP_VERSION << "running on" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion(); + qCInfo(dcApplication()) << application.applicationName() << APP_VERSION << "running on" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion() << PlatformHelper::instance()->deviceManufacturer() << PlatformHelper::instance()->deviceModel(); qCInfo(dcApplication()) << "Locale info:" << QLocale() << QLocale().name() << QLocale().language() << QLocale().system(); QTranslator appTranslator; diff --git a/nymea-app/ui/customviews/GenericTypeGraph.qml b/nymea-app/ui/customviews/GenericTypeGraph.qml index 6e8c8f61..f2f45f2e 100644 --- a/nymea-app/ui/customviews/GenericTypeGraph.qml +++ b/nymea-app/ui/customviews/GenericTypeGraph.qml @@ -90,7 +90,7 @@ Item { titleFont.pixelSize: app.largeFont animationDuration: 300 - animationOptions: ChartView.SeriesAnimations + animationOptions: NymeaUtils.chartsAnimationOptions RowLayout { anchors { left: parent.left; top: parent.top; right: parent.right; topMargin: app.margins / 2; leftMargin: app.margins * 1.5; rightMargin: app.margins } @@ -296,7 +296,7 @@ Item { var newMin = xAxis.min.getTime() + diffMaxToNew; xAxis.max = new Date(newPoint.x); xAxis.min = new Date(newMin) - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions } } @@ -389,7 +389,7 @@ Item { // If the user scrolled closer than 5 pixels to the right edge, enable autoscroll autoScroll = overshoot > -5; - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions } function zoomInLimited(dy) { @@ -397,7 +397,7 @@ Item { var oldMax = xAxis.max; chartView.scrollRight(dy); xAxis.min = new Date(xAxis.min.getTime() - xAxis.timeDiff * 1000 * 2) - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions } onPressed: { diff --git a/nymea-app/ui/mainviews/energy/ConsumerStats.qml b/nymea-app/ui/mainviews/energy/ConsumerStats.qml index d21adb55..c5c793bd 100644 --- a/nymea-app/ui/mainviews/energy/ConsumerStats.qml +++ b/nymea-app/ui/mainviews/energy/ConsumerStats.qml @@ -206,7 +206,7 @@ StatsBase { labels.push(entries[0].timestamp) categoryAxis.timestamps = labels - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions } onLiveEntryChanged: { @@ -291,7 +291,7 @@ StatsBase { map[consumer.id] = barSet } barSeries.thingBarSetMap = map - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions } Item { diff --git a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml index e01d116c..9ab48e27 100644 --- a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml +++ b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml @@ -9,7 +9,7 @@ import Nymea 1.0 ChartView { id: root backgroundColor: "transparent" - animationOptions: Qt.application.active ? ChartView.SeriesAnimations : ChartView.NoAnimation + animationOptions: Qt.application.active ? NymeaUtils.chartsAnimationOptions : ChartView.NoAnimation title: qsTr("Consumers balance") titleColor: Style.foregroundColor legend.visible: false diff --git a/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml index 51775cf2..7c8755fb 100644 --- a/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml +++ b/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml @@ -9,7 +9,7 @@ import Nymea 1.0 ChartView { id: consumptionPieChart backgroundColor: "transparent" - animationOptions: Qt.application.active ? ChartView.SeriesAnimations : ChartView.NoAnimation + animationOptions: Qt.application.active ? NymeaUtils.chartsAnimationOptions : ChartView.NoAnimation title: qsTr("My energy mix") titleColor: Style.foregroundColor legend.visible: false diff --git a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml index e294a1ad..d128b85b 100644 --- a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml +++ b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml @@ -9,7 +9,7 @@ import Nymea 1.0 ChartView { id: productionPieChart backgroundColor: "transparent" - animationOptions: Qt.application.active ? ChartView.SeriesAnimations : ChartView.NoAnimation + animationOptions: Qt.application.active ? NymeaUtils.chartsAnimationOptions : ChartView.NoAnimation title: qsTr("My energy production") titleColor: Style.foregroundColor legend.visible: false diff --git a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml index 291595ca..4d2628cf 100644 --- a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml +++ b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml @@ -169,7 +169,7 @@ StatsBase { // print("assigning categories:", labels) categoryAxis.timestamps = labels - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions for (var i = 0; i < entries.length; i++) { // print("Appending to set", JSON.stringify(entries[i])) @@ -215,7 +215,7 @@ StatsBase { d.acquisitionSet.append(acquisitionValue) d.returnSet.append(returnValue) - chartView.animationOptions = ChartView.SeriesAnimations + chartView.animationOptions = NymeaUtils.chartsAnimationOptions } } diff --git a/nymea-app/ui/utils/NymeaUtils.qml b/nymea-app/ui/utils/NymeaUtils.qml index e511af55..15cc025f 100644 --- a/nymea-app/ui/utils/NymeaUtils.qml +++ b/nymea-app/ui/utils/NymeaUtils.qml @@ -1,6 +1,7 @@ pragma Singleton import QtQuick 2.9 import Nymea 1.0 +import QtCharts 2.3 Item { id: root @@ -145,4 +146,7 @@ Item { function hasPermissionScope(permissions, requestedScope) { return (permissions & requestedScope) === requestedScope; } + + property bool inhibitChartsAnimation: ["SM-G950x", "SM-G955x", "SM-G892A"].indexOf(PlatformHelper.deviceModel) >= 0 + property int chartsAnimationOptions: !inhibitChartsAnimation ? ChartView.SeriesAnimations : ChartView.NoAnimation }