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

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
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
+47 -47
View File
@@ -83,19 +83,19 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
Database::MsgMessageData newMsg;
newMsg.timeStamp = m_ddsHandler->currentPartitionTime();
newMsg.senderId = request.senderId();
newMsg.senderId = request.senderId;
INFO_LOG(m_logger) << "newMsg.senderId=" << newMsg.senderId;
newMsg.subject = QString::fromStdString(request.subject());
newMsg.message = QString::fromStdString(request.message());
newMsg.senderType = request.senderType();
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();
newMsg.senderText = toAddressStr(newMsg.senderType, newMsg.senderId, request.exerciseId());
newMsg.recipientType = request.recipientType();
newMsg.exerciseId = request.exerciseId();
INFO_LOG(m_logger) << "newMsg.senderType.underlying()=" << newMsg.senderType;
newMsg.senderText = toAddressStr(newMsg.senderType, newMsg.senderId, request.exerciseId);
newMsg.recipientType = request.recipientType;
newMsg.exerciseId = request.exerciseId;
QString recipientText;
for (int32_t i : request.recipientIds())
for (int32_t i : request.recipientIds)
{
recipientText.append(toAddressStr(newMsg.recipientType, i, newMsg.exerciseId));
recipientText.append(QString::fromStdString(" "));
@@ -109,7 +109,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
newMsg.recipientText = recipientText;
// Only Operator messages
Core::FunctionReplyObject ret(newMsg.id);
if (newMsg.senderType == Messaging::AddressType_def::type::Operator)
if (newMsg.senderType == Messaging::AddressType::type::Operator)
ret = insertInDbAndPublish(newMsg);
const int correspondingOutboxMsgId = ret.id();
@@ -122,7 +122,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
//if (correspondingOutboxMsgId > 0) // messages received from TETRA dont have a corresponding outbox id
newMsg.correspondingOutboxMessageId = correspondingOutboxMsgId; // can be also 0 - from TETRA
for (const auto recipientId : request.recipientIds())
for (const auto recipientId : request.recipientIds)
{
newMsg.recipientId = recipientId;
newMsg.recipientText = toAddressStr(newMsg.recipientType, newMsg.recipientId, newMsg.exerciseId);
@@ -149,17 +149,17 @@ void HandlerOperatorMessage::onModifyOperatorMessageRequest(const rti::core::Sam
// 4. neu publishen bzw. von dds löschen
// 5. mit ok antworten
auto it = m_dbOperatorMessageData.find(request.id());
auto it = m_dbOperatorMessageData.find(request.id);
if (it == m_dbOperatorMessageData.end())
{
const auto ret = Core::FunctionReplyObject(0, tr_lts("dds", "Could not find message with id %1")).arg(request.id());
const auto ret = Core::FunctionReplyObject(0, tr_lts("dds", "Could not find message with id %1")).arg(request.id);
m_ddsHandler->fts()->modifyOperatorMessageReply(cookie, ret);
return;
}
Database::MsgMessageData data = it.value();
data.isDeleted = request.isDeleted();
data.isSend = request.isSend();
data.isRead = request.isRead();
data.isDeleted = request.isDeleted;
data.isSend = request.isSend;
data.isRead = request.isRead;
const auto ret = modifyDbAndPublish(data);
m_ddsHandler->fts()->modifyOperatorMessageReply(cookie, ret);
@@ -169,21 +169,21 @@ void HandlerOperatorMessage::onModifyOperatorMessageRequest(const rti::core::Sam
OperatorMessage HandlerOperatorMessage::toDdsData(const Database::MsgMessageData &dbData)
{
OperatorMessage ddsData;
ddsData.id(dbData.id);
ddsData.senderId(dbData.senderId);
ddsData.recipientId(dbData.recipientId);
ddsData.exerciseId(dbData.exerciseId);
ddsData.subject(dbData.subject.toStdString());
ddsData.message(dbData.message.toStdString());
ddsData.recipientText(dbData.recipientText.toStdString());
ddsData.senderText(dbData.senderText.toStdString());
ddsData.isRead(dbData.isRead);
ddsData.isSend(dbData.isSend);
ddsData.isDeleted(dbData.isDeleted);
ddsData.senderType(dbData.senderType);
ddsData.recipientType(dbData.recipientType);
ddsData.correspondingOutboxMessageId(dbData.correspondingOutboxMessageId); // can also be 0
ddsData.timeStamp(dbData.timeStamp);
ddsData.id = dbData.id;
ddsData.senderId = dbData.senderId;
ddsData.recipientId = dbData.recipientId;
ddsData.exerciseId = dbData.exerciseId;
ddsData.subject = dbData.subject.toStdString();
ddsData.message = dbData.message.toStdString();
ddsData.recipientText = dbData.recipientText.toStdString();
ddsData.senderText = dbData.senderText.toStdString();
ddsData.isRead = dbData.isRead;
ddsData.isSend = dbData.isSend;
ddsData.isDeleted = dbData.isDeleted;
ddsData.senderType = dbData.senderType;
ddsData.recipientType = dbData.recipientType;
ddsData.correspondingOutboxMessageId = dbData.correspondingOutboxMessageId; // can also be 0
ddsData.timeStamp = dbData.timeStamp;
return ddsData;
} // end of toDdsData()
//-----------------------------------------------------------------------------
@@ -192,12 +192,12 @@ OperatorMessage HandlerOperatorMessage::toDdsData(const Database::MsgMessageData
Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database::MsgMessageData newMsg)
{
// Length Check:
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController)
if (newMsg.recipientType == Messaging::AddressType::type::ObserverController)
{
newMsg.subject = newMsg.subject.left(m_maxSubjectLength);
newMsg.message = newMsg.message.left(m_maxOcContentLength);
}
if (newMsg.recipientType == Messaging::AddressType_def::type::Participant)
if (newMsg.recipientType == Messaging::AddressType::type::Participant)
{
newMsg.subject = newMsg.subject.left(m_maxSubjectLength);
newMsg.message.clear();
@@ -208,8 +208,8 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
m_dbOperatorMessageData.insert(newMsg.id, newMsg);
if ((newMsg.recipientType == Messaging::AddressType_def::type::ObserverController)
|| (newMsg.recipientType == Messaging::AddressType_def::type::Participant))
if ((newMsg.recipientType == Messaging::AddressType::type::ObserverController)
|| (newMsg.recipientType == Messaging::AddressType::type::Participant))
{
int32_t equipmentNumber = m_exercisesHandler->findEquipmentNumber(newMsg.recipientId, newMsg.exerciseId);
@@ -236,7 +236,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
<< " subject=" << subject
<< " message=" << message;
static int s_requestId = 1;
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController)
if (newMsg.recipientType == Messaging::AddressType::type::ObserverController)
{
INFO_LOG(m_logger) << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << " subject " << subject;
m_exercisesHandler->sendOcEquipmentMessage({s_requestId++,
@@ -267,7 +267,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
m_ddsHandler->dts()->publish(toDdsData(newMsg));
INFO_LOG(m_logger) << "insertInDbAndPublish id=" << newMsg.id;
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController && newMsg.recipientId > 0)
if (newMsg.recipientType == Messaging::AddressType::type::ObserverController && newMsg.recipientId > 0)
{
INFO_LOG(m_logger) << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
}
@@ -317,13 +317,13 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
CreateOperatorMessageRequest request;
DEBUG_LOG(m_logger) << "onEquipmentMessageChanged: " << data;
request.senderType() = Messaging::AddressType_def::type::Participant;
request.senderId(data.sender());
DEBUG_LOG(m_logger) << "request.senderId = " << request.senderId();
request.recipientType(Messaging::AddressType_def::type::Operator);
request.recipientIds().push_back(data.receiver());
request.subject() = data.subject();
request.message() = data.text();
request.senderType = Messaging::AddressType::type::Participant;
request.senderId = data.sender;
DEBUG_LOG(m_logger) << "request.senderId = " << request.senderId;
request.recipientType = Messaging::AddressType::type::Operator;
request.recipientIds.push_back(data.receiver);
request.subject = data.subject;
request.message = data.text;
createOperatorMessageRequest(request);
// Todo Fragen, ob die Meldung vom DDS geloescht werden soll.
@@ -332,13 +332,13 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
void HandlerOperatorMessage::onOperatorChanged(const OperatorManagement::User &data)
{
DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
m_operatorMap.insert(data.id(), data.name());
m_operatorMap.insert(data.id, data.name);
} // end of onOperatorChanged
QString HandlerOperatorMessage::toAddressStr(const AddressType addressType, const qint32 addressId, int exerciseId)
{
QString result;
switch (addressType.underlying())
switch (addressType)
{
case AddressType::Operator:
// nicht per Request sondern hier aus OPM holen
@@ -357,7 +357,7 @@ QString HandlerOperatorMessage::toAddressStr(const AddressType addressType, cons
default:
result = QString::fromStdString("No valid addressType:");
QString numberStr ;
numberStr.setNum(addressType.underlying());
numberStr.setNum(addressType);
result.append(numberStr);
}
return result;