lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
+34 -35
View File
@@ -43,7 +43,6 @@ HandlerOcData::HandlerOcData(MainHandler *mainHandler,
, m_tabFtc(mainHandler->tabFtc())
, m_currentActiveEvaluationSchemaId(0)
, m_stateInformationTimer(new QTimer(this))
, m_logger(getLogger("HandlerOcData"))
{}
HandlerOcData::~HandlerOcData()
@@ -54,7 +53,7 @@ bool HandlerOcData::init()
// EVL DTC enable
if (!m_evlDtc->enableEvaluationSchema())
{
ERROR_LOG(m_logger) << "Enabling EVL Data-Topics failed.";
ERROR_LOG() << "Enabling EVL Data-Topics failed.";
return false;
}
connect(m_evlDtc.get(), &Evaluations::Interface::Dtc::evaluationSchemaChanged, this, &HandlerOcData::onEvaluationSchemaChanged);
@@ -67,40 +66,40 @@ bool HandlerOcData::init()
// EVL FTC enable
if (!m_evlFtc->enableEvlCommentModify())
{
ERROR_LOG(m_logger) << "Enabling EVL Function-Topics failed.";
ERROR_LOG() << "Enabling EVL Function-Topics failed.";
return false;
}
// Msg FTC enable
if (!m_msgFtc->enableCreateOperatorMessage())
{
ERROR_LOG(m_logger) << "Enabling MSG Function-Topics failed.";
ERROR_LOG() << "Enabling MSG Function-Topics failed.";
return false;
}
if (!m_ppmDtc->enableParticipant())
{
ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
ERROR_LOG() << "Enabling PPM Data-Topics failed.";
return false;
}
if (!m_ppmFtc->enableRegisterParticipant())
{
ERROR_LOG(m_logger) << "Enabling PPM FTC-Topics failed.";
ERROR_LOG() << "Enabling PPM FTC-Topics failed.";
return false;
}
// TAB DTC enable
if (!m_tabDtc->enableOcData())
{
ERROR_LOG(m_logger) << "Enabling TAB Data-Topics failed.";
ERROR_LOG() << "Enabling TAB Data-Topics failed.";
return false;
}
// TAB DTC enable
if (!m_tabDtc->enableConnections())
{
ERROR_LOG(m_logger) << "Enabling TAB Data-Topics failed.";
ERROR_LOG() << "Enabling TAB Data-Topics failed.";
return false;
}
@@ -109,56 +108,56 @@ bool HandlerOcData::init()
// TAB FTC enable
if (!m_tabFtc->enableSendOcData())
{
ERROR_LOG(m_logger) << "Enabling TAB Function-Topics failed.";
ERROR_LOG() << "Enabling TAB Function-Topics failed.";
return false;
}
// Handler aes data
if (!m_handlerOcAesData->init())
{
ERROR_LOG(m_logger) << "Could not initialise HandlerOcAesData.";
ERROR_LOG() << "Could not initialise HandlerOcAesData.";
return false;
}
connect(m_stateInformationTimer, &QTimer::timeout, this, &HandlerOcData::sendStateInformation);
m_stateInformationTimer->setInterval(Settings::stateInformationCycleTime());
INFO_LOG(m_logger) << "Starting StateInformation timer with interval: " << m_stateInformationTimer->interval();
INFO_LOG() << "Starting StateInformation timer with interval: " << m_stateInformationTimer->interval();
m_stateInformationTimer->start();
INFO_LOG(m_logger) << "Initialisation HandlerOcData succesful.";
INFO_LOG() << "Initialisation HandlerOcData succesful.";
return true;
}
void HandlerOcData::onEvlCommentModifyReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG(m_logger) << "Evaluation could not be transmitted to EVL: " << reply.translated();
ERROR_LOG() << "Evaluation could not be transmitted to EVL: " << reply.translated();
else
DEBUG_LOG(m_logger) << "Evaluation successfully transmitted to EVL!";
DEBUG_LOG() << "Evaluation successfully transmitted to EVL!";
}
void HandlerOcData::onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG(m_logger) << "Message could not be created by MSG: " << reply.translated();
ERROR_LOG() << "Message could not be created by MSG: " << reply.translated();
else
DEBUG_LOG(m_logger) << "Message created successfully by MSG!";
DEBUG_LOG() << "Message created successfully by MSG!";
}
void HandlerOcData::onSendOcDataReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG(m_logger) << "Oc data could not be send: " << reply.translated();
ERROR_LOG() << "Oc data could not be send: " << reply.translated();
else
DEBUG_LOG(m_logger) << "Oc data send successfully to TAB!";
DEBUG_LOG() << "Oc data send successfully to TAB!";
}
void HandlerOcData::onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply)
{
if (reply.errorString().size())
ERROR_LOG(m_logger) << "Modify Participant data could not be send: " << reply.errorString();
ERROR_LOG() << "Modify Participant data could not be send: " << reply.errorString();
else
DEBUG_LOG(m_logger) << "Modify Participant data send successfully to ppm!";
DEBUG_LOG() << "Modify Participant data send successfully to ppm!";
}
void HandlerOcData::onEvaluationSchemaChanged(const Evaluations::EvaluationSchema &data, DataModification modType)
@@ -184,7 +183,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
LtsUtils::get1Byte(payload, telegramId);
DEBUG_LOG(m_logger) << "New OcData telegramId: " << telegramId;
DEBUG_LOG() << "New OcData telegramId: " << telegramId;
switch (telegramId)
{
@@ -228,7 +227,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
}
default:
{
INFO_LOG(m_logger) << "OC-data with telegram ID: " << telegramId << " is not by HandlerOcData OSS!";
INFO_LOG() << "OC-data with telegram ID: " << telegramId << " is not by HandlerOcData OSS!";
break;
}
}
@@ -270,7 +269,7 @@ void HandlerOcData::onSituationThreadExit()
{
ThreadOcSituationData *t = qobject_cast<ThreadOcSituationData *>(sender());
INFO_LOG(m_logger) << "Exit O/C-Thread for O/C-Laptop-Id: " << m_situationThreads.key(t);
INFO_LOG() << "Exit O/C-Thread for O/C-Laptop-Id: " << m_situationThreads.key(t);
QMutexLocker l(&m_accessMutex);
m_situationThreads.remove(m_situationThreads.key(t));
@@ -282,7 +281,7 @@ void HandlerOcData::onCentralAesThreadExit()
{
ThreadOcCentralAesData *t = qobject_cast<ThreadOcCentralAesData *>(sender());
INFO_LOG(m_logger) << "Exit CentralAesData-Thread for O/C-Laptop-Id: " << m_centralAesDataThreads.key(t);
INFO_LOG() << "Exit CentralAesData-Thread for O/C-Laptop-Id: " << m_centralAesDataThreads.key(t);
QMutexLocker l(&m_accessMutex);
m_centralAesDataThreads.remove(m_centralAesDataThreads.key(t));
@@ -321,7 +320,7 @@ void HandlerOcData::onSendEquipmentMessageOcRequest(const rti::core::SampleIdent
void HandlerOcData::onEquipmentErrorRequest(const rti::core::SampleIdentity &cookie, const EquipmentErrorRequest &request)
{
ERROR_LOG(m_logger) << "onEquipmentErrorRequest" << request.equipmentNumber();
ERROR_LOG() << "onEquipmentErrorRequest" << request.equipmentNumber();
EquipmentErrorRegistration out;
// out.id(request.requestId());
out.sampleTime(QDateTime::currentMSecsSinceEpoch());
@@ -348,7 +347,7 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
LtsUtils::get2Byte(data, pos, centerEquipmentId);
LtsUtils::get2Byte(data, pos, radius);
DEBUG_LOG(m_logger) << "Request from O/C-Laptop-Id: " << equipmentId
DEBUG_LOG() << "Request from O/C-Laptop-Id: " << equipmentId
<< " centerEquipmentId: " << centerEquipmentId << " radius: " << radius;
}
else
@@ -360,7 +359,7 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
position.lat(tmp);
LtsUtils::get2Byte(data, pos, radius);
DEBUG_LOG(m_logger) << "Request from O/C-Laptop-Id: " << equipmentId
DEBUG_LOG() << "Request from O/C-Laptop-Id: " << equipmentId
<< " center: " << position << " radius: " << radius;
}
bool filterActive = false;
@@ -441,7 +440,7 @@ void HandlerOcData::handleDemandEvaluationSchema(const QByteArray &data, int equ
// ignoring requested schema ID, as we only have one active schema to be send to TA
Evaluations::EvaluationSchema schema = m_evlDtc->evaluationSchema(m_currentActiveEvaluationSchemaId);
DEBUG_LOG(m_logger) << "Sending to equipmentnumber: " << equipmentNumber << " evaluation schmema: " << m_currentActiveEvaluationSchemaId;
DEBUG_LOG() << "Sending to equipmentnumber: " << equipmentNumber << " evaluation schmema: " << m_currentActiveEvaluationSchemaId;
TrainingAreaBase::SendOcDataRequest out;
out.equipmentNumber(equipmentNumber);
@@ -486,7 +485,7 @@ void HandlerOcData::handleEvaluation(const QByteArray &data)
LtsUtils::get2Byte(data, pos, textLength);
out.text(QByteArray(data.mid(pos, textLength)).toStdString());
DEBUG_LOG(m_logger) << "Got new evl comment: " << out;
DEBUG_LOG() << "Got new evl comment: " << out;
m_evlFtc->evlCommentModifyRequest(out, this);
}
@@ -513,7 +512,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
recipientIds[0] = participantId;
else
{
ERROR_LOG(m_logger) << "Recipient equipment number: " << tmp << " is unknown. Aborting creating message.";
ERROR_LOG() << "Recipient equipment number: " << tmp << " is unknown. Aborting creating message.";
return;
}
}
@@ -531,7 +530,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
out.senderId(participantId);
else
{
WARNING_LOG(m_logger) << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
WARNING_LOG() << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
out.senderId(0);
out.senderType(Messaging::AddressType::ObserverController);
}
@@ -545,7 +544,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
// get exerciseId
LtsUtils::get2Byte(data, pos, tmp);
if (tmp == 0)
WARNING_LOG(m_logger) << "Could'n set ExerciseId" << " " << tmp << " set to 0";
WARNING_LOG() << "Could'n set ExerciseId" << " " << tmp << " set to 0";
out.exerciseId(tmp);
// get address type
const QByteArray msg(data.right(data.size() - pos));
@@ -561,7 +560,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
out.message(msg.mid(idx + 1).constData());
}
DEBUG_LOG(m_logger) << "Got new message: " << out;
DEBUG_LOG() << "Got new message: " << out;
m_msgFtc->createOperatorMessageRequest(out, this);
}
@@ -587,7 +586,7 @@ void HandlerOcData::handleEquipmentErrorRegistration(const QByteArray &data)
out.sampleTime(QDateTime::currentMSecsSinceEpoch());
DEBUG_LOG(m_logger) << "Got new error registration: " << out;
DEBUG_LOG() << "Got new error registration: " << out;
m_dts->publish(out);
}
@@ -626,7 +625,7 @@ void HandlerOcData::handleEquipmentRegistration(const QByteArray &data)
req.participantId(participantId);
req.info(part.info());
req.identification(part.identification());
DEBUG_LOG(m_logger) << "Try to register part with id: " << req.participantId() << " and eqNumeber " << req.equipmentNumber();
DEBUG_LOG() << "Try to register part with id: " << req.participantId() << " and eqNumeber " << req.equipmentNumber();
m_ppmFtc->registerParticipantRequest(req, this);
}