ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1024: Fix new charts for older Qt versions

pull/1025/head
jenkins 2023-05-10 23:19:50 +02:00
parent 827b1b2fe4 afad4be079
commit 1c6c1f7fc5
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-app/models/newlogsmodel.cpp
View File

@ -13,6 +13,10 @@ Q_DECLARE_LOGGING_CATEGORY(dcLogEngine)
NewLogsModel::NewLogsModel(QObject *parent)
: QAbstractListModel{parent}
{
// Workaround for older Qt versions (5.12 and older) which can't deal with the QList<EnergyLogEntry*> argument
connect(this, &NewLogsModel::entriesAdded, this, [this](int index, const QList<NewLogEntry*> &entries){
emit entriesAddedIdx(index, entries.count());
});
}

1
libnymea-app/models/newlogsmodel.h
View File

@ -119,6 +119,7 @@ signals:
void fetchBlockSizeChanged();
void entriesAdded(int index, const QList<NewLogEntry*> &entries);
void entriesAddedIdx(int index, int count);
void entriesRemoved(int index, int count);
private slots:

8
nymea-app/ui/customviews/StateChart.qml
View File

@ -69,10 +69,10 @@ Item {
property double minValue
property double maxValue
onEntriesAdded: {
print("**** entries added", index, entries.length, "entries in series:", valueSeries.count, "in model", logsModel.count)
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
print("**** entries added", index, count, "entries in series:", valueSeries.count, "in model", logsModel.count)
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
// print("entry", entry.timestamp, entry.source, JSON.stringify(entry.values))
zeroSeries.ensureValue(entry.timestamp)

36
nymea-app/ui/mainviews/airconditioning/ACChartsPage.qml
View File

@ -323,9 +323,9 @@ Page {
}
}
onEntriesAdded: {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
var value = entry.values["temperature"]
if (value == null) {
value = 0;
@ -380,9 +380,9 @@ Page {
}
}
onEntriesAdded: {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
var value = entry.values["temperature"]
if (value == null) {
value = 0;
@ -438,9 +438,9 @@ Page {
}
}
onEntriesAdded: {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
var value = entry.values["humidity"]
if (value == null) {
value = 0;
@ -491,9 +491,9 @@ Page {
chartView.busyCounter--
}
}
onEntriesAdded: {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
var value = entry.values["voc"]
if (value == null) {
value = 0;
@ -580,9 +580,9 @@ Page {
chartView.busyCounter--
}
}
onEntriesAdded: {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
var value = entry.values["closed"]
if (value == null) {
value = false;
@ -690,9 +690,9 @@ Page {
chartView.busyCounter--
}
}
onEntriesAdded: {
for (var i = 0; i < entries.length; i++) {
var entry = entries[i]
onEntriesAddedIdx: {
for (var i = 0; i < count; i++) {
var entry = logsModel.get(i)
var value = entry.values["heatingOn"]
if (value == null) {
value = false;