Refactoring Log Class

OpenZWave · Jun 3, 2020 · 826a2f4 · 826a2f4
1 parent 4ed702d
commit 826a2f4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/ozwadmin-main/logwindow.cpp b/ozwadmin-main/logwindow.cpp
@@ -2,6 +2,8 @@
 
 #include "logwindow.h"
 #include "ui_logwindow.h"
+#include "ozwcore.h"
+#include "util.h"
 
 LogWindow::LogWindow(QWidget *parent) :
     QWidget(parent),
@@ -14,6 +16,8 @@ LogWindow::LogWindow(QWidget *parent) :
     this->ui->logview->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
 //    this->ui->logview->resizeColumnsToContents();
 
+    this->m_log = OZWCore::get()->getQTOZWManager()->getLog();
+    connect(this->m_log, &QTOZWLog::newLogLine, this, &LogWindow::newMsg);
 
 }
 
@@ -22,6 +26,11 @@ LogWindow::~LogWindow()
     delete ui;
 }
 
+void LogWindow::newMsg(QDateTime time, LogLevels::Level level, quint8 s_node, QString s_msg) {
+            qCDebug(ozwadmin) << time << level << s_node << s_msg;
+}
+
+
 void LogWindow::setModel(QAbstractItemModel *model) {
     this->ui->logview->setModel(model);
 //    this->ui->logview->resizeColumnsToContents();

diff --git a/ozwadmin-main/logwindow.h b/ozwadmin-main/logwindow.h
@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QAbstractItemModel>
+#include <qt-openzwave/qtozwlog.h>
 
 namespace Ui {
 class LogWindow;
@@ -16,9 +17,12 @@ class LogWindow : public QWidget
     explicit LogWindow(QWidget *parent = nullptr);
     ~LogWindow();
     void setModel(QAbstractItemModel *model);
+private slots:
+    void newMsg(QDateTime time, LogLevels::Level level, quint8 s_node, QString s_msg);
 private:
     Ui::LogWindow *ui;
     bool viewAtBottom = true;
+    QTOZWLog *m_log;
 };
 
 #endif // LOGWINDOW_H
diff --git a/ozwadmin-main/main.cpp b/ozwadmin-main/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 
 #if 1
     QLoggingCategory::setFilterRules("*.debug=false\n"
-                                     "qt.remoteobjects.debug=true\n"
+                                     "qt.remoteobjects.debug=false\n"
                                      "qt.remoteobjects.warning=true\n"
                                      "ozw.*.debug=true\n"
                                      "ozw.library.debug=false\n"

diff --git a/ozwadmin-main/mainwindow.cpp b/ozwadmin-main/mainwindow.cpp
@@ -185,7 +185,6 @@ void MainWindow::openDefaultWindows() {
 	userValues->setModel(OZWCore::get()->getQTOZWManager()->getValueModel(), this->ntw->selectionModel());
 	systemValues->setModel(OZWCore::get()->getQTOZWManager()->getValueModel(), this->ntw->selectionModel());
 	configValues->setModel(OZWCore::get()->getQTOZWManager()->getValueModel(), this->ntw->selectionModel());
-	lw->setModel(OZWCore::get()->getQTOZWManager()->getLogModel());
 
 	di->setQTOZWManager(OZWCore::get()->getQTOZWManager());
 	this->m_WindowsSetup = true;
@@ -242,9 +241,9 @@ void MainWindow::connectToRemote(QUrl server, QString key) {
 }
 
 void MainWindow::CloseConnection() {
-	if (OZWCore::get()->getQTOZWManager()->getConnectionType() == QTOZWManager::connectionType::Local) {
+	if (OZWCore::get()->getQTOZWManager()->getConnectionType() == ConnectionType::Type::Local) {
 		OZWCore::get()->getQTOZWManager()->close();
-	} else if (OZWCore::get()->getQTOZWManager()->getConnectionType() == QTOZWManager::connectionType::Remote) {
+	} else if (OZWCore::get()->getQTOZWManager()->getConnectionType() == ConnectionType::Type::Remote) {
 		//QMessageBox::critical(this, "Close Connection", "TODO: Please restart the application for now");
 		//exit(1);
 	} else {

diff --git a/ozwadmin-main/nodestatus.cpp b/ozwadmin-main/nodestatus.cpp
@@ -19,7 +19,6 @@ NodeStatus::~NodeStatus()
 }
 
 void NodeStatus::updateNodeStats() {
-
 	if (OZWCore::get()->getQTOZWManager()->isReady()) {
 		if (!this->m_statTimer.isActive())
 			this->m_statTimer.start(1000);