Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -5,7 +5,7 @@
#include <QJsonObject>
#include <QByteArray>
#include <CoPrtCnv/coprtcnv_export.h>
#include "coprtcnv_export.h"
#include <TrainingAreaBase/training_area_telegrams.h>
namespace N_CoPrtCnv
@@ -185,7 +185,7 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
{
uint8_t wirkfeldTyp = a_radioTelegram->getPayloadDataUInt32(5, 1);
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
DEBUG_LOG(m_logger) << commonLog
DEBUG_LOG() << commonLog
<< ", type: " << wirkfeldTyp2Str(wirkfeldTyp) << ", kennung: "
<< wirkfeldKennung;
break;
@@ -193,7 +193,7 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
case GEF_DEAKTIVIERUNG_EINZELMINE: {
uint32_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(9, 2);
uint32_t minenKennung = a_radioTelegram->getPayloadDataUInt32(11, 2);
DEBUG_LOG(m_logger) << commonLog
DEBUG_LOG() << commonLog
<< ", kennung: " << wirkfeldKennung << ", mineId: " << minenKennung;
break;
}
@@ -207,14 +207,14 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
case GEF_DEAKTIVIEREN_FUNKTIONSRAUM:
{
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
DEBUG_LOG(m_logger) << commonLog << ", kennung: " << wirkfeldKennung;
DEBUG_LOG() << commonLog << ", kennung: " << wirkfeldKennung;
break;
}
case GEF_TECHNIK_FUNKTIONSRAUM:
{
uint16_t funktionsraumkennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
uint8_t funktionsraumtyp = a_radioTelegram->getPayloadDataUInt32(7, 1);
DEBUG_LOG(m_logger) << commonLog
DEBUG_LOG() << commonLog
<< ", kennung: " << funktionsraumkennung
<< " type: " << int(funktionsraumtyp);
break;
@@ -222,19 +222,19 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
case GEF_WF_SAMMELDEAKTIVIERUNG:
case GEF_WF_SAMMELDEAKTIVIERUNG_DUS_MINEN:
case GEF_WF_SAMMELDEAKTIVIERUNG_FUNKTIONSRAUM:
DEBUG_LOG(m_logger) << commonLog << ", Ids: " << dumpSammeldeaktivierung(a_radioTelegram);
DEBUG_LOG() << commonLog << ", Ids: " << dumpSammeldeaktivierung(a_radioTelegram);
break;
case GEF_NOP:
{
uint16_t bcFrom = a_radioTelegram->getPayloadDataUInt32(3, 2);
uint16_t bcTo = a_radioTelegram->getPayloadDataUInt32(5, 2);
DEBUG_LOG(m_logger) << prefix
DEBUG_LOG() << prefix
<< commonLog
<< ", from BC " << bcFrom << " to " << bcTo;
break;
}
default:
DEBUG_LOG(m_logger) << commonLog;
DEBUG_LOG() << commonLog;
break;
}
}
@@ -16,7 +16,7 @@
#include <QtCore/QString>
#include <NGLLogger/INGLLogger.h>
#include <TrainingAreaBase/training_area_telegrams.h>
#include <CoPrtCnv/coprtcnv_export.h>
#include "coprtcnv_export.h"
#include "tetra_telegram_ids.h"
namespace N_CoPrtCnv
@@ -224,7 +224,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
const uint8_t nbrOfFragmentedTelegrams = uint8_t((payloadSize - 1) / MAX_TELEGRAM_SIZE);
if (nbrOfFragmentedTelegrams > (MAX_NBR_OF_FRAGMENTS - 1))
{
ERROR_LOG(m_logger) << "Radio-telegram is too big (" << nbrOfFragmentedTelegrams + 1
ERROR_LOG() << "Radio-telegram is too big (" << nbrOfFragmentedTelegrams + 1
<< " fragments). There are max " << MAX_NBR_OF_FRAGMENTS
<< " fragments of size=" << MAX_RADIO_TELEGRAM_PAYLOAD_LENGTH
<< " (=" << MAX_NBR_OF_FRAGMENTS *MAX_RADIO_TELEGRAM_PAYLOAD_LENGTH
@@ -234,7 +234,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
}
if (nbrOfFragmentedTelegrams == 0)
{
ERROR_LOG(m_logger) << "Radio-telegram is too small for fragmentation. It must have at least a size of "
ERROR_LOG() << "Radio-telegram is too small for fragmentation. It must have at least a size of "
<< (MAX_RADIO_TELEGRAM_PAYLOAD_LENGTH + 1);
a_error = true;
return;
@@ -278,7 +278,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
else
{
ERROR_LOG(m_logger) << "Internal error: size must be bigger than 1";
ERROR_LOG() << "Internal error: size must be bigger than 1";
a_error = true;
return;
}
@@ -290,7 +290,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
CoPrtCnvRadioTelegram::~CoPrtCnvRadioTelegram()
{
if (m_BroadcastOnlyTelegram != nullptr)
ERROR_LOG(m_logger) << "Internal error: m_BroadcastOnlyTelegram was not nullptr while deletion of radio-telegram";
ERROR_LOG() << "Internal error: m_BroadcastOnlyTelegram was not nullptr while deletion of radio-telegram";
}
@@ -410,7 +410,7 @@ uint32_t CoPrtCnvRadioTelegram::getPayloadDataUInt32(size_t a_offset, uint16_t a
break;
default:
Q_ASSERT(false);
ERROR_LOG(m_logger) << "a_size must be between 1..4";
ERROR_LOG() << "a_size must be between 1..4";
}
return value;
@@ -538,7 +538,7 @@ bool CoPrtCnvRadioTelegram::isCrcOk() const
if (sum != checksum)
{
ERROR_LOG(m_logger) << "Checksum of telegram is wrong: " << QString::number(checksum, 16)
ERROR_LOG() << "Checksum of telegram is wrong: " << QString::number(checksum, 16)
<< " (expected: " << QString::number(sum, 16) << "), issi: " << getUInt32(5);
return true;
}
@@ -785,7 +785,7 @@ uint8_t CoPrtCnvRadioTelegram::getPriority() const
case GEF_WF_SAMMELDEAKTIVIERUNG_FUNKTIONSRAUM:
return 99;
default:
ERROR_LOG(m_logger) << "Priority of telegram with telId=" << getTelID() << " not defined.";
ERROR_LOG() << "Priority of telegram with telId=" << getTelID() << " not defined.";
#ifdef DEBUG
abort();
@@ -1276,7 +1276,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
{
if (wirkfeldkennung > 0 && wirkfeldkennung <= 32767)
return true;
ERROR_LOG(m_logger) << "Wirkfeldkennung (" << wirkfeldkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..32768.";
ERROR_LOG() << "Wirkfeldkennung (" << wirkfeldkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..32768.";
return false;
}
if (GEF_WIRKFELD_AENDERUNG_BEZEICHNER == getTelID() && wirkfeldkennung > 0)
@@ -1284,7 +1284,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
ERROR_LOG(m_logger) << "Wirkfeldtyp (" << wirkfeldtyp << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..5 or 8.";
ERROR_LOG() << "Wirkfeldtyp (" << wirkfeldtyp << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..5 or 8.";
return false;
case GEF_DEAKTIVIERUNG_EINZELMINE:
@@ -1294,7 +1294,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
{
if (wirkfeldkennung > 32767)
{
ERROR_LOG(m_logger) << "DeaktivierungEinzelmine: wirkfeldkennung=" << wirkfeldkennung << " too big. Must be 1..32767";
ERROR_LOG() << "DeaktivierungEinzelmine: wirkfeldkennung=" << wirkfeldkennung << " too big. Must be 1..32767";
return false;
}
}
@@ -1310,7 +1310,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
if (funktionsraumkennung > 0)
return true;
ERROR_LOG(m_logger) << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
ERROR_LOG() << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
return false;
}
case GEF_EINTRETEN_FUNKTIONSRAUM:
@@ -1320,7 +1320,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
if (funktionsraumkennung > 0)
return true;
ERROR_LOG(m_logger) << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
ERROR_LOG() << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
return false;
}
return false;
@@ -1331,7 +1331,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
if (sprache <= 3)
return true;
ERROR_LOG(m_logger) << "Sprache (" << sprache << ") of telegram with telId=" << getTelID() << " is invalid. Must be 0..3.";
ERROR_LOG() << "Sprache (" << sprache << ") of telegram with telId=" << getTelID() << " is invalid. Must be 0..3.";
return false;
}
@@ -1382,7 +1382,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
if (length >= MIN_LENGTH)
return true;
ERROR_LOG(m_logger) << "The payload-length of telegram with telId=" << getTelID() << " must be at least " << MIN_LENGTH << ", but it is only " << length;
ERROR_LOG() << "The payload-length of telegram with telId=" << getTelID() << " must be at least " << MIN_LENGTH << ", but it is only " << length;
return false;
}
@@ -1479,7 +1479,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
uint16_t expectedLength = dataSize + a_minLength;
if (expectedLength != length)
{
WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
WARNING_LOG() << "The payload-length of telegram with telId: "
<< getTelID() << " must be " << expectedLength
<< ", but it is " << length << " (the amount of variable data in telegram was "
<< dataAmount << " => " << dataSize << " bytes)";
@@ -1488,7 +1488,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
}
else
{
WARNING_LOG(m_logger) << "The payload-length of telegram with telId: " << getTelID()
WARNING_LOG() << "The payload-length of telegram with telId: " << getTelID()
<< " must be at least " << a_minLength << ", but it is only " << length;
return false;
}
@@ -1504,7 +1504,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
const uint16_t length = getPayloadSize();
if (length < a_minLength)
{
WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
WARNING_LOG() << "The payload-length of telegram with telId: "
<< getTelID() << " must be greater or equal to "
<< a_minLength << ", but it is " << length;
return false;
@@ -1512,7 +1512,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
if (length > a_maxLength)
{
WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
WARNING_LOG() << "The payload-length of telegram with telId: "
<< getTelID() << " must be fewer than "
<< a_minLength << ", but it is " << length;
return false;
@@ -1526,7 +1526,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_length) const
if (length == a_length)
return true;
WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
WARNING_LOG() << "The payload-length of telegram with telId: "
<< getTelID() << " must be "
<< a_length << ", but it is " << length;
return false;
@@ -1538,7 +1538,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(const std::vector<uint16_t> &a_len
if (std::any_of(a_lengths.begin(), a_lengths.end(), [length](int len) { return len == length;}))
return true;
WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
WARNING_LOG() << "The payload-length of telegram with telId: "
<< getTelID() << ", is: " << length;
return false;
}
@@ -1562,7 +1562,7 @@ bool CoPrtCnvRadioTelegram::mustBeSentAsBroadcast(time_t a_currentTime, bool &a_
if (s_2ndDelay >= 0)
{
m_NextSendTime = time(nullptr) + s_2ndDelay;
INFO_LOG(m_logger) << "1st Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
INFO_LOG() << "1st Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
break;
}
++m_BroadcastCounter;
@@ -1571,13 +1571,13 @@ bool CoPrtCnvRadioTelegram::mustBeSentAsBroadcast(time_t a_currentTime, bool &a_
if (s_3rdDelay >= 0)
{
m_NextSendTime = time(nullptr) + s_3rdDelay;
INFO_LOG(m_logger) << "2nd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
INFO_LOG() << "2nd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
break;
}
++m_BroadcastCounter;
Q_FALLTHROUGH();
default:
INFO_LOG(m_logger) << "3rd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
INFO_LOG() << "3rd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
m_NextSendTime = 0;
a_wasLastBroadcast = true;
}
@@ -1643,10 +1643,10 @@ bool CoPrtCnvRadioTelegram::isBroadcastOnly() const
void CoPrtCnvRadioTelegram::setBroadcastonlyTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
{
if (a_radioTelegram != nullptr && m_BroadcastOnlyTelegram != nullptr)
ERROR_LOG(m_logger) << "Internal error: m_BroadcastOnlyTelegram was not nullptr";
ERROR_LOG() << "Internal error: m_BroadcastOnlyTelegram was not nullptr";
if (a_radioTelegram != nullptr)
{
INFO_LOG(m_logger) << "Set braodcastonly-telegram: telId=" << a_radioTelegram->getTelID()
INFO_LOG() << "Set braodcastonly-telegram: telId=" << a_radioTelegram->getTelID()
<< " BC=" << a_radioTelegram->getBroadcastIndex();
}
m_BroadcastOnlyTelegram = a_radioTelegram;
@@ -18,7 +18,7 @@
#include <memory>
#include <vector>
#include <QByteArray>
#include <CoPrtCnv/coprtcnv_export.h>
#include "coprtcnv_export.h"
#include "tetra_telegram_ids.h"
namespace NGL
@@ -595,10 +595,6 @@ protected:
static void setDestISSI_Internal(QByteArray &data, const uint32_t issi);
private:
NGL::INGLLogger &m_logger;
};
}
@@ -13,7 +13,7 @@
#pragma once
#include <CoPrtCnv/coprtcnv_export.h>
#include "coprtcnv_export.h"
namespace TrainingAreaBase
{
@@ -31,8 +31,7 @@ LogViewField::LogViewField(const QString& a_name, const E_FieldKind a_kind, cons
m_HasContent(true),
m_bDeleteXdr(false),
m_Kind(a_kind),
m_XdrElement(a_xdrElement),
m_logger(getLogger("LogViewField"))
m_XdrElement(a_xdrElement)
{
}
@@ -166,7 +165,7 @@ int64_t LogViewField::getHighestValue() const
return highest;
}
default:
ERROR_LOG(m_logger) << "Case not implemented";
ERROR_LOG() << "Case not implemented";
}
return 0;
}
@@ -194,7 +193,7 @@ int64_t LogViewField::getLowestValue() const
return lowest;
}
default:
ERROR_LOG(m_logger) << "Case not implemented";
ERROR_LOG() << "Case not implemented";
break;
}
return 0;
@@ -204,16 +203,16 @@ int64_t LogViewField::getLowestValue() const
void LogViewField::dump(const QString &a_indent) const
{
INFO_LOG(m_logger) << a_indent << "[";
INFO_LOG(m_logger) << a_indent << "Field[" << m_Name << "]: m_Kind=" << m_Kind << " m_Offset=" << m_Offset << " m_Size=" << m_Size << " m_MaxArraySize=" << m_MaxArraySize << " m_IsRightAligned=" << m_IsRightAligned << " m_IsDynamicArray=" << m_IsDynamicArray << " m_ToolTipText=" << m_ToolTipText;
INFO_LOG() << a_indent << "[";
INFO_LOG() << a_indent << "Field[" << m_Name << "]: m_Kind=" << m_Kind << " m_Offset=" << m_Offset << " m_Size=" << m_Size << " m_MaxArraySize=" << m_MaxArraySize << " m_IsRightAligned=" << m_IsRightAligned << " m_IsDynamicArray=" << m_IsDynamicArray << " m_ToolTipText=" << m_ToolTipText;
for (int i=0; i<m_ValueList.size(); i++)
INFO_LOG(m_logger) << a_indent << "m_Value[" << i << "]=" << m_ValueList[i];
INFO_LOG() << a_indent << "m_Value[" << i << "]=" << m_ValueList[i];
for (auto *c : m_Child)
c->dump(a_indent + QLatin1Char(' '));
INFO_LOG(m_logger) << a_indent << "]";
INFO_LOG() << a_indent << "]";
}
@@ -134,9 +134,5 @@ namespace N_LogView
const LogViewXdrElement *m_XdrElement;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -73,7 +73,6 @@ LogViewGui::LogViewGui(QWidget* a_parent)
, m_InjectionThread(nullptr)
, m_replayTimer(new QTimer(this))
, m_currentReplayRow(-1)
, m_logger(getLogger("LogViewGui"))
{
setWindowIcon(QIcon(QLatin1String(":icons/16x16/rde_16x16.png")));
@@ -528,7 +527,7 @@ void LogViewGui::onReplayTimerTimeout()
return;
uint64_t nextSendTime = (tele->getLogTimeMsec() - curSendTime);
DEBUG_LOG(m_logger) << "Next SendTime: " << nextSendTime
DEBUG_LOG() << "Next SendTime: " << nextSendTime
<< ", telId: " << tele->getTelId()
<< ", next row: " << m_currentReplayRow
<< ", equipNo: " << tele->getParticipantId();
@@ -546,7 +545,7 @@ void LogViewGui::loadSpecificationFiles()
QString defString = QCoreApplication::applicationDirPath() + QLatin1String("/training_area_telegrams.h");
QString filename = settings.value(LogViewOptionDialog::P0_FILENAME, defString).toString();
INFO_LOG(m_logger) << "Load central-protocol spezification-file: " << filename.toStdString();
INFO_LOG() << "Load central-protocol spezification-file: " << filename.toStdString();
if (!QFile::exists(filename))
{
QMessageBox::warning(this, tr("LogView"), tr("Die Spezifikations-Datei \'%1\' fuer Zentral-Telegramme existiert nicht!<br><br>Werde die Default-Datei verwenden...").arg(filename));
@@ -557,7 +556,7 @@ void LogViewGui::loadSpecificationFiles()
defString = QCoreApplication::applicationDirPath() + QLatin1String("/zsksxd_tetraForLogView.x");
filename = settings.value(LogViewOptionDialog::P5_FILENAME, defString).toString();
INFO_LOG(m_logger) << "Load tetra-protocol spezification-file: " << filename.toStdString();
INFO_LOG() << "Load tetra-protocol spezification-file: " << filename.toStdString();
if (!QFile::exists(filename))
{
QMessageBox::warning(this, tr("LogView"), tr("Die Spezifikations-Datei \'%1\' fuer TETRA-Telegramme existiert nicht!<br><br>Werde die Default-Datei verwenden...").arg(filename));
@@ -566,7 +565,7 @@ void LogViewGui::loadSpecificationFiles()
LogViewTelegram::tetraParser()->parseX_File(filename);
INFO_LOG(m_logger) << "Browse telegram-log-file";
INFO_LOG() << "Browse telegram-log-file";
newTelegramFile();
}
@@ -636,7 +635,7 @@ void LogViewGui::updateLogfile()
}
catch (const std::exception& e)
{
WARNING_LOG(m_logger) << "Error: " << e.what();
WARNING_LOG() << "Error: " << e.what();
}
}
@@ -716,7 +715,7 @@ void LogViewGui::readTelegramsFromLogFile(const QString& a_fileName, const qint6
if (!telegram->isValid())
{
ERROR_LOG(m_logger) << "Trying to read/parse unknown data from logfile '" << a_fileName
ERROR_LOG() << "Trying to read/parse unknown data from logfile '" << a_fileName
<< "' at position " << telegramFile.pos() - (telegramLength + sizeof(lh));
continue;
}
@@ -729,7 +728,7 @@ void LogViewGui::readTelegramsFromLogFile(const QString& a_fileName, const qint6
else
{
QMessageBox::warning(this, tr("Falsche Version"), tr("LogViewer kann Telegramm-Logs der Version %1 nicht einlesen").arg(lh.m_Version));
ERROR_LOG(m_logger) << "Trying to read/parse unknown data from logfile '" << a_fileName
ERROR_LOG() << "Trying to read/parse unknown data from logfile '" << a_fileName
<< "' at position " << telegramFile.pos() - sizeof(lh);
}
}
@@ -122,8 +122,6 @@ protected:
QAction *m_reloadAction;
QTimer *m_replayTimer;
int m_currentReplayRow;
NGL::INGLLogger &m_logger;
protected:
void readTelegramsFromLogFile(const QString& a_fileName, const qint64 a_filePos = 0);
@@ -28,7 +28,6 @@ LogViewInjectionThread::LogViewInjectionThread()
, m_SendingPossible(false)
, m_Socket(nullptr)
, m_Timer(nullptr)
, m_logger(getLogger("LogViewInjectionThread"))
{
QSettings settings;
@@ -96,7 +95,7 @@ void LogViewInjectionThread::tryToConnect()
m_Timer->setInterval(3000);
m_Timer->start();
INFO_LOG(m_logger) << "Try to connect to injection-server of TETRA-If (" << m_Hostname << ":" << m_Port << ")";
INFO_LOG() << "Try to connect to injection-server of TETRA-If (" << m_Hostname << ":" << m_Port << ")";
m_Socket->connectToHost(m_Hostname, m_Port);
}
@@ -104,7 +103,7 @@ void LogViewInjectionThread::tryToConnect()
void LogViewInjectionThread::doConnect()
{
INFO_LOG(m_logger) << "LogView has successful connected to injection-server of TETRA-If";
INFO_LOG() << "LogView has successful connected to injection-server of TETRA-If";
m_SendingPossible = true;
m_Timer->stop();
emit updateStatus(QLatin1String(":/image/GreenLamp.png"),
@@ -115,7 +114,7 @@ void LogViewInjectionThread::doConnect()
void LogViewInjectionThread::doDisconnect()
{
INFO_LOG(m_logger) << "LogView was disconnected from injection-server of TETRA-If";
INFO_LOG() << "LogView was disconnected from injection-server of TETRA-If";
m_SendingPossible = false;
emit updateStatus(QLatin1String(":/image/RedLamp.png"),
tr("LogView ist nicht mehr mit TETRA-If-Injection-Server (%1:%2) verbunden").arg(m_Hostname).arg(m_Port));
@@ -126,10 +125,10 @@ void LogViewInjectionThread::doDisconnect()
void LogViewInjectionThread::sendTelegram(LogViewTelegram* a_telegram, const bool a_doSendAsCentralTelegram)
{
INFO_LOG(m_logger) << "inject " << (a_doSendAsCentralTelegram ? "central" : "Tetra") << " telegram";
INFO_LOG() << "inject " << (a_doSendAsCentralTelegram ? "central" : "Tetra") << " telegram";
if (!m_Socket || m_Socket->state() != QAbstractSocket::ConnectedState)
{
ERROR_LOG(m_logger) << "Try to write a telegramm but we are not connected";
ERROR_LOG() << "Try to write a telegramm but we are not connected";
return;
}
N_CoPrtCnv::CoPrtCnvInjectionHeader injectionHeader;
@@ -54,10 +54,6 @@ namespace N_LogView
QTimer *m_Timer;
private:
NGL::INGLLogger &m_logger;
protected:
protected slots:
void tryToConnect();
@@ -73,7 +73,6 @@ LogViewTelegram::LogViewTelegram(const LogViewTelegram &o)
, m_data(o.m_data)
, m_json(o.m_json)
, m_TetraTelegram(nullptr)
, m_logger(getLogger("LogViewTelegram"))
{
if (!m_data.isEmpty())
m_TetraTelegram = new N_CoPrtCnv::CoPrtCnvRadioTelegram(m_data);
@@ -101,7 +100,6 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
, m_LogTime(0)
, m_GpsTime(0)
, m_TetraTelegram(nullptr)
, m_logger(getLogger("LogViewTelegram"))
{
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
if (waitTime > 0)
@@ -145,7 +143,6 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
, m_GpsTime(0)
, m_data(a_telegramData)
, m_TetraTelegram(nullptr)
, m_logger(getLogger("LogViewTelegram"))
{
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
if (waitTime > 0)
@@ -620,7 +617,7 @@ void LogViewTelegram::resetOffset()
m_ActOffset = START_OFFSET_CENTRAL;
break;
default:
ERROR_LOG(m_logger) << "resetOffset is only for Central-Protocol implemented";
ERROR_LOG() << "resetOffset is only for Central-Protocol implemented";
}
}
@@ -1003,7 +1000,7 @@ MemberInformation LogViewTelegram::memberFromStructInformation(const StructInfor
LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString& a_name, uint16_t a_arraySize, const LogViewXdrType* a_parentElement, const bool a_hasContent)
{
DEBUG_LOG(m_logger) << "a_type=" << a_type << " a_name=" << a_name << " a_arraySize=" << a_arraySize;
DEBUG_LOG() << "a_type=" << a_type << " a_name=" << a_name << " a_arraySize=" << a_arraySize;
const LogViewXdrElement* xdrElement = tetraParser()->getElement(a_type);
if (!xdrElement)
return nullptr;
@@ -1041,7 +1038,7 @@ LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString
int arraySize = child->getArraySize();
if (0 == arraySize && !isScalar(child))
{
INFO_LOG(m_logger) << "dyn. array of struc";
INFO_LOG() << "dyn. array of struc";
arraySize = getDynArraySize(m_ActOffset);
isDynArray = true;
}
@@ -1085,7 +1082,7 @@ LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString
else
{
INFO_LOG(m_logger) << "typedef dynamisch";
INFO_LOG() << "typedef dynamisch";
}
maxArraySize = static_cast<const LogViewXdrType*>(xdrElement)->getMaxArraySize();
while (xdrElement->getKind() != LogViewXdrElement::e_KindStandardType)
@@ -1411,10 +1408,10 @@ LogViewField* LogViewTelegram::getContent(const LogViewXdrStandardType* a_standa
const quint64 value = getUIntX(i*size+a_offset, size, byteOrder);
if (8 == size) {
field->addValue(QString::number(xdrToDouble(value)));
INFO_LOG(m_logger) << "value=" << xdrToDouble(value);
INFO_LOG() << "value=" << xdrToDouble(value);
} else {
field->addValue(QString::number(xdrToFloat(value)));
INFO_LOG(m_logger) << "value=" << xdrToFloat(value);
INFO_LOG() << "value=" << xdrToFloat(value);
}
}
field->setIsRightAligned(true);
@@ -1443,7 +1440,7 @@ LogViewField* LogViewTelegram::getContent(const LogViewXdrStandardType* a_standa
break;
default:
ERROR_LOG(m_logger) << "ValueKind " << a_standardType->getValueKind() << " not implemented!";
ERROR_LOG() << "ValueKind " << a_standardType->getValueKind() << " not implemented!";
break;
}
uint16_t sizeOfContent = arraySize * size;
@@ -1615,7 +1612,7 @@ bool LogViewTelegram::isScalar(const LogViewXdrType* a_xdrType) const
default:
ERROR_LOG(m_logger) << "name=" << xdrElement->getName().toStdString() << " kind=" << xdrElement->getKind() << " case not implemented!";
ERROR_LOG() << "name=" << xdrElement->getName().toStdString() << " kind=" << xdrElement->getKind() << " case not implemented!";
return false;
}
}
@@ -362,10 +362,6 @@ namespace N_LogView
uint8_t getData(const uint16_t a_offset) const;
private:
NGL::INGLLogger &m_logger;
friend class LogViewTabWidget;
};
@@ -49,7 +49,6 @@ namespace N_LogView
LogViewTelegramDialog::LogViewTelegramDialog(QWidget *a_parent, const bool a_readonly)
: QDialog(a_parent)
, m_ReadOnly(a_readonly)
, m_logger(getLogger("LogViewTelegramDialog"))
{
setAttribute(Qt::WA_DeleteOnClose);
}
@@ -229,7 +228,7 @@ void LogViewTelegramDialog::showTree(LogViewField *a_fieldTree, QGridLayout *a_b
void LogViewTelegramDialog::fillTelegram(LogViewTelegram *a_telegram)
{
INFO_LOG(m_logger) << "******************************************";
INFO_LOG() << "******************************************";
@@ -237,7 +236,7 @@ void LogViewTelegramDialog::fillTelegram(LogViewTelegram *a_telegram)
{
if (!ptr->isValid())
{
INFO_LOG(m_logger) << ptr->field()->name() << " is invalid";
INFO_LOG() << ptr->field()->name() << " is invalid";
return;
}
}
@@ -388,7 +387,7 @@ void LogViewTelegramDialog::showEditField(LogViewField *a_logViewField, QGridLay
if (w)
a_box->addWidget(w, a_box->rowCount() - 1, 1);
else
WARNING_LOG(m_logger) << "Internal error - LogViewWidget is not derived from QWidget... !?";
WARNING_LOG() << "Internal error - LogViewWidget is not derived from QWidget... !?";
break;
}
@@ -69,9 +69,6 @@ private:
QLineEdit *m_NameEdit = nullptr;
QLineEdit *m_WaitTimeEdit = nullptr;
bool m_ReadOnly = false;
NGL::INGLLogger &m_logger;
};
}
@@ -57,7 +57,6 @@ TelegramEdit::TelegramEdit(QWidget *parent)
, m_DoLoop(false)
, m_InjectionThread(nullptr)
, m_EditModel(new TelegramEditModel(this))
, m_logger(getLogger("LogViewTelegramEdit"))
{
m_addTeleAction->setShortcut(tr("Ctrl+A"));
m_editTeleAction->setShortcut(tr("Ctrl+E"));
@@ -300,12 +299,12 @@ void TelegramEdit::injectTelegram(const QSharedPointer<LogViewTelegram> &a_teleg
{
if (!isInjectionPossible())
{
WARNING_LOG(m_logger) << "Try to inject a telegramm but the injection thread is not running";
WARNING_LOG() << "Try to inject a telegramm but the injection thread is not running";
return;
}
if (a_telegram.isNull())
{
WARNING_LOG(m_logger) << "Try to inject a telegramm but no telegramm selected";
WARNING_LOG() << "Try to inject a telegramm but no telegramm selected";
return;
}
a_telegram->actualizeGpsTime();
@@ -546,7 +545,7 @@ void TelegramEdit::loadTelegramList(bool checkAppend)
stream >> waitTime >> name >> gpsFieldOffset >> telegramSize;
if (telegramSize > 0)
{
DEBUG_LOG(m_logger) << "telegramSize=" << telegramSize;
DEBUG_LOG() << "telegramSize=" << telegramSize;
QByteArray buf(telegramSize, Qt::Uninitialized);
stream.readRawData(buf.data(), telegramSize);
NGL::NGLLoggerHelper::hexDumpHelper(m_logger, NGL::LogLevel::Debug, buf);
@@ -60,9 +60,6 @@ protected:
int m_curEditTelegramRow;
TelegramEditModel *m_EditModel;
NGL::INGLLogger &m_logger;
static QString s_DIR();
static QString s_EDIT_TELEGRAM_GROUP();
static QString s_TELEGRAMLIST_FILE_ID();
@@ -80,7 +80,7 @@ bool LogViewTetraTelegramsParser::parse(const QString &filename)
QFile f(filename);
if (!f.open(QIODevice::ReadOnly))
{
WARNING_LOG(m_logger) << "Can not open file " << filename << " for reading: " << f.errorString();
WARNING_LOG() << "Can not open file " << filename << " for reading: " << f.errorString();
return false;
}
@@ -151,7 +151,7 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
{
if (tokens.at(2) != QLatin1String(":"))
{
WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
WARNING_LOG() << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
return -1;
}
@@ -159,7 +159,7 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
{
if (!si.baseStruct.isEmpty())
{
WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
WARNING_LOG() << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
return -1;
}
QStringRef base = tokens.at(i);
@@ -205,13 +205,13 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
if (tokens.size() > parserCommentPos)
{
const QStringRef &comment = tokens.at(parserCommentPos);
DEBUG_LOG(m_logger) << "comment: " << comment.toString();
DEBUG_LOG() << "comment: " << comment.toString();
if (comment.startsWith(QLatin1String("//@array: ")))
{
const QStringRef hint = comment.mid(QLatin1String("//@array: ").size());
QString structStr = QLatin1String("struct ") + si.type + QLatin1String("::") + tokens.at(0).toString() + QLatin1Char('\n') + hint.toString();
structStr.replace(QLatin1Char(';'), QLatin1String(";\n"));
DEBUG_LOG(m_logger) << "structStr: " << structStr;
DEBUG_LOG() << "structStr: " << structStr;
parseStruct(structStr.splitRef(QLatin1Char('\n')), 0);
mi.type = si.type + QLatin1String("::") + tokens.at(0).toString();
@@ -250,13 +250,13 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
if (m_logger.isDebugEnabled())
{
if (si.baseStruct.isEmpty())
DEBUG_LOG(m_logger) << "Found Struct: " << si.type;
DEBUG_LOG() << "Found Struct: " << si.type;
else
DEBUG_LOG(m_logger) << "Found Struct: " << si.type << ", base: " << si.baseStruct;
DEBUG_LOG() << "Found Struct: " << si.type << ", base: " << si.baseStruct;
for (int j = 0; j < si.member.size(); ++j)
{
const MemberInformation &mi = si.member.at(j);
DEBUG_LOG(m_logger) << "Member[" << j << "]: " << mi.type << " - " << mi.name;
DEBUG_LOG() << "Member[" << j << "]: " << mi.type << " - " << mi.name;
}
}
@@ -312,7 +312,7 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
si->member.push_back(std::move(mi));
break;
}
WARNING_LOG(m_logger) << "Could not parse enum: '" << lines.at(i).toString() << "', line: " << i + 1;
WARNING_LOG() << "Could not parse enum: '" << lines.at(i).toString() << "', line: " << i + 1;
return -1;
}
@@ -334,9 +334,9 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
++i;
}
DEBUG_LOG(m_logger) << "Found Enum: " << ei.type;
DEBUG_LOG() << "Found Enum: " << ei.type;
for (const EnumValue &ev : std::as_const(ei.values))
DEBUG_LOG(m_logger) << "Member[" << i << "]: " << ev.key << " = " << ev.value;
DEBUG_LOG() << "Member[" << i << "]: " << ev.key << " = " << ev.value;
if (ei.type == QLatin1String("TelegramId"))
m_telegramIdEnum = ei;
@@ -351,18 +351,18 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
const QVector<QStringRef> tokens = tokenize(lines.at(iStartPos));
if (tokens.size() != 4)
{
WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
WARNING_LOG() << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
return -1;
}
const QStringRef &cs = tokens.at(3);
if (!cs.startsWith(QLatin1String("Constraints<")) || !cs.endsWith(QLatin1Char('>')))
{
WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
WARNING_LOG() << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
return -1;
}
QStringRef structName = cs.mid(QLatin1String("Constraints<").size());
structName.chop(1);
DEBUG_LOG(m_logger) << "Constraint: " << structName.toString();
DEBUG_LOG() << "Constraint: " << structName.toString();
int i = iStartPos + 1;
while (i < lines.size())
@@ -384,7 +384,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
const QVector<QStringRef> parts = tokens.at(6).split(QLatin1String("::"));
if (parts.size() != 2)
{
WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(i).toString() << "'";
WARNING_LOG() << "Could not parse constraint: '" << lines.at(i).toString() << "'";
return -1;
}
@@ -403,7 +403,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
}
if (!bFound)
{
WARNING_LOG(m_logger) << "Could not find enum value '" << enumKey.toString() << "' in enum TelegramId";
WARNING_LOG() << "Could not find enum value '" << enumKey.toString() << "' in enum TelegramId";
return -1;
}
++i;
@@ -461,7 +461,7 @@ QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line
break;
const QStringRef &lastToken = ret.last();
const QStringRef newToken = QStringRef(token.string(), token.position(), lastToken.position() - token.position() + lastToken.size());
DEBUG_LOG(m_logger) << "New Token: " << newToken.toString();
DEBUG_LOG() << "New Token: " << newToken.toString();
ret.resize(i + 1);
ret[i] = newToken;
break;
@@ -478,7 +478,7 @@ QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line
}
const QStringRef &nextToken = ret.at(i + 1);
const QStringRef newToken = QStringRef(token.string(), token.position(), nextToken.position() - token.position() + nextToken.size());
DEBUG_LOG(m_logger) << "New Token: " << newToken.toString();
DEBUG_LOG() << "New Token: " << newToken.toString();
ret.removeAt(i + 1);
ret[i] = newToken;
}
@@ -84,6 +84,5 @@ private:
QHash<QString, StructInformation> m_structs;
QHash<QString, PodInformation> m_pods;
QHash<int, QString> m_visibleTelegrams;
NGL::INGLLogger &m_logger;
};
}
@@ -30,7 +30,6 @@ LogViewWidget::LogViewWidget(LogViewField* a_field, QWidget* a_widget, QWidget*
, m_Widget(a_widget)
, m_Field(a_field)
, m_Parent(a_parent)
, m_logger(getLogger("LogViewWidget"))
{
}
@@ -115,7 +114,7 @@ void LogViewWidget::updateToolTip(const QString &a_text)
break;
}
default:
ERROR_LOG(m_logger) << "Case not implemented";
ERROR_LOG() << "Case not implemented";
}
}
@@ -77,8 +77,6 @@ protected:
LogViewField *m_Field;
QWidget *m_Parent;
NGL::INGLLogger &m_logger;
};
}
@@ -25,13 +25,13 @@ LogViewXdrElement::LogViewXdrElement(const QString& a_name, const E_ElementKind
, m_logger(getLogger(loggerName))
{
if (a_name.indexOf(QLatin1Char('<')) >= 0 || a_name.indexOf(QLatin1Char('[')) >= 0)
ERROR_LOG(m_logger) << "Element \'" << a_name.toStdString() << "\' has a problem";
ERROR_LOG() << "Element \'" << a_name.toStdString() << "\' has a problem";
}
void LogViewXdrElement::dump() const
{
INFO_LOG(m_logger) << "Element[" << getName() << "]: kind=" << getKindName();
INFO_LOG() << "Element[" << getName() << "]: kind=" << getKindName();
}
@@ -54,9 +54,6 @@ namespace N_LogView
QString m_Name;
E_ElementKind m_Kind;
QString getKindName() const;
NGL::INGLLogger &m_logger;
};
}
@@ -37,7 +37,6 @@ LogViewXdrParser::LogViewXdrParser()
, m_WordListIndex(0)
, m_ActElement(nullptr)
, m_State(e_ParseMain)
, m_logger(getLogger("LogViewXdrParser"))
{}
LogViewXdrParser::~LogViewXdrParser()
@@ -389,7 +388,7 @@ void LogViewXdrParser::parseEnum(const QString &a_line, const uint16_t a_enumSiz
if (ok)
m_ActElement->addElement(name, value, LogViewXdrElement::e_KindEnumElement);
else
ERROR_LOG(m_logger) << "Problem with converting text to number: name=" << name.toStdString() << " valueText=" << valueText.toStdString();
ERROR_LOG() << "Problem with converting text to number: name=" << name.toStdString() << " valueText=" << valueText.toStdString();
}
}
break;
@@ -462,7 +461,7 @@ void LogViewXdrParser::parseStruct(const QString &a_line)
uint16_t dynArrayOffset;
uint16_t arraySize = parseArray(name, dynArrayOffset);
if(firstBit >= 0)
DEBUG_LOG(m_logger) << "Add Element " << name
DEBUG_LOG() << "Add Element " << name
<< " with type " << type
<< " array size: " << arraySize
<< " first:last " << firstBit << ":" << lastBit
@@ -684,7 +683,7 @@ int64_t LogViewXdrParser::calcValue(const QString& a_calcText, bool& a_isOk)
default:
break;
}
ERROR_LOG(m_logger) << "Problem with converting '" << a_calcText << "' to integer";
ERROR_LOG() << "Problem with converting '" << a_calcText << "' to integer";
}
else
{
@@ -174,10 +174,6 @@ namespace N_LogView
bool addToElementMap(const QString& a_name, LogViewXdrElement* a_element);
private:
NGL::INGLLogger &m_logger;
};
}
@@ -14,7 +14,7 @@
#include <vector>
#include "IAppComponent.hpp"
#include <PrtCnv/prtcnvlib_export.h>
#include "prtcnvlib_export.h"
namespace NGL {
class Settings;
@@ -58,7 +58,7 @@ void TetraIF::listenMode(const QStringList &args)
m_outputDir = args[0];
if (!QDir().mkpath(m_outputDir))
{
ERROR_LOG(m_logger) << "Error creating directory "
ERROR_LOG() << "Error creating directory "
<< m_outputDir;
usage();
}
@@ -70,26 +70,26 @@ void TetraIF::randomMode(const QStringList &args)
{
if (args.count() < 3)
{
ERROR_LOG(m_logger) << "Invalid argument count";
ERROR_LOG() << "Invalid argument count";
usage();
}
bool bOk;
int dataSize = args[0].toInt(&bOk);
if (!bOk || dataSize > 256 || dataSize < 0)
{
ERROR_LOG(m_logger) << "Invalid data size " << args[0];
ERROR_LOG() << "Invalid data size " << args[0];
usage();
}
m_count = args[1].toInt(&bOk);
if (!bOk || m_count == 0 || m_count < -1)
{
ERROR_LOG(m_logger) << "Invalid count " << args[1];
ERROR_LOG() << "Invalid count " << args[1];
usage();
}
m_telegramsPerSecond = args[2].toInt(&bOk);
if (!bOk || m_telegramsPerSecond < 1)
{
ERROR_LOG(m_logger) << "Invalid telegrams/second " << args[2];
ERROR_LOG() << "Invalid telegrams/second " << args[2];
usage();
}
m_data.reserve(dataSize);
@@ -98,7 +98,7 @@ void TetraIF::randomMode(const QStringList &args)
parseISSIs(args.mid(3));
INFO_LOG(m_logger) << "Sending " << m_data.size()
INFO_LOG() << "Sending " << m_data.size()
<< " bytes, " << m_telegramsPerSecond
<< " telegrams/second for " << m_count
<< " time(s) to issi(s) " << getIssisAsString();
@@ -110,31 +110,31 @@ void TetraIF::fileMode(const QStringList &args)
{
if (args.count() < 3)
{
ERROR_LOG(m_logger) << "Invalid argument count";
ERROR_LOG() << "Invalid argument count";
usage();
}
QFile f(args[0]);
if (!f.exists() || f.size() > 256)
{
ERROR_LOG(m_logger) << "Invalid file: " << args[0];
ERROR_LOG() << "Invalid file: " << args[0];
usage();
}
bool bOk;
m_count = args[1].toInt(&bOk);
if (!bOk || m_count == 0 || m_count < -1)
{
ERROR_LOG(m_logger) << "Invalid count " << args[1];
ERROR_LOG() << "Invalid count " << args[1];
usage();
}
m_telegramsPerSecond = args[2].toInt(&bOk);
if (!bOk || m_telegramsPerSecond < 1)
{
ERROR_LOG(m_logger) << "Invalid telegrams/second " << args[2];
ERROR_LOG() << "Invalid telegrams/second " << args[2];
usage();
}
if (!f.open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Error opening file "
ERROR_LOG() << "Error opening file "
<< f.fileName()
<< " for reading - error: "
<< f.errorString();
@@ -143,7 +143,7 @@ void TetraIF::fileMode(const QStringList &args)
parseISSIs(args.mid(3));
INFO_LOG(m_logger) << "Sending " << m_data.size()
INFO_LOG() << "Sending " << m_data.size()
<< " bytes, " << m_telegramsPerSecond
<< " telegrams/second for " << m_count
<< " time(s) to issi(s) " << getIssisAsString();
@@ -164,13 +164,13 @@ void TetraIF::usage()
void TetraIF::onConnected()
{
INFO_LOG(m_logger) << "Connected to " << m_socket->peerName() << ":" << m_socket->peerPort();
INFO_LOG() << "Connected to " << m_socket->peerName() << ":" << m_socket->peerPort();
doInitialLogin();
}
void TetraIF::onDisconnected()
{
INFO_LOG(m_logger) << "Disconnected - exiting application";
INFO_LOG() << "Disconnected - exiting application";
QCoreApplication::quit();
}
@@ -178,7 +178,7 @@ void TetraIF::onReadyRead()
{
do
{
DEBUG_LOG(m_logger) << "Got " << m_socket->bytesAvailable() << " bytes from socket";
DEBUG_LOG() << "Got " << m_socket->bytesAvailable() << " bytes from socket";
N_CoPrtCnv::CoPrtCnvRadioTelegram::PrtCnvRadioGwHeader header;
if (m_socket->bytesAvailable() < int(sizeof(header)))
@@ -187,14 +187,14 @@ void TetraIF::onReadyRead()
m_socket->peek(reinterpret_cast<char *>(&header), sizeof(header));
if (N_CoPrtCnv::CoPrtCnvRadioTelegram::MAGIC_NUMBER != header.m_MagicNumber)
{
ERROR_LOG(m_logger) << "Incorrect magic number (0x"
ERROR_LOG() << "Incorrect magic number (0x"
<< QString::number(header.m_MagicNumber, 16)
<< " - aborting";
exit(2);
}
if (!N_CoPrtCnv::CoPrtCnvRadioTelegram::isTelegramLengthOk(header.m_Length))
{
ERROR_LOG(m_logger) << "Radio-Telegram length to big: "
ERROR_LOG() << "Radio-Telegram length to big: "
<< header.m_Length
<< ", but I proceed with this telegram.";
}
@@ -202,7 +202,7 @@ void TetraIF::onReadyRead()
const quint16 dataSize = header.m_Length + sizeof(header);
if (m_socket->bytesAvailable() < dataSize)
{
INFO_LOG(m_logger) << "not enough bytes available - waiting for more data";
INFO_LOG() << "not enough bytes available - waiting for more data";
return;
}
QByteArray buf(dataSize, Qt::Uninitialized);
@@ -215,7 +215,7 @@ void TetraIF::onReadyRead()
void TetraIF::onError(QAbstractSocket::SocketError err)
{
ERROR_LOG(m_logger) << "Socket error "
ERROR_LOG() << "Socket error "
<< err
<< " ("
<< m_socket->errorString()
@@ -259,7 +259,7 @@ void TetraIF::handleReceivedTelegram(const QByteArray &data)
default:
return;
}
INFO_LOG(m_logger) << "PDU Type: " << type;
INFO_LOG() << "PDU Type: " << type;
dumpData(data);
}
@@ -269,7 +269,7 @@ void TetraIF::handleRegisterRsp(const uint8_t a_registrationStatus)
switch (a_registrationStatus)
{
case N_CoPrtCnv::CoPrtCnvRadioTelegram::e_IssiSuccessfulRegistered:
INFO_LOG(m_logger) << "Valid register response from Tetra ";
INFO_LOG() << "Valid register response from Tetra ";
if (m_timer)
m_timer->start();
return;
@@ -293,7 +293,7 @@ void TetraIF::handleRegisterRsp(const uint8_t a_registrationStatus)
break;
}
ERROR_LOG(m_logger) << logText;
ERROR_LOG() << logText;
exit(2);
}
@@ -308,7 +308,7 @@ void TetraIF::dumpData(const QByteArray &data)
QFile f(m_outputDir + timeStr + QLatin1String(".dat"));
if (!f.open(QIODevice::WriteOnly))
{
ERROR_LOG(m_logger) << "Error opening file "
ERROR_LOG() << "Error opening file "
<< f.fileName()
<< " for writing - error: "
<< f.errorString();
@@ -319,7 +319,7 @@ void TetraIF::dumpData(const QByteArray &data)
if (data.size() > 27)
{
N_CoPrtCnv::CoPrtCnvRadioTelegram tele(data);
INFO_LOG(m_logger) << "Got telegram from "
INFO_LOG() << "Got telegram from "
<< tele.getSrcISSI()
<< " with size "
<< data.size()
@@ -329,7 +329,7 @@ void TetraIF::dumpData(const QByteArray &data)
QFile f(m_outputDir + QStringLiteral("payload-%1-%2.dat").arg(QString::number(tele.getSrcISSI()), timeStr));
if (!f.open(QIODevice::WriteOnly))
{
ERROR_LOG(m_logger) << "Error opening file "
ERROR_LOG() << "Error opening file "
<< f.fileName()
<< " for writing - error: "
<< f.errorString();
@@ -367,14 +367,14 @@ void TetraIF::onSendData()
tele.setSrcISSI(m_issi);
tele.setDestISSI(dest_issi);
tele.setZaehler(s_counter++);
DEBUG_LOG(m_logger) << "Sending " << tele.getSize() << " bytes to Tetra (ISSI: " << dest_issi << ")";
DEBUG_LOG() << "Sending " << tele.getSize() << " bytes to Tetra (ISSI: " << dest_issi << ")";
m_socket->write(tele.data());
}
if (m_count > 0)
{
if (--m_count <= 0)
{
INFO_LOG(m_logger) << "Finsihed";
INFO_LOG() << "Finsihed";
m_socket->disconnectFromHost();
}
}
@@ -397,7 +397,7 @@ void TetraIF::parseISSIs(const QStringList &issiList)
unsigned short issi = issiStr.toUShort(&bOk);
if (!bOk)
{
ERROR_LOG(m_logger) << "Not a valid issi number: " << issiStr;
ERROR_LOG() << "Not a valid issi number: " << issiStr;
usage();
}
m_issiList += issi;
@@ -428,7 +428,7 @@ void TetraIF::handleDataIndReq(const QByteArray &data)
handleLoginTelegram(radioTelegram);
break;
default:
ERROR_LOG(m_logger) << "Unknown payload-status!: " << radioTelegram->getFragmentStatus();
ERROR_LOG() << "Unknown payload-status!: " << radioTelegram->getFragmentStatus();
break;
}
@@ -445,10 +445,10 @@ void TetraIF::handleLoginTelegram(N_CoPrtCnv::CoPrtCnvRadioTelegram *a_loginTele
{
bool sent = sendLoginResponse(issi);
if (sent)
INFO_LOG(m_logger) << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " logged in";
INFO_LOG() << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " logged in";
else
INFO_LOG(m_logger) << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " is NOT logged in";
INFO_LOG() << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " is NOT logged in";
}
}
@@ -464,7 +464,7 @@ bool TetraIF::sendLoginResponse(const uint32_t a_ISSI)
gef_telegramm_id_et telId = a_telegram->isNormalTelegram() ? a_telegram->getTelID() : GEF_BESTAETIGUNG;
INFO_LOG(m_logger) << "Send telegram to radio: telId=" << telId << " wcounter=" << a_telegram->zaehler() << " size= 28";
INFO_LOG() << "Send telegram to radio: telId=" << telId << " wcounter=" << a_telegram->zaehler() << " size= 28";
@@ -57,5 +57,4 @@ protected:
uint8_t m_SendCounter;
QString m_outputDir;
NGL::INGLLogger &m_logger;
};
@@ -54,7 +54,6 @@ PrtCnvApplication::PrtCnvApplication()
: m_Config(nullptr)
, m_exerciseId(0)
, m_accessMutex(QMutex::Recursive)
, m_logger(getLogger("PrtCnvApplication"))
{}
@@ -71,7 +70,7 @@ PrtCnvApplication::~PrtCnvApplication()
void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
{
INFO_LOG(m_logger) << "Wait for others until we can create " << threadIdToString(a_threadId);
INFO_LOG() << "Wait for others until we can create " << threadIdToString(a_threadId);
setConstructed(a_threadId);
switch (a_threadId)
{
@@ -81,7 +80,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
isConstructed(e_Log) &&
isConstructed(e_Injection)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -92,7 +91,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
isConstructed(e_Log) &&
isConstructed(e_Injection)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -101,14 +100,14 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
while (!(isConstructed(e_Radio) &&
isConstructed(e_Central)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
default:
break;
}
INFO_LOG(m_logger) << "Now we can create " << threadIdToString(a_threadId);
INFO_LOG() << "Now we can create " << threadIdToString(a_threadId);
}
@@ -117,7 +116,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
{
INFO_LOG(m_logger) << "Wait for others until we can initialize " << threadIdToString(a_threadId);
INFO_LOG() << "Wait for others until we can initialize " << threadIdToString(a_threadId);
setCreated(a_threadId);
switch (a_threadId)
{
@@ -125,7 +124,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
while (!(isCreated(e_Db) &&
isCreated(e_Radio)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -134,7 +133,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
while (!(isCreated(e_Db) &&
isCreated(e_Central)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -143,14 +142,14 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
while (!(isCreated(e_Radio) &&
isCreated(e_Central)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
default:
break;
}
INFO_LOG(m_logger) << "Now we can initialize " << threadIdToString(a_threadId);
INFO_LOG() << "Now we can initialize " << threadIdToString(a_threadId);
}
@@ -158,7 +157,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
{
INFO_LOG(m_logger) << "Wait for others until we can start " << threadIdToString(a_threadId);
INFO_LOG() << "Wait for others until we can start " << threadIdToString(a_threadId);
setInitialized(a_threadId);
switch (a_threadId)
{
@@ -168,7 +167,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
isStarted(e_Log) &&
isStarted(e_Injection)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -180,7 +179,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
isStarted(e_Injection) &&
isInitialized(e_RadioTraffic)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -190,7 +189,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
isInitialized(e_Central) &&
isStarted(e_Log)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
@@ -199,14 +198,14 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
while (!(isInitialized(e_Radio) &&
isStarted(e_Log)))
{
DEBUG_LOG(m_logger) << "wait...";
DEBUG_LOG() << "wait...";
QThread::sleep(1);
}
break;
default:
break;
}
INFO_LOG(m_logger) << "Now we can start " << threadIdToString(a_threadId);
INFO_LOG() << "Now we can start " << threadIdToString(a_threadId);
}
@@ -19,7 +19,7 @@
#include "logger.h"
#include <nglsettings/nglsettings_settings.h>
#include <QtCore/QMutex>
#include <PrtCnv/prtcnvlib_export.h>
#include "prtcnvlib_export.h"
#include <TrainingAreaBase/training_area_telegrams.h>
@@ -173,8 +173,6 @@ protected:
QString m_dbSchemaName;
QString m_dbUserName;
QString m_dbPassword;
NGL::INGLLogger &m_logger;
};
}
@@ -35,7 +35,6 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr()
, m_IsFullLoad(false)
, m_FinishedBroadcastIndex(0)
, m_FirstBroadcastIndexOfBc1(0)
, m_logger(getLogger("PrtCnvBroadcastMgr"))
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest"))
{
}
@@ -164,7 +163,7 @@ void PrtCnvBroadcastMgr::handleNachforderungBroadcastTelegram(int identity, int
m_claimerArray.emplace_back(identity, broadcastIndex);
return;
}
WARNING_LOG(m_logger) << "NachforderungBroadcast from TNE with id=" << identity
WARNING_LOG() << "NachforderungBroadcast from TNE with id=" << identity
<< ": resetCounter different we have: " << int(m_DbThread->getResetCounter())
<< "; TNE has: " << resetCounter << " => discarded";
}
@@ -181,7 +180,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::getNextBr
DEBUG_LOG(m_logger) << "getNextBroadcastTelegramToSend, startIdx: " << a_beginSearchWithBroadcastIndex;
DEBUG_LOG() << "getNextBroadcastTelegramToSend, startIdx: " << a_beginSearchWithBroadcastIndex;
auto iter = m_BroadcastMap.upper_bound(0 == a_beginSearchWithBroadcastIndex ? m_FinishedBroadcastIndex : a_beginSearchWithBroadcastIndex);
while (iter != m_BroadcastMap.end())
{
@@ -319,7 +318,7 @@ void PrtCnvBroadcastMgr::removeExpiredTelegrams()
return;
auto radioTelegram = iter->second;
INFO_LOG(m_logger) << "Remove expired telegram with telId=" << radioTelegram->getTelID()
INFO_LOG() << "Remove expired telegram with telId=" << radioTelegram->getTelID()
<< " and BC=" << radioTelegram->getBroadcastIndex() << " from BC-list";
uint16_t wirkfeldKennung = radioTelegram->getPayloadDataUInt32(5, 2);
removeWirkfeldTelegrams(wirkfeldKennung);
@@ -536,7 +535,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::createAcc
const int idsToSendNow = m_activatedDusMines.size();
if (idsToSendNow > 500)
{
WARNING_LOG(m_logger) << "More than 500 activated DUS mines in system - this is not allowed!";
WARNING_LOG() << "More than 500 activated DUS mines in system - this is not allowed!";
Q_ASSERT(false);
return {};
}
@@ -670,7 +669,7 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
if (!radioTelegram)
break;
broadcastIndex = radioTelegram->getBroadcastIndex();
INFO_LOG(m_logger) << "Move Broadcast-telegram from DbThread>BroadcastMgr with telId="
INFO_LOG() << "Move Broadcast-telegram from DbThread>BroadcastMgr with telId="
<< radioTelegram->getTelID() << " BC=" << broadcastIndex;
dumpTelegram(m_logger, broadcastIndex, radioTelegram.get());
@@ -697,7 +696,7 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
static int iBroadcastDumpCounter = 0;
if ((iBroadcastDumpCounter++ % 30) == 0)
{
DEBUG_LOG(m_logger) << "Dumping broadcast map:";
DEBUG_LOG() << "Dumping broadcast map:";
for (const auto &it : m_BroadcastMap)
dumpTelegram(m_logger, it.first, it.second.get());
}
@@ -718,14 +717,14 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
{
INFO_LOG(m_logger) << "Move from radioList to bcList: BC=" << a_radioTelegram->getBroadcastIndex()
INFO_LOG() << "Move from radioList to bcList: BC=" << a_radioTelegram->getBroadcastIndex()
<< " telID=" << a_radioTelegram->getTelID();
switch (a_radioTelegram->getTelID())
{
case GEF_INIT:
case GEF_UMGEBUNGS_MELDUNG2:
ERROR_LOG(m_logger) << "Internal error: telegram with telId=" << a_radioTelegram->getTelID() << " should never be a normal broadcast";
ERROR_LOG() << "Internal error: telegram with telId=" << a_radioTelegram->getTelID() << " should never be a normal broadcast";
break;
case GEF_DATENVERKEHR_TDS_SRT:
@@ -755,11 +754,11 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
{
const uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
INFO_LOG(m_logger) << "Adding to braodcast map, Telegram Id: " << a_radioTelegram->getTelID()
INFO_LOG() << "Adding to braodcast map, Telegram Id: " << a_radioTelegram->getTelID()
<< ", kennung: " << wirkfeldKennung;
if (isEffectSimulationIdDeactivated(wirkfeldKennung))
{
INFO_LOG(m_logger) << "Got tele with tel id " << telegramId2String(a_radioTelegram->getTelID())
INFO_LOG() << "Got tele with tel id " << telegramId2String(a_radioTelegram->getTelID())
<< ", wirkfeldkennung: " << wirkfeldKennung << ", bcIndex: " << a_radioTelegram->getBroadcastIndex()
<< " but this effect simulation is already deactivated... ignoring";
dumpTelegram(m_logger, a_radioTelegram->getBroadcastIndex(), a_radioTelegram.get());
@@ -797,7 +796,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
else
{
ERROR_LOG(m_logger) << "Internal error: Got invalid kennung: " << wirkfeldKennung;
ERROR_LOG() << "Internal error: Got invalid kennung: " << wirkfeldKennung;
}
break;
}
@@ -806,7 +805,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
{
auto wirkfeldTyp = static_cast<TrainingAreaBase::TetraIcd::AreaEffectSimulationType>(a_radioTelegram->getPayloadDataUInt32(5, 1));
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
INFO_LOG(m_logger) << "addToBroadcastMap - Wirkfeld Aenderung Bezeichner for type "
INFO_LOG() << "addToBroadcastMap - Wirkfeld Aenderung Bezeichner for type "
<< wirkfeldTyp2Str(wirkfeldTyp) << " - kennung: "
<< wirkfeldKennung;
addWirkfeldTelegram(a_radioTelegram, wirkfeldKennung);
@@ -816,7 +815,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
{
auto wirkfeldTyp = static_cast<TrainingAreaBase::TetraIcd::AreaEffectSimulationType>(a_radioTelegram->getPayloadDataUInt32(5, 1));
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
INFO_LOG(m_logger) << "Deaktivierung Wirkfeld for type "
INFO_LOG() << "Deaktivierung Wirkfeld for type "
<< wirkfeldTyp2Str(wirkfeldTyp) << " - kennung: "
<< wirkfeldKennung << ", bc: " << a_radioTelegram->getBroadcastIndex();
switch (wirkfeldTyp)
@@ -839,13 +838,13 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
else
{
ERROR_LOG(m_logger) << "Internal error: Got invalid kennung: " << wirkfeldKennung;
ERROR_LOG() << "Internal error: Got invalid kennung: " << wirkfeldKennung;
}
break;
case TrainingAreaBase::TetraIcd::AreaEffectSimulationType::FunctionalArea:
default:
ERROR_LOG(m_logger) << "Internal error: WirkfeldTyp " << wirkfeldTyp2Str(wirkfeldTyp) << " in GEF_DEAKTIVIERUNG_WIRKFELD not implemented";
ERROR_LOG() << "Internal error: WirkfeldTyp " << wirkfeldTyp2Str(wirkfeldTyp) << " in GEF_DEAKTIVIERUNG_WIRKFELD not implemented";
}
m_BroadcastMap.insert(std::make_pair(a_radioTelegram->getBroadcastIndex(), a_radioTelegram));
break;
@@ -1000,7 +999,7 @@ int PrtCnvBroadcastMgr::getSammeltelegramIndex(const std::shared_ptr<N_CoPrtCnv:
nbrLength = 2;
break;
default:
ERROR_LOG(m_logger) << "Unknown Sammeltelegram with telId=" << a_sammelTelegram->getTelID();
ERROR_LOG() << "Unknown Sammeltelegram with telId=" << a_sammelTelegram->getTelID();
return -1;
}
@@ -1028,7 +1027,7 @@ void PrtCnvBroadcastMgr::deactivateSingleMine(const std::shared_ptr<N_CoPrtCnv::
{
removeFromActivatedDusMine(minenkennung);
addToDeactivatedDusMine(minenkennung, a_radioTelegram->getBroadcastIndex());
DEBUG_LOG(m_logger) << "Deactivating DUS-Mine: " << minenkennung << ", #deactivated mines: " << m_deactivatedBcIndex2DusMine.size();
DEBUG_LOG() << "Deactivating DUS-Mine: " << minenkennung << ", #deactivated mines: " << m_deactivatedBcIndex2DusMine.size();
removeDusMineDeactivationFromBroadcastMap(minenkennung);
m_BroadcastMap.insert(std::make_pair(a_radioTelegram->getBroadcastIndex(), a_radioTelegram));
}
@@ -1096,24 +1095,24 @@ bool PrtCnvBroadcastMgr::deactivateEinzelmineFromMinensperre(const uint16_t a_wi
bool dummy;
if (radioTelegram->mustBeSentAsBroadcast(std::numeric_limits<time_t>::max(), dummy, false))
{
INFO_LOG(m_logger) << "A normal broadcast-telegram WirkfeldStatusMinensperre still exists";
INFO_LOG() << "A normal broadcast-telegram WirkfeldStatusMinensperre still exists";
return false;
}
return true;
}
else
ERROR_LOG(m_logger) << "Got corrupt telegram WirkfeldstatusMinensperre with nbrOfMines=" << nbrOfMines << " and payloadSize=" << radioTelegram->getPayloadSize();
ERROR_LOG() << "Got corrupt telegram WirkfeldstatusMinensperre with nbrOfMines=" << nbrOfMines << " and payloadSize=" << radioTelegram->getPayloadSize();
}
else
{
ERROR_LOG(m_logger) << "Mine with kennung=" << a_minenKennung << " does not fit into status (nbrOfMines=" << nbrOfMines << ")";
ERROR_LOG() << "Mine with kennung=" << a_minenKennung << " does not fit into status (nbrOfMines=" << nbrOfMines << ")";
}
return true;
}
++iter;
}
ERROR_LOG(m_logger) << "Did not find the WirkfeldStatusMinensperre with kennung=" << a_wirkfeldKennung
ERROR_LOG() << "Did not find the WirkfeldStatusMinensperre with kennung=" << a_wirkfeldKennung
<< ", therefore deactivated mine with kennung=" << a_minenKennung << " could not be updated.";
return true;
}
@@ -1128,7 +1127,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
const uint32_t nbrOfMines = a_radioTelegram->getPayloadDataUInt32(5, 2);
DEBUG_LOG(m_logger) << "Reactivating DUS-Mines, #mines: " << nbrOfMines;
DEBUG_LOG() << "Reactivating DUS-Mines, #mines: " << nbrOfMines;
if (0 == nbrOfMines)
{
@@ -1146,7 +1145,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
for (uint32_t i = 0; i < nbrOfMines; i++)
{
const int dusMineId = a_radioTelegram->getPayloadDataUInt32(7 + 2 * i, 2);
DEBUG_LOG(m_logger) << "Reactivating DUS-Mines, mindId: " << dusMineId;
DEBUG_LOG() << "Reactivating DUS-Mines, mindId: " << dusMineId;
removeDusMineDeactivationFromBroadcastMap(dusMineId);
removeFromDeactivatedDusMine(dusMineId);
addToActivatedDusMine(dusMineId);
@@ -1188,11 +1187,11 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
{
uint16_t mineIndex = radioTelegram->getPayloadDataUInt32(11, 2);
isSameMine = mineIndex == a_minenKennung;
INFO_LOG(m_logger) << "Mine with kennung=" << a_minenKennung << " found: " << isSameMine;
INFO_LOG() << "Mine with kennung=" << a_minenKennung << " found: " << isSameMine;
}
}
else
ERROR_LOG(m_logger) << "Internal error: Only telegrams 'Deaktivierung_Einzelmine' must be called with a_mineKennung. I proceed without respecting mine-kennung...";
ERROR_LOG() << "Internal error: Only telegrams 'Deaktivierung_Einzelmine' must be called with a_mineKennung. I proceed without respecting mine-kennung...";
}
if ((radioTelegram->getTelID() == a_radioTelegram->getTelID() || radioTelegram->getTelID() == a_telId) && isSameMine)
@@ -1206,7 +1205,7 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
}
INFO_LOG(m_logger) << "Add kennung: " << a_wirkfeldKennung
INFO_LOG() << "Add kennung: " << a_wirkfeldKennung
<< " telId=" << a_radioTelegram->getTelID()
<< " BC=" << a_radioTelegram->getBroadcastIndex();
m_WirkfeldTelegramMapByKennung.insert(std::make_pair(a_wirkfeldKennung, a_radioTelegram));
@@ -1224,7 +1223,7 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
void PrtCnvBroadcastMgr::removeWirkfeldTelegrams(const uint16_t a_kennung)
{
INFO_LOG(m_logger) << "Removing all Wirkfeld-Telegrams with kennung=" << a_kennung;
INFO_LOG() << "Removing all Wirkfeld-Telegrams with kennung=" << a_kennung;
auto iter = m_WirkfeldTelegramMapByKennung.find(a_kennung);
while (iter != m_WirkfeldTelegramMapByKennung.end())
@@ -1256,7 +1255,7 @@ void PrtCnvBroadcastMgr::removeFromFunktionsAndBroadcastMaps(const uint16_t a_fu
auto radioTelegram = iter->second;
INFO_LOG(m_logger) << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
INFO_LOG() << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
<< " and BC=" << radioTelegram->getBroadcastIndex();
m_FunktionsraumTelegramMap.erase(iter);
@@ -1282,7 +1281,7 @@ void PrtCnvBroadcastMgr::removeFromTechnikFunktionsAndBroadcastMaps(const uint16
auto radioTelegram = iter->second;
INFO_LOG(m_logger) << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
INFO_LOG() << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
<< " and BC=" << radioTelegram->getBroadcastIndex();
m_TechnikFunktionsraumTelegramMap.erase(iter);
@@ -1306,7 +1305,7 @@ void PrtCnvBroadcastMgr::removeFromWirkfeldAndBroadcastMaps(const std::multimap<
{
auto radioTelegram = a_wirkfeldTelegramMapByKennungIterator->second;
INFO_LOG(m_logger) << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
INFO_LOG() << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
<< ", kennung=" << a_wirkfeldTelegramMapByKennungIterator->first
<< " and BC=" << radioTelegram->getBroadcastIndex()
<< " from byWirkfeldKennung-map";
@@ -1323,7 +1322,7 @@ void PrtCnvBroadcastMgr::removeFromWirkfeldAndBroadcastMaps(const std::multimap<
{
if (iter->second == radioTelegram)
{
INFO_LOG(m_logger) << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
INFO_LOG() << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
<< " also from byTime-map";
m_WirkfeldTelegramMapByTime.erase(iter);
break;
@@ -1413,7 +1412,7 @@ void removeFromMap(T &cont, const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTeleg
void PrtCnvBroadcastMgr::removeFromAllMaps(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
{
INFO_LOG(m_logger) << "Remove telegram with telId=" << a_radioTelegram->getTelID() << " BC=" << a_radioTelegram->getBroadcastIndex();
INFO_LOG() << "Remove telegram with telId=" << a_radioTelegram->getTelID() << " BC=" << a_radioTelegram->getBroadcastIndex();
removeFromBroadcastMap(a_radioTelegram);
@@ -1442,7 +1441,7 @@ void PrtCnvBroadcastMgr::replaceLastTelegramAndAddAtEnd(const std::shared_ptr<N_
{
auto lastRadioTelegram = iter->second;
INFO_LOG(m_logger) << "remove last telegram with telId=" << lastRadioTelegram->getTelID()
INFO_LOG() << "remove last telegram with telId=" << lastRadioTelegram->getTelID()
<< " and BC=" << lastRadioTelegram->getBroadcastIndex();
removeFromBroadcastMap(lastRadioTelegram);
m_LastTelegramMap.erase(iter);
@@ -1451,7 +1450,7 @@ void PrtCnvBroadcastMgr::replaceLastTelegramAndAddAtEnd(const std::shared_ptr<N_
m_BroadcastMap.insert(std::make_pair(a_newRadioTelegram->getBroadcastIndex(), a_newRadioTelegram));
m_LastTelegramMap.insert(std::make_pair(a_newRadioTelegram->getTelID(), a_newRadioTelegram));
INFO_LOG(m_logger) << "New last telegram with with telId=" << a_newRadioTelegram->getTelID()
INFO_LOG() << "New last telegram with with telId=" << a_newRadioTelegram->getTelID()
<< " and BC=" << a_newRadioTelegram->getBroadcastIndex();
}
@@ -1470,7 +1469,7 @@ void PrtCnvBroadcastMgr::moveTelegramInBroadcastMap(const std::shared_ptr<N_CoPr
const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_attachTelegram)
{
INFO_LOG(m_logger) << "Move telId=" << a_radioTelegram->getTelID()
INFO_LOG() << "Move telId=" << a_radioTelegram->getTelID()
<< " from BC=" << a_radioTelegram->getBroadcastIndex()
<< " to BC=" << a_newBroadcastIndex;
removeFromBroadcastMap(a_radioTelegram);
@@ -1480,7 +1479,7 @@ void PrtCnvBroadcastMgr::moveTelegramInBroadcastMap(const std::shared_ptr<N_CoPr
if (a_attachTelegram && (a_attachTelegram->getTelID() != GEF_REAKTIVIERUNG_DUS_MINE))
{
INFO_LOG(m_logger) << "Attach telID=" << a_attachTelegram->getTelID()
INFO_LOG() << "Attach telID=" << a_attachTelegram->getTelID()
<< " to telID=" << a_radioTelegram->getTelID()
<< " BC=" << a_newBroadcastIndex;
a_radioTelegram->setBroadcastonlyTelegram(a_attachTelegram);
@@ -1535,7 +1534,7 @@ void PrtCnvBroadcastMgr::addBroadcastOnlyTelegramToMap(const std::shared_ptr<N_C
if (m_BroadcastMap.end() == iter)
{
INFO_LOG(m_logger) << "Insert telId=" << a_broadcastOnlyTelegram->getTelID()
INFO_LOG() << "Insert telId=" << a_broadcastOnlyTelegram->getTelID()
<< " as broadcastonly telegram with BC=" << broadcastIndex;
a_broadcastOnlyTelegram->setBroadcastOnly();
m_BroadcastMap.insert(std::make_pair(broadcastIndex, a_broadcastOnlyTelegram));
@@ -1543,7 +1542,7 @@ void PrtCnvBroadcastMgr::addBroadcastOnlyTelegramToMap(const std::shared_ptr<N_C
else
{
INFO_LOG(m_logger) << "Add telId=" << a_broadcastOnlyTelegram->getTelID()
INFO_LOG() << "Add telId=" << a_broadcastOnlyTelegram->getTelID()
<< " as broadcastonly telegram to telegramm with BC=" << iter->second->getBroadcastIndex();
iter->second->setBroadcastonlyTelegram(a_broadcastOnlyTelegram);
}
@@ -1561,15 +1560,15 @@ void PrtCnvBroadcastMgr::detachTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtC
{
uint16_t broadcastIndex = a_radioTelegram->getBroadcastIndex();
INFO_LOG(m_logger) << "detach bconly-telegram : telId=" << a_radioTelegram->getTelID() << " BC=" << broadcastIndex;
INFO_LOG() << "detach bconly-telegram : telId=" << a_radioTelegram->getTelID() << " BC=" << broadcastIndex;
if (broadcastOnlyTelegram->getBroadcastIndex() != broadcastIndex)
ERROR_LOG(m_logger) << "Internal error: BC=" << broadcastOnlyTelegram->getBroadcastIndex() << " of attached telegram is not equal BC=" << broadcastIndex;
ERROR_LOG() << "Internal error: BC=" << broadcastOnlyTelegram->getBroadcastIndex() << " of attached telegram is not equal BC=" << broadcastIndex;
auto iter = m_BroadcastMap.find(broadcastIndex);
if (iter != m_BroadcastMap.end())
ERROR_LOG(m_logger) << "Internal error: m_BroadcastMap-entry with BC=" << broadcastIndex << " must not exists";
ERROR_LOG() << "Internal error: m_BroadcastMap-entry with BC=" << broadcastIndex << " must not exists";
else
{
INFO_LOG(m_logger) << "Insert broadcast-only BC=" << broadcastOnlyTelegram->getBroadcastIndex();
INFO_LOG() << "Insert broadcast-only BC=" << broadcastOnlyTelegram->getBroadcastIndex();
broadcastOnlyTelegram->setBroadcastOnly();
m_BroadcastMap.insert(std::make_pair(broadcastIndex, broadcastOnlyTelegram));
}
@@ -1584,7 +1583,7 @@ void PrtCnvBroadcastMgr::detachTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtC
void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
{
WARNING_LOG(m_logger) << "Broadcast-counter reaches maximum => reduce broadcast-list and increment reset-counter";
WARNING_LOG() << "Broadcast-counter reaches maximum => reduce broadcast-list and increment reset-counter";
@@ -1632,7 +1631,7 @@ void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
}
++iter;
}
INFO_LOG(m_logger) << "New BC-index for broadcast-telegram with telId=" << radioTelegram->getTelID() << " BC=" << newBroadcastCounter;
INFO_LOG() << "New BC-index for broadcast-telegram with telId=" << radioTelegram->getTelID() << " BC=" << newBroadcastCounter;
newBroadcastMap.insert(std::make_pair(newBroadcastCounter, radioTelegram));
}
}
@@ -1643,7 +1642,7 @@ void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
cleanAndInit(false);
if (!a_doRestore) m_DbThread->setResetCounter(m_DbThread->getResetCounter() + 1);
WARNING_LOG(m_logger) << "New broadcast-counter=" << newBroadcastCounter << " new reset-counter=" << (int)m_DbThread->getResetCounter();
WARNING_LOG() << "New broadcast-counter=" << newBroadcastCounter << " new reset-counter=" << (int)m_DbThread->getResetCounter();
m_BroadcastIndex = newBroadcastCounter;
}
@@ -1703,7 +1702,7 @@ void PrtCnvBroadcastMgr::incTickAndSetTrafficLoad(const bool a_isHighLoad, const
bool PrtCnvBroadcastMgr::isEffectSimulationIdDeactivated(const uint16_t effectsimulationId) const
{
INFO_LOG(m_logger) << "Checking deactivation for Id " << effectsimulationId;
INFO_LOG() << "Checking deactivation for Id " << effectsimulationId;
return m_deactivatedAesArea2bcIndex.contains(effectsimulationId);
}
@@ -350,9 +350,6 @@ Q_SIGNALS:
void areaEffectSimulationDeactivated(int wirkfeldKennung);
private:
NGL::INGLLogger &m_logger;
NGL::INGLLogger &m_loggerBcRequest;
};
@@ -25,7 +25,6 @@ namespace PrtCnv
PrtCnvInjectionSocket::PrtCnvInjectionSocket()
: m_Socket(nullptr)
, m_Server(nullptr)
, m_logger(getLogger("PrtCnvInjectionSocket"))
{}
PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
@@ -38,7 +37,7 @@ PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
void PrtCnvInjectionSocket::disconnectClient()
{
INFO_LOG(m_logger) << "A client has disconnected from the injection-server";
INFO_LOG() << "A client has disconnected from the injection-server";
emit disconnected(this);
}
@@ -48,7 +47,7 @@ void PrtCnvInjectionSocket::disconnectClient()
void PrtCnvInjectionSocket::processInputData()
{
INFO_LOG(m_logger) << "Injection-server has data received";
INFO_LOG() << "Injection-server has data received";
N_CoPrtCnv::CoPrtCnvInjectionHeader injectionHeader;
qint64 bytesRead = m_Socket->peek((char*)&injectionHeader, sizeof(injectionHeader));
if (sizeof(injectionHeader) == bytesRead)
@@ -59,7 +58,7 @@ void PrtCnvInjectionSocket::processInputData()
qint64 available = m_Socket->bytesAvailable();
if (available < (injectionHeader.m_Size+sizeof(injectionHeader)))
{
INFO_LOG(m_logger) << "not enough bytes available - waiting for more data: "
INFO_LOG() << "not enough bytes available - waiting for more data: "
<< "headersize=" << sizeof(injectionHeader) << " id1="
<< injectionHeader.m_Id1 << " id2=" << injectionHeader.m_Id2
<< " kind=" << (int)injectionHeader.m_Kind << " size="
@@ -86,26 +85,26 @@ void PrtCnvInjectionSocket::processInputData()
if (N_CoPrtCnv::CoPrtCnvInjectionHeader::eCentral == injectionHeader.m_Kind &&
tele->telegramId() != TrainingAreaBase::TetraIcd::TelegramId::DATENVERKEHR_TDS_SRT)
{
INFO_LOG(m_logger) << "Got an injection-central-telegram with telId=" << tele->telegramId();
INFO_LOG() << "Got an injection-central-telegram with telId=" << tele->telegramId();
m_Server->addToCentralList(tele);
}
else
{
INFO_LOG(m_logger) << "Got an injection-radio-telegram with telId=" << tele->telegramId();
INFO_LOG() << "Got an injection-radio-telegram with telId=" << tele->telegramId();
m_Server->addToRadioList(tele);
}
}
break;
default:
ERROR_LOG(m_logger) << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
ERROR_LOG() << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
break;
}
}
}
else
{
ERROR_LOG(m_logger) << "Corrupt injection-telegram received => reconnect";
ERROR_LOG() << "Corrupt injection-telegram received => reconnect";
m_Socket->disconnectFromHost();
}
}
@@ -39,11 +39,6 @@ namespace PrtCnv
QTcpSocket *m_Socket;
PrtCnvInjectionThread *m_Server;
NGL::INGLLogger &m_logger;
protected slots:
@@ -34,7 +34,7 @@ int32_t PrtCnvThread::create(NGL::Settings *settings)
m_currentThreadId = QThread::currentThreadId();
m_Config = settings;
INFO_LOG(m_logger) << "create " << m_Name
INFO_LOG() << "create " << m_Name
<< " - current thread id is " << m_currentThreadId;
return 0;
}
@@ -42,14 +42,14 @@ int32_t PrtCnvThread::create(NGL::Settings *settings)
int32_t PrtCnvThread::init()
{
INFO_LOG(m_logger) << "init " << m_Name;
INFO_LOG() << "init " << m_Name;
return 0;
}
int32_t PrtCnvThread::start()
{
INFO_LOG(m_logger) << "start " << m_Name;
INFO_LOG() << "start " << m_Name;
return 0;
}
@@ -36,10 +36,6 @@ protected:
Qt::HANDLE m_currentThreadId;
NGL::INGLLogger &m_logger;
public:
@@ -33,9 +33,8 @@ PrtCnvThreadStarter::PrtCnvThreadStarter(const PrtCnv::PrtCnvApplication::E_Thre
, m_Application(a_mainApp)
, m_Id(a_id)
, m_settings(new NGL::Settings(configFileName))
, m_logger(getLogger("PrtCnvThreadStarter"))
{
DEBUG_LOG(m_logger) << "Using Config file '" << configFileName << "'";
DEBUG_LOG() << "Using Config file '" << configFileName << "'";
}
@@ -51,7 +50,7 @@ PrtCnvThreadStarter::~PrtCnvThreadStarter()
void PrtCnvThreadStarter::run()
{
INFO_LOG(m_logger) << "Entering event loop for thread " << this << ", id: " << m_Id;
INFO_LOG() << "Entering event loop for thread " << this << ", id: " << m_Id;
switch (m_Id)
{
@@ -91,7 +90,7 @@ void PrtCnvThreadStarter::run()
if (!m_Thread)
{
ERROR_LOG(m_logger) << "Unknown threadId: " << m_Id;
ERROR_LOG() << "Unknown threadId: " << m_Id;
return;
}
@@ -108,7 +107,7 @@ void PrtCnvThreadStarter::run()
exec();
INFO_LOG(m_logger) << "Leaving event loop for thread " << this << ", id: " << m_Id;
INFO_LOG() << "Leaving event loop for thread " << this << ", id: " << m_Id;
delete m_Thread;
m_Thread = nullptr;
}
@@ -41,10 +41,6 @@ protected:
NGL::Settings *m_settings;
NGL::INGLLogger &m_logger;
public:
@@ -49,6 +49,4 @@ protected Q_SLOTS:
protected:
TTSArgs m_ttsArgs;
NGL::INGLLogger &m_logger;
};
@@ -39,7 +39,7 @@ bool TTWorker::init()
if (m_ttsArgs.movs_per_msec < 200)
{
ERROR_LOG(m_logger) << "Invalid value for 'movements per milliseconds'! Please choose a number greater than 200 msecs or equal. Program stopped.";
ERROR_LOG() << "Invalid value for 'movements per milliseconds'! Please choose a number greater than 200 msecs or equal. Program stopped.";
return false;
}
return true;
@@ -77,7 +77,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
{
if (pattern.isEmpty())
{
ERROR_LOG(m_logger) << "INVALID PATTERN - pattern-size < 1";
ERROR_LOG() << "INVALID PATTERN - pattern-size < 1";
exit(8);
}
@@ -91,7 +91,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
if (pattern.isEmpty())
{
ERROR_LOG(m_logger) << "INVALID PATTERN - alias '" << patternAlias << "' is not available in settings file! Program halted.";
ERROR_LOG() << "INVALID PATTERN - alias '" << patternAlias << "' is not available in settings file! Program halted.";
exit(9);
}
}
@@ -126,7 +126,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
return newPatternList;
}
ERROR_LOG(m_logger) << "INVALID PATTERN: '" << strings.at(i) << "'. Cannot start without correct pattern!";
ERROR_LOG() << "INVALID PATTERN: '" << strings.at(i) << "'. Cannot start without correct pattern!";
exit(5);
@@ -137,7 +137,7 @@ void TTWorker::sendLogin(uint32_t eqId, uint32_t issi)
{
N_CoPrtCnv::CoPrtCnvRadioTelegram *tele = new N_CoPrtCnv::CoPrtCnvRadioTelegram(N_CoPrtCnv::CoPrtCnvRadioTelegram::e_LoginRequest, eqId, issi);
DEBUG_LOG(m_logger) << "SEND LOGIN FOR ISSI=" << issi << ", eqId=" << eqId;
DEBUG_LOG() << "SEND LOGIN FOR ISSI=" << issi << ", eqId=" << eqId;
sendTelegram(tele, issi);
}
@@ -147,13 +147,13 @@ void TTWorker::onReadyRead()
qint64 bytesRead = m_socket->peek((char *)&header, sizeof(header));
if (sizeof(header) != bytesRead)
{
DEBUG_LOG(m_logger) << "To few bytes to read from socket";
DEBUG_LOG() << "To few bytes to read from socket";
return;
}
if (N_CoPrtCnv::CoPrtCnvRadioTelegram::MAGIC_NUMBER != header.m_MagicNumber)
{
ERROR_LOG(m_logger) << "Disconnect because radio-Telegram does not begin with magic-number A5: I got "
ERROR_LOG() << "Disconnect because radio-Telegram does not begin with magic-number A5: I got "
<< header.m_MagicNumber;
m_socket->disconnectFromHost();
return;
@@ -161,7 +161,7 @@ void TTWorker::onReadyRead()
if (!N_CoPrtCnv::CoPrtCnvRadioTelegram::isTelegramLengthOk(header.m_Length))
{
WARNING_LOG(m_logger) << "Radio-Telegram length to big: " << header.m_Length
WARNING_LOG() << "Radio-Telegram length to big: " << header.m_Length
<< " - but I proceed with this telegram.";
}
@@ -169,7 +169,7 @@ void TTWorker::onReadyRead()
uint16_t dataSize = header.m_Length + sizeof(header);
if (m_socket->bytesAvailable() < dataSize)
{
DEBUG_LOG(m_logger) << "not enough bytes available - waiting for more data";
DEBUG_LOG() << "not enough bytes available - waiting for more data";
return;
}
QByteArray buf(dataSize, Qt::Uninitialized);
@@ -188,7 +188,7 @@ void TTWorker::onReadyRead()
void TTWorker::handleReceivedTelegram(const QByteArray &data)
{
INFO_LOG(m_logger) << data.size();
INFO_LOG() << data.size();
switch (data.at(4))
{
@@ -203,7 +203,7 @@ void TTWorker::handleReceivedTelegram(const QByteArray &data)
break;
default:
INFO_LOG(m_logger) << "Radio-Telegram with PDU-Type=" << (int)data[4]
INFO_LOG() << "Radio-Telegram with PDU-Type=" << (int)data[4]
<< " not implemented!";
break;
}
@@ -245,7 +245,7 @@ void TTWorker::onSendDeaktivierungEinzelminen()
{
if (m_playerList.isEmpty())
{
ERROR_LOG(m_logger) << "No player for onSendDeaktivierungEinzelminen...";
ERROR_LOG() << "No player for onSendDeaktivierungEinzelminen...";
return;
}
Player *p = m_playerList.at(0);
@@ -334,7 +334,7 @@ void TTWorker::sendTaktischerStatus(uint32_t eqId, uint32_t issi, TrainingAreaBa
{
p->vbg = vbg;
tele.vulnerabilityState = vbg;
DEBUG_LOG(m_logger) << "Player (" << p->eqId << ") - VBG: " << int(vbg);
DEBUG_LOG() << "Player (" << p->eqId << ") - VBG: " << int(vbg);
break;
}
}
@@ -422,7 +422,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
N_CoPrtCnv::CoPrtCnvCentralTelegram *tele = N_CoPrtCnv::CoPrtCnvTelegramConverter::convertToCentral(radioTelegram.data());
TrainingAreaBase::TetraIcd::StateChange sc = TrainingAreaBase::TetraIcd::StateChange::fromJson(tele->jsonData());
delete tele;
DEBUG_LOG(m_logger) << " Try to Resetnd State " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
DEBUG_LOG() << " Try to Resetnd State " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
sc.header.timeStamp = time(nullptr) * 1000;
uint32_t issi = 0;
@@ -435,7 +435,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
}
}
ERROR_LOG(m_logger) << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
ERROR_LOG() << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
sendTelegram(sc, issi);
return;
}
@@ -445,7 +445,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
TrainingAreaBase::TetraIcd::Sanitation sc = TrainingAreaBase::TetraIcd::Sanitation::fromJson(tele->jsonData());
delete tele;
DEBUG_LOG(m_logger) << " Try to Resetnd State " << sc.header.equipmentNumber << " we got procedure: " << sc.proceduresTaken;
DEBUG_LOG() << " Try to Resetnd State " << sc.header.equipmentNumber << " we got procedure: " << sc.proceduresTaken;
sc.header.timeStamp = time(nullptr) * 1000;
uint32_t issi = 0;
@@ -458,7 +458,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
}
}
ERROR_LOG(m_logger) << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << sc.proceduresTaken;
ERROR_LOG() << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << sc.proceduresTaken;
sendTelegram(sc, issi);
return;
}
@@ -521,7 +521,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
if (radioTelegram->isLoginTelegram())
{
DEBUG_LOG(m_logger) << "player cont: " << m_playerList.count();
DEBUG_LOG() << "player cont: " << m_playerList.count();
for (int i = 0; i < m_playerList.count(); i++)
{
Player *p = m_playerList.at(i);
@@ -529,19 +529,19 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
{
if (p->isLogin)
return;
DEBUG_LOG(m_logger) << "Player #" << i << " with eqId=" << p->eqId << " and issi=" << p->issi << " is now logged in.";
DEBUG_LOG() << "Player #" << i << " with eqId=" << p->eqId << " and issi=" << p->issi << " is now logged in.";
p->isLogin = true;
sendBITE(p->eqId, p->issi);
return;
}
}
ERROR_LOG(m_logger) << "Invalid player was logged in. issi: '" << radioTelegram->getDestISSI() << "'";
ERROR_LOG() << "Invalid player was logged in. issi: '" << radioTelegram->getDestISSI() << "'";
return;
}
DEBUG_LOG(m_logger) << "Received unused or invalid telegram with Telegram-ID: " << telID;
DEBUG_LOG() << "Received unused or invalid telegram with Telegram-ID: " << telID;
}
static void fillHeader(char *data, int len)
@@ -606,7 +606,7 @@ void TTWorker::onSendPlayerPositions()
if (!p->isLogin)
{
INFO_LOG(m_logger) << "Player with eqId=" << p->eqId << " and issi=" << p->issi << " is not logged in.";
INFO_LOG() << "Player with eqId=" << p->eqId << " and issi=" << p->issi << " is not logged in.";
break;
}
playerCount++;
@@ -636,7 +636,7 @@ void TTWorker::onSendPlayerPositions()
delete tel;
}
bool bFlushed = m_socket->flush();
INFO_LOG(m_logger) << "Sent " << bytesSent << "bytes (" << playerCount << " players), bFlushed=" << bFlushed;
INFO_LOG() << "Sent " << bytesSent << "bytes (" << playerCount << " players), bFlushed=" << bFlushed;
}
void TTWorker::onSocketError()
@@ -124,5 +124,4 @@ private:
QVector<Player *> m_playerList;
QVector<runningPattern> m_patternList;
QPointF m_generalPosition;
NGL::INGLLogger &m_logger;
};