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

Migrates OcSituation and ServiceManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access in osc, oss and obd services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:47 +02:00
1 parent 95071993f5
commit 3ec4208139
30 files changed
+1000 -1007
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_aes_data.cpp
+34 -34
View File
@@ -158,14 +158,14 @@ void HandlerOcAesData::onIedPositionChanged(const GuezIedManagement::IedPosition
if (mod == DataModification::eRemoved)
return;
GuezIedManagement::Ied ied = m_gimDtc->ied(data.id());
if (ied.id() > 0)
GuezIedManagement::Ied ied = m_gimDtc->ied(data.id);
if (ied.id > 0)
{
if (ied.pairingState().underlying() != GuezIedManagement::IedPairingState::NotPaired)
m_iedPositionsToBeSend.insert(data.id(), data);
if (ied.pairingState != GuezIedManagement::IedPairingState::NotPaired)
m_iedPositionsToBeSend.insert(data.id, data);
}
else
ERROR_LOG(m_logger) << "Got ied position for not existing ID: " << data.id();
ERROR_LOG(m_logger) << "Got ied position for not existing ID: " << data.id;
}
void HandlerOcAesData::onCollectionTimeOutDemandDangerAreas()
@@ -189,7 +189,7 @@ void HandlerOcAesData::sendIedPositions()
}
TrainingAreaBase::SendOcDataRequest req;
req.equipmentNumber(0); // ied positions are always send broadcast
req.equipmentNumber = 0; // ied positions are always send broadcast
QByteArray data, payload;
int cnt = 0;
@@ -201,8 +201,8 @@ void HandlerOcAesData::sendIedPositions()
for (const auto &pos : qAsConst(m_iedPositionsToBeSend))
{
LtsUtils::set2Byte(m_gimDtc->ied(pos.id()).equipmentNumber(), data);
const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position()));
LtsUtils::set2Byte(m_gimDtc->ied(pos.id).equipmentNumber, data);
const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position));
LtsUtils::set3Byte(qRound(relCoord.x()), data);
LtsUtils::set3Byte(qRound(relCoord.y()), data);
@@ -218,7 +218,7 @@ void HandlerOcAesData::sendIedPositions()
DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
DEBUG_LOG(m_logger) << "Compressed Data: " << ba.toHex(' ');
payload.append(ba);
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
m_tabFtc->sendOcDataRequest(req, this);
cnt = 0;
@@ -237,7 +237,7 @@ void HandlerOcAesData::sendIedPositions()
DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
DEBUG_LOG(m_logger) << "Compressed Data: " << qCompress(data).toHex(' ');
payload.append(qCompress(data));
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
m_tabFtc->sendOcDataRequest(req, this);
}
@@ -262,7 +262,7 @@ void HandlerOcAesData::collectionTimeout(OcSituation::AesType type, const std::f
void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
{
TrainingAreaBase::SendOcDataRequest req;
req.equipmentNumber(eqNumber);
req.equipmentNumber = eqNumber;
const QMap<int, AreaEffectSimulation::DangerArea> dangerAreas = m_aesDtc->dangerAreas();
QByteArray data, payload;
@@ -275,18 +275,18 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
for (const auto &dangerArea : dangerAreas)
{
if (dangerArea.effectStateId() >= AreaEffectSimulation::AesEffectState::EsCreated) // do not transfer ended or deleted areas
if (dangerArea.effectStateId >= AreaEffectSimulation::AesEffectState::EsCreated) // do not transfer ended or deleted areas
{
LtsUtils::set2Byte(dangerArea.id(), data);
QByteArray name(QByteArray::fromStdString(dangerArea.name()));
LtsUtils::set2Byte(dangerArea.id, data);
QByteArray name(QByteArray::fromStdString(dangerArea.name));
name.resize(8);
data.append(name);
if (dangerArea.effectStart().is_set())
LtsUtils::set4Byte(dangerArea.effectStart().get() / 1000, data);
if (dangerArea.effectStart.is_set())
LtsUtils::set4Byte(dangerArea.effectStart.get() / 1000, data);
else
LtsUtils::set4Byte(0, data);
LtsUtils::set1Byte(dangerArea.segments().size(), data);
for (const auto &segment : dangerArea.segments())
LtsUtils::set1Byte(dangerArea.segments.size(), data);
for (const auto &segment : dangerArea.segments)
{
const QPointF relCoord(m_positionConverter->relativeFromGeographic(segment));
LtsUtils::set3Byte(qRound(relCoord.y()), data);
@@ -304,7 +304,7 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
DEBUG_LOG(m_logger) << "Compressed Data: " << ba.toHex(' ');
payload.append(ba);
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
m_tabFtc->sendOcDataRequest(req, this);
cnt = 0;
@@ -324,7 +324,7 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
DEBUG_LOG(m_logger) << "Compressed Data: " << qCompress(data).toHex(' ');
payload.append(qCompress(data));
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
m_tabFtc->sendOcDataRequest(req, this);
}
}
@@ -332,7 +332,7 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
void HandlerOcAesData::sendIedsToTab(int eqNumber)
{
TrainingAreaBase::SendOcDataRequest req;
req.equipmentNumber(eqNumber);
req.equipmentNumber = eqNumber;
const QMap<int, GuezIedManagement::Ied> ieds = m_gimDtc->ieds();
QByteArray data, payload;
@@ -345,20 +345,20 @@ void HandlerOcAesData::sendIedsToTab(int eqNumber)
for (const auto &ied : ieds)
{
LtsUtils::set2Byte(ied.equipmentNumber(), data);
LtsUtils::set1Byte(ied.type().underlying(), data);
uint8_t trigger = (uint8_t(ied.tautWireTrigger()) << 3) |
(uint8_t(ied.lightBarrierTrigger()) << 2) |
(uint8_t(ied.switchTrigger()) << 1) |
(uint8_t(ied.remoteTrigger()));
LtsUtils::set2Byte(ied.equipmentNumber, data);
LtsUtils::set1Byte(ied.type, data);
uint8_t trigger = (uint8_t(ied.tautWireTrigger) << 3) |
(uint8_t(ied.lightBarrierTrigger) << 2) |
(uint8_t(ied.switchTrigger) << 1) |
(uint8_t(ied.remoteTrigger));
LtsUtils::set1Byte(trigger, data);
LtsUtils::set1Byte(ied.explosiveForce(), data);
LtsUtils::set1Byte(ied.partyId(), data);
LtsUtils::set1Byte(ied.tacticalState().underlying(), data);
LtsUtils::set1Byte(ied.explosiveForce, data);
LtsUtils::set1Byte(ied.partyId, data);
LtsUtils::set1Byte(ied.tacticalState, data);
// set an initial position, as only paired ieds are updated concurrently
const auto pos = m_gimDtc->iedPosition(ied.id());
const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position()));
const auto pos = m_gimDtc->iedPosition(ied.id);
const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position));
LtsUtils::set3Byte(qRound(relCoord.x()), data);
LtsUtils::set3Byte(qRound(relCoord.y()), data);
@@ -374,7 +374,7 @@ void HandlerOcAesData::sendIedsToTab(int eqNumber)
DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
DEBUG_LOG(m_logger) << "Compressed Data: " << ba.toHex(' ');
payload.append(ba);
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
m_tabFtc->sendOcDataRequest(req, this);
cnt = 0;
@@ -393,7 +393,7 @@ void HandlerOcAesData::sendIedsToTab(int eqNumber)
DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
DEBUG_LOG(m_logger) << "Compressed Data: " << qCompress(data).toHex(' ');
payload.append(qCompress(data));
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
m_tabFtc->sendOcDataRequest(req, this);
}
}