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/Messaging/handler_operator_message.cpp
+24 -25
View File
@@ -21,7 +21,6 @@ HandlerOperatorMessage::HandlerOperatorMessage(const std::shared_ptr<DdsHandler>
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_exercisesHandler(exercisesHandler)
, m_logger(getLogger("HandlerOperatorMessage"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -29,7 +28,7 @@ HandlerOperatorMessage::HandlerOperatorMessage(const std::shared_ptr<DdsHandler>
//-----------------------------------------------------------------------------
bool HandlerOperatorMessage::init()
{
INFO_LOG(m_logger) << "Start HandlerOperatorMessage.";
INFO_LOG() << "Start HandlerOperatorMessage.";
// read data from db-table 'msg_message_data'
// add to internal buffer
@@ -42,7 +41,7 @@ bool HandlerOperatorMessage::init()
};
if (!m_db->select(cbMsgData)) // TODO (CE): nicht alle selektieren, nur die, die nicht gelöscht sind
{
ERROR_LOG(m_logger) << "Error reading data from database 'msg_message_data'!";
ERROR_LOG() << "Error reading data from database 'msg_message_data'!";
return false;
}
@@ -67,10 +66,10 @@ bool HandlerOperatorMessage::init()
void HandlerOperatorMessage::onCreateOperatorMessageRequest(const rti::core::SampleIdentity &cookie,
const CreateOperatorMessageRequest &request)
{
DEBUG_LOG(m_logger) << "onCreateOperatorMessageRequest" << request;
DEBUG_LOG() << "onCreateOperatorMessageRequest" << request;
auto ret = createOperatorMessageRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_ddsHandler->fts()->createOperatorMessageReply(cookie, ret);
}
@@ -84,12 +83,12 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
Database::MsgMessageData newMsg;
newMsg.timeStamp = m_ddsHandler->currentPartitionTime();
newMsg.senderId = request.senderId();
INFO_LOG(m_logger) << "newMsg.senderId=" << newMsg.senderId;
INFO_LOG() << "newMsg.senderId=" << newMsg.senderId;
newMsg.subject = QString::fromStdString(request.subject());
newMsg.message = QString::fromStdString(request.message());
newMsg.senderType = request.senderType();
INFO_LOG(m_logger) << "newMsg.senderType.underlying()=" << newMsg.senderType.underlying();
INFO_LOG() << "newMsg.senderType.underlying()=" << newMsg.senderType.underlying();
newMsg.senderText = toAddressStr(newMsg.senderType, newMsg.senderId, request.exerciseId());
newMsg.recipientType = request.recipientType();
newMsg.exerciseId = request.exerciseId();
@@ -103,7 +102,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
newMsg.isRead = false;
newMsg.isDeleted = false;
INFO_LOG(m_logger) << "newMsg.senderType=" << newMsg.senderType << " newMsg.receiverType=" << newMsg.recipientType;
INFO_LOG() << "newMsg.senderType=" << newMsg.senderType << " newMsg.receiverType=" << newMsg.recipientType;
// Insert message for sender
newMsg.recipientId = 0;
newMsg.recipientText = recipientText;
@@ -116,7 +115,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
if (!ret.error() )
{
INFO_LOG(m_logger) << "insert message for each receiver";
INFO_LOG() << "insert message for each receiver";
// Insert message for each receiver
//newMsg.senderId = 0; WHY?
//if (correspondingOutboxMsgId > 0) // messages received from TETRA dont have a corresponding outbox id
@@ -126,14 +125,14 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
{
newMsg.recipientId = recipientId;
newMsg.recipientText = toAddressStr(newMsg.recipientType, newMsg.recipientId, newMsg.exerciseId);
INFO_LOG(m_logger) << "recipientId: " << newMsg.recipientId;
INFO_LOG() << "recipientId: " << newMsg.recipientId;
ret = insertInDbAndPublish(newMsg);
if (ret.error())
break;
}
}
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
return ret;
@@ -202,7 +201,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
newMsg.subject = newMsg.subject.left(m_maxSubjectLength);
newMsg.message.clear();
}
DEBUG_LOG(m_logger) << "newMsg.senderId = " << newMsg.senderId;
DEBUG_LOG() << "newMsg.senderId = " << newMsg.senderId;
if (!m_db->insert(newMsg))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding message to database"));
@@ -215,20 +214,20 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
int32_t equipmentNumber = m_exercisesHandler->findEquipmentNumber(newMsg.recipientId, newMsg.exerciseId);
int32_t participantId = newMsg.recipientId;
INFO_LOG(m_logger) << "equipmentNumber: " << equipmentNumber << ", participantId: " << participantId << ", exerciseId: " << newMsg.exerciseId;
INFO_LOG() << "equipmentNumber: " << equipmentNumber << ", participantId: " << participantId << ", exerciseId: " << newMsg.exerciseId;
// Length Check:
const auto subject = newMsg.subject.toStdString();
const auto message = newMsg.message.toStdString();
INFO_LOG(m_logger) << "Message to OC: subject =" << subject << " Message =" << message;
INFO_LOG() << "Message to OC: subject =" << subject << " Message =" << message;
// only send to Tetra:
if (newMsg.recipientId > 0)
{
int senderId = m_dbOperatorMessageData[newMsg.correspondingOutboxMessageId].senderId;
AddressType senderType = m_dbOperatorMessageData[newMsg.correspondingOutboxMessageId].senderType;
INFO_LOG(m_logger) << "SendEquipmentMessageRequest id =" << newMsg.id;
INFO_LOG(m_logger) << " equipmentNumber=" << equipmentNumber
INFO_LOG() << "SendEquipmentMessageRequest id =" << newMsg.id;
INFO_LOG() << " equipmentNumber=" << equipmentNumber
<< " participantId=" << participantId
<< " newMsg.id=" << newMsg.id
<< " newMsg.senderId=" << senderId
@@ -238,7 +237,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
static int s_requestId = 1;
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController)
{
INFO_LOG(m_logger) << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << " subject " << subject;
INFO_LOG() << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << " subject " << subject;
m_exercisesHandler->sendOcEquipmentMessage({s_requestId++,
{equipmentNumber},
//newMsg.id,
@@ -266,10 +265,10 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
m_ddsHandler->dts()->publish(toDdsData(newMsg));
INFO_LOG(m_logger) << "insertInDbAndPublish id=" << newMsg.id;
INFO_LOG() << "insertInDbAndPublish id=" << newMsg.id;
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController && newMsg.recipientId > 0)
{
INFO_LOG(m_logger) << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
INFO_LOG() << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
}
return Core::FunctionReplyObject(newMsg.id);
@@ -279,7 +278,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
// Modify db and publish
Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Database::MsgMessageData &modMsg)
{
INFO_LOG(m_logger) << "modifyDbAndPublish" << " id=" << modMsg.id <<
INFO_LOG() << "modifyDbAndPublish" << " id=" << modMsg.id <<
" isDeleted=" << modMsg.isDeleted <<
" modMsg.isRead=" << modMsg.isRead <<
" modMsg.isSend=" << modMsg.isSend <<
@@ -292,7 +291,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Datab
m_dbOperatorMessageData[modMsg.id] = modMsg;
if (modMsg.isDeleted)
{
INFO_LOG(m_logger) << "Remove LTS_OperatorMessage from DDS id=" << modMsg.id;
INFO_LOG() << "Remove LTS_OperatorMessage from DDS id=" << modMsg.id;
m_ddsHandler->dts()->removeOperatorMessageByKey(modMsg.id);
}
else
@@ -304,7 +303,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Datab
// Receive from Tetra
void HandlerOperatorMessage::onMesssageFromTrainingArea(const TrainingAreaBase::EquipmentMessage &data)
{
INFO_LOG(m_logger) << "************ onMesssageFromTrainingArea ********************";
INFO_LOG() << "************ onMesssageFromTrainingArea ********************";
onEquipmentMessageChanged(data, DataModification::eAdded);
}
@@ -315,11 +314,11 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
return;
CreateOperatorMessageRequest request;
DEBUG_LOG(m_logger) << "onEquipmentMessageChanged: " << data;
DEBUG_LOG() << "onEquipmentMessageChanged: " << data;
request.senderType() = Messaging::AddressType_def::type::Participant;
request.senderId(data.sender());
DEBUG_LOG(m_logger) << "request.senderId = " << request.senderId();
DEBUG_LOG() << "request.senderId = " << request.senderId();
request.recipientType(Messaging::AddressType_def::type::Operator);
request.recipientIds().push_back(data.receiver());
request.subject() = data.subject();
@@ -331,7 +330,7 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
void HandlerOperatorMessage::onOperatorChanged(const OperatorManagement::User &data)
{
DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
DEBUG_LOG() << "************** onOperatorChanged ";
m_operatorMap.insert(data.id(), data.name());
} // end of onOperatorChanged