GitHub-Mirror/ozw-admin
2
0
Fork 0
mirror of https://github.com/Fishwaldo/ozw-admin.git synced 2025-03-15 19:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring Log Class

Browse source
This commit is contained in:
Justin Hammond 2020-06-04 00:12:57 +08:00
parent 4ed702d1e9
commit 826a2f47cc
5 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ozwadmin-main/logwindow.cpp
View file

@ -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();

4
ozwadmin-main/logwindow.h
View file

@ -3,6 +3,7 @@
#include <QDialog>
#include <QAbstractItemModel>
#include <qt-openzwave/qtozwlog.h>
namespace Ui {
class LogWindow;
@ -16,9 +17,12 @@ public:
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

2
ozwadmin-main/main.cpp
View file

@ -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"

5
ozwadmin-main/mainwindow.cpp
View file

@ -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 {

1
ozwadmin-main/nodestatus.cpp
View file

@ -19,7 +19,6 @@ NodeStatus::~NodeStatus()
}
void NodeStatus::updateNodeStats() {
if (OZWCore::get()->getQTOZWManager()->isReady()) {
if (!this->m_statTimer.isActive())
this->m_statTimer.start(1000);