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

Complete Qt6/rtiddsgen migration of residual Lts service sources

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-25 20:23:37 +02:00
1 parent e748e82c84
commit a410019553
86 files changed
+1235 -1128
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp
+35 -35
View File
@@ -77,21 +77,21 @@ void ObjectOrder::onPublishData()
EffectShowClient::Order ddsData;
ddsData.id(m_data.id);
ddsData.areaDepth(m_data.areaDepth);
ddsData.areaWidth(m_data.areaWidth);
ddsData.areaRotation(m_data.areaRotation);
ddsData.duration(m_data.duration);
ddsData.idOrder(m_data.idOrder);
ddsData.numOfVolley(m_data.numOfVolley);
ddsData.shotsPerVolley(m_data.shotsPerVolley);
ddsData.id = m_data.id;
ddsData.areaDepth = m_data.areaDepth;
ddsData.areaWidth = m_data.areaWidth;
ddsData.areaRotation = m_data.areaRotation;
ddsData.duration = m_data.duration;
ddsData.idOrder = m_data.idOrder;
ddsData.numOfVolley = m_data.numOfVolley;
ddsData.shotsPerVolley = m_data.shotsPerVolley;
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(m_data.orderConfirmation);
ddsData.orderConfirmation(oc);
ddsData.position(Core::GeoPosition2D(m_data.centerPosition.x(), m_data.centerPosition.y()));
ddsData.lowerLeftPosition(Core::GeoPosition2D(m_data.lowerLeftPosition.x(), m_data.lowerLeftPosition.y()));
ddsData.startTime(m_data.startTime);
ddsData.typeOfOrder(m_data.typeOfOrder);
ddsData.info(m_data.info.toStdString());
ddsData.orderConfirmation = oc;
ddsData.position = Core::GeoPosition2D(m_data.centerPosition.x(), m_data.centerPosition.y());
ddsData.lowerLeftPosition = Core::GeoPosition2D(m_data.lowerLeftPosition.x(), m_data.lowerLeftPosition.y());
ddsData.startTime = m_data.startTime;
ddsData.typeOfOrder = m_data.typeOfOrder;
ddsData.info = m_data.info.toStdString();
INFO_LOG(m_logger) << "Publish EscOrder-data to dds (" << m_data.id << ") ...";
if (oc == EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance)
@@ -116,12 +116,12 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
if ( m_data.typeOfOrder == 1)
{
QString title = QString::fromUtf8(tr_lts("Notification", "DMF Order")); // deutsch Wirkdarstellungen
notif.title(title.toStdString());
notif.title = title.toStdString();
}
else
{
QString title = QString::fromUtf8(tr_lts("Notification", "Relocation Order")); // deutsch Stellungswechsel
notif.title(title.toStdString());
notif.title = title.toStdString();
}
QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://escOrderList/%1'>Open Dialog</a>"));
@@ -131,32 +131,32 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
const QString str = QString::number(m_data.typeOfOrder);
args.emplace_back(str.toStdString());
notif.content(content.toStdString());
notif.contentArgs(args);
notif.timeStamp(m_mainHandler->dds()->currentPartitionTime());
notif.expiryTime(expiryTime);
notif.priority(NotificationManagement::Priority::High);
notif.processedPriority(NotificationManagement::Priority::Low);
notif.messageType(NotificationManagement::MessageType::Info);
notif.exerciseId(m_mainHandler->dds()->getExerciseId());
notif.content = content.toStdString();
notif.contentArgs = args;
notif.timeStamp = m_mainHandler->dds()->currentPartitionTime();
notif.expiryTime = expiryTime;
notif.priority = NotificationManagement::Priority::High;
notif.processedPriority = NotificationManagement::Priority::Low;
notif.messageType = NotificationManagement::MessageType::Info;
notif.exerciseId = m_mainHandler->dds()->getExerciseId();
NotificationManagement::Address wsAddr;
wsAddr.addressId(addressId);
wsAddr.isRead(false);
wsAddr.addressId = addressId;
wsAddr.isRead = false;
QString name = localHostName;
wsAddr.name(name.toStdString());
wsAddr.addressType(NotificationManagement::AddressType::Workstation);
wsAddr.name = name.toStdString();
wsAddr.addressType = NotificationManagement::AddressType::Workstation;
notif.recipientIds().reserve(1);
notif.recipientIds().push_back(wsAddr);
notif.recipientIds.reserve(1);
notif.recipientIds.push_back(wsAddr);
NotificationManagement::Address addrSender;
addrSender.addressId(EffectShowClient::Offset);
addrSender.name(QStringLiteral("svcEffectShowClient").toStdString());
addrSender.addressType(NotificationManagement::AddressType::Service);
notif.sender(addrSender);
addrSender.addressId = EffectShowClient::Offset;
addrSender.name = QStringLiteral("svcEffectShowClient").toStdString();
addrSender.addressType = NotificationManagement::AddressType::Service;
notif.sender = addrSender;
data.notification(notif);
data.notification = notif;
} // end of getCreateNotificationRequestData()
void ObjectOrder::createNotificationRequest()