From f6be8ecb7b263d652a5e361c3f077fb1aac9526f Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Wed, 9 Sep 2020 00:54:49 +0200
Subject: [PATCH] Fix graphs not filtering properly for type id

---
 libnymea-app/models/logsmodelng.cpp | 16 +++++++++++++++-
 libnymea-app/models/logsmodelng.h   |  6 +++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/libnymea-app/models/logsmodelng.cpp b/libnymea-app/models/logsmodelng.cpp
index 4845921c..8e475355 100644
--- a/libnymea-app/models/logsmodelng.cpp
+++ b/libnymea-app/models/logsmodelng.cpp
@@ -96,6 +96,17 @@ QHash<int, QByteArray> LogsModelNg::roleNames() const
     return roles;
 }
 
+void LogsModelNg::classBegin()
+{
+
+}
+
+void LogsModelNg::componentComplete()
+{
+    m_ready = true;
+    fetchMore();
+}
+
 bool LogsModelNg::busy() const
 {
     return m_busy;
@@ -359,6 +370,9 @@ void LogsModelNg::fetchMore(const QModelIndex &parent)
 {
     Q_UNUSED(parent)
 
+    if (!m_ready) {
+        return;
+    }
     if (!m_engine) {
         qWarning() << "Cannot update. Engine not set";
         return;
@@ -404,7 +418,7 @@ void LogsModelNg::fetchMore(const QModelIndex &parent)
     params.insert("limit", m_blockSize);
     params.insert("offset", m_list.count());
 
-    qDebug() << "Fetching logs from" << m_startTime.toString() << "to" << m_endTime.toString() << "with offset" << m_list.count() << "and limit" << m_blockSize;
+    qDebug() << "Fetching logs:" << qUtf8Printable(QJsonDocument::fromVariant(params).toJson());
 
     m_engine->jsonRpcClient()->sendCommand("Logging.GetLogEntries", params, this, "logsReply");
 //    qDebug() << "GetLogEntries called";
diff --git a/libnymea-app/models/logsmodelng.h b/libnymea-app/models/logsmodelng.h
index a2a06776..c9c6fb64 100644
--- a/libnymea-app/models/logsmodelng.h
+++ b/libnymea-app/models/logsmodelng.h
@@ -36,11 +36,12 @@
 #include <QDateTime>
 #include <QLineSeries>
 #include <QUuid>
+#include <QQmlParserStatus>
 
 class LogEntry;
 class Engine;
 
-class LogsModelNg : public QAbstractListModel
+class LogsModelNg : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(Engine* engine READ engine WRITE setEngine NOTIFY engineChanged)
@@ -77,6 +78,8 @@ public:
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role) const override;
     QHash<int, QByteArray> roleNames() const override;
+    void classBegin() override;
+    void componentComplete() override;
 
     bool busy() const;
 
@@ -143,6 +146,7 @@ private:
     QDateTime m_viewStartTime;
     QVariant m_minValue;
     QVariant m_maxValue;
+    bool m_ready = false;
 
     QtCharts::QXYSeries *m_graphSeries = nullptr;