Fix NGL::getLogger() -> N_LogView::getLogger() namespace error
- LogViewTelegramDialog.hpp: Fixed default parameter to use N_LogView::getLogger() - LogViewTelegram.cpp: Added logger.h include, fixed both constructor initializations - getLogger() is defined in N_LogView namespace, not NGL namespace Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2 files changed
+6
-1
No files matched your search
@@ -18,6 +18,7 @@
|
|||||||
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
||||||
#include <CoPrtCnv/CoPrtCnvHexDumpHelper.hpp>
|
#include <CoPrtCnv/CoPrtCnvHexDumpHelper.hpp>
|
||||||
#include "LogViewXdrParser.hpp"
|
#include "LogViewXdrParser.hpp"
|
||||||
|
#include "logger.h"
|
||||||
#include "LogViewXdrStruct.hpp"
|
#include "LogViewXdrStruct.hpp"
|
||||||
#include "LogViewXdrValue.hpp"
|
#include "LogViewXdrValue.hpp"
|
||||||
#include "LogViewXdrType.hpp"
|
#include "LogViewXdrType.hpp"
|
||||||
@@ -73,6 +74,7 @@ LogViewTelegram::LogViewTelegram(const LogViewTelegram &o)
|
|||||||
, m_data(o.m_data)
|
, m_data(o.m_data)
|
||||||
, m_json(o.m_json)
|
, m_json(o.m_json)
|
||||||
, m_TetraTelegram(nullptr)
|
, m_TetraTelegram(nullptr)
|
||||||
|
, m_logger(o.m_logger)
|
||||||
{
|
{
|
||||||
if (!m_data.isEmpty())
|
if (!m_data.isEmpty())
|
||||||
m_TetraTelegram = new N_CoPrtCnv::CoPrtCnvRadioTelegram(m_data);
|
m_TetraTelegram = new N_CoPrtCnv::CoPrtCnvRadioTelegram(m_data);
|
||||||
@@ -100,6 +102,7 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
|
|||||||
, m_LogTime(0)
|
, m_LogTime(0)
|
||||||
, m_GpsTime(0)
|
, m_GpsTime(0)
|
||||||
, m_TetraTelegram(nullptr)
|
, m_TetraTelegram(nullptr)
|
||||||
|
, m_logger(N_LogView::getLogger())
|
||||||
{
|
{
|
||||||
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
|
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
|
||||||
if (waitTime > 0)
|
if (waitTime > 0)
|
||||||
@@ -143,6 +146,7 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
|
|||||||
, m_GpsTime(0)
|
, m_GpsTime(0)
|
||||||
, m_data(a_telegramData)
|
, m_data(a_telegramData)
|
||||||
, m_TetraTelegram(nullptr)
|
, m_TetraTelegram(nullptr)
|
||||||
|
, m_logger(N_LogView::getLogger())
|
||||||
{
|
{
|
||||||
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
|
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
|
||||||
if (waitTime > 0)
|
if (waitTime > 0)
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class LogViewTelegramDialog : public QDialog
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit LogViewTelegramDialog(QWidget *a_parent = nullptr, const bool a_readonly = true);
|
explicit LogViewTelegramDialog(QWidget *a_parent = nullptr, const bool a_readonly = true, NGL::INGLLogger& logger = N_LogView::getLogger());
|
||||||
|
|
||||||
void showDialog(const QSharedPointer<LogViewTelegram> &a_telegram);
|
void showDialog(const QSharedPointer<LogViewTelegram> &a_telegram);
|
||||||
void showDataDump(const QSharedPointer<LogViewTelegram> &a_telegram, bool showErrorMessage);
|
void showDataDump(const QSharedPointer<LogViewTelegram> &a_telegram, bool showErrorMessage);
|
||||||
@@ -69,6 +69,7 @@ private:
|
|||||||
QLineEdit *m_NameEdit = nullptr;
|
QLineEdit *m_NameEdit = nullptr;
|
||||||
QLineEdit *m_WaitTimeEdit = nullptr;
|
QLineEdit *m_WaitTimeEdit = nullptr;
|
||||||
bool m_ReadOnly = false;
|
bool m_ReadOnly = false;
|
||||||
|
NGL::INGLLogger& m_logger;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user