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:
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
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user