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/central_aes_data_builder.cpp
+121 -121
View File
@@ -23,16 +23,16 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::EffectCluster &effec
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionCluster); // we send EffectCluster as ExplosionCluster
addAesItemId(byteStream, effectCluster.id());
addName(byteStream, effectCluster.name());
addEffectStart(byteStream, effectCluster.effectStart().is_set() ? effectCluster.effectStart().get() : -1);
addEffectDuration(byteStream, effectCluster.effectDuration());
addArea(byteStream, effectCluster.area());
addMhpCount(byteStream, static_cast<int32_t>(effectCluster.effectors().size()));
addMhpRotation(byteStream, effectCluster.effectors().size() ? effectCluster.effectors()[0].mhpRotation() : 1);
addImpactCount(byteStream, static_cast<int32_t>(effectCluster.effectors().size()));
addChargeTypeId(byteStream, effectCluster.chargeStruct().chargeTypeId());
addPartyId(byteStream, effectCluster.partyId().is_set() ? effectCluster.partyId().get() : -1);
addAesItemId(byteStream, effectCluster.id);
addName(byteStream, effectCluster.name);
addEffectStart(byteStream, effectCluster.effectStart.is_set() ? effectCluster.effectStart.get() : -1);
addEffectDuration(byteStream, effectCluster.effectDuration);
addArea(byteStream, effectCluster.area);
addMhpCount(byteStream, static_cast<int32_t>(effectCluster.effectors.size()));
addMhpRotation(byteStream, effectCluster.effectors.size() ? effectCluster.effectors[0].mhpRotation : 1);
addImpactCount(byteStream, static_cast<int32_t>(effectCluster.effectors.size()));
addChargeTypeId(byteStream, effectCluster.chargeStruct.chargeTypeId);
addPartyId(byteStream, effectCluster.partyId.is_set() ? effectCluster.partyId.get() : -1);
return byteStream;
}
@@ -44,19 +44,19 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::NContamination &nCon
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtNContamination);
addAesItemId(byteStream, nContamination.id());
addName(byteStream, nContamination.name());
addEffectStart(byteStream, nContamination.effectStart().is_set() ? nContamination.effectStart().get() : -1);
addEffectDuration(byteStream, nContamination.effectDuration());
addChargeTypeId(byteStream, nContamination.chargeStruct().chargeTypeId());
addImpactPosition(byteStream, nContamination.impactPosition());
addBorderLengthInner(byteStream, nContamination.borderLengthInner());
addBorderLengthOuter(byteStream, nContamination.borderLengthOuter());
addImpactRadius(byteStream, nContamination.impactRadius());
addSpanAngle(byteStream, nContamination.spanAngle());
addRotationAngle(byteStream, nContamination.rotationAngle());
addDetonationValue(byteStream, nContamination.detonationValue());
addPartyId(byteStream, nContamination.partyId().is_set() ? nContamination.partyId().get() : -1);
addAesItemId(byteStream, nContamination.id);
addName(byteStream, nContamination.name);
addEffectStart(byteStream, nContamination.effectStart.is_set() ? nContamination.effectStart.get() : -1);
addEffectDuration(byteStream, nContamination.effectDuration);
addChargeTypeId(byteStream, nContamination.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, nContamination.impactPosition);
addBorderLengthInner(byteStream, nContamination.borderLengthInner);
addBorderLengthOuter(byteStream, nContamination.borderLengthOuter);
addImpactRadius(byteStream, nContamination.impactRadius);
addSpanAngle(byteStream, nContamination.spanAngle);
addRotationAngle(byteStream, nContamination.rotationAngle);
addDetonationValue(byteStream, nContamination.detonationValue);
addPartyId(byteStream, nContamination.partyId.is_set() ? nContamination.partyId.get() : -1);
return byteStream;
}
@@ -68,16 +68,16 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::BCContamination &bCC
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtBCContamination);
addAesItemId(byteStream, bCContamination.id());
addName(byteStream, bCContamination.name());
addEffectStart(byteStream, bCContamination.effectStart().is_set() ? bCContamination.effectStart().get() : -1);
addEffectDuration(byteStream, bCContamination.effectDuration());
addChargeTypeId(byteStream, bCContamination.chargeStruct().chargeTypeId());
addImpactPosition(byteStream, bCContamination.impactPosition());
addImpactRadius(byteStream, bCContamination.impactRadius());
addPartyId(byteStream, bCContamination.partyId().is_set() ? bCContamination.partyId().get() : -1);
addPropagationDirection(byteStream, bCContamination.propagationDirection());
addWindSpeed(byteStream, bCContamination.windSpeed());
addAesItemId(byteStream, bCContamination.id);
addName(byteStream, bCContamination.name);
addEffectStart(byteStream, bCContamination.effectStart.is_set() ? bCContamination.effectStart.get() : -1);
addEffectDuration(byteStream, bCContamination.effectDuration);
addChargeTypeId(byteStream, bCContamination.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, bCContamination.impactPosition);
addImpactRadius(byteStream, bCContamination.impactRadius);
addPartyId(byteStream, bCContamination.partyId.is_set() ? bCContamination.partyId.get() : -1);
addPropagationDirection(byteStream, bCContamination.propagationDirection);
addWindSpeed(byteStream, bCContamination.windSpeed);
return byteStream;
}
@@ -89,18 +89,18 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionArea &explo
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionArea);
addAesItemId(byteStream, explosionArea.id());
addName(byteStream, explosionArea.name());
addEffectStart(byteStream, explosionArea.effectStart().is_set() ? explosionArea.effectStart().get() : -1);
addEffectDuration(byteStream, explosionArea.effectDuration());
addChargeTypeId(byteStream, explosionArea.chargeStruct().chargeTypeId());
addArea(byteStream, explosionArea.area());
addPartyId(byteStream, explosionArea.partyId().is_set() ? explosionArea.partyId().get() : -1);
addCannonCount(byteStream, explosionArea.cannonCount());
addCannonRounds(byteStream, explosionArea.cannonRounds());
addFireRequestTime(byteStream, explosionArea.fireRequestTime());
addAltitude(byteStream, explosionArea.altitude());
addPurpose(byteStream, explosionArea.purpose());
addAesItemId(byteStream, explosionArea.id);
addName(byteStream, explosionArea.name);
addEffectStart(byteStream, explosionArea.effectStart.is_set() ? explosionArea.effectStart.get() : -1);
addEffectDuration(byteStream, explosionArea.effectDuration);
addChargeTypeId(byteStream, explosionArea.chargeStruct.chargeTypeId);
addArea(byteStream, explosionArea.area);
addPartyId(byteStream, explosionArea.partyId.is_set() ? explosionArea.partyId.get() : -1);
addCannonCount(byteStream, explosionArea.cannonCount);
addCannonRounds(byteStream, explosionArea.cannonRounds);
addFireRequestTime(byteStream, explosionArea.fireRequestTime);
addAltitude(byteStream, explosionArea.altitude);
addPurpose(byteStream, explosionArea.purpose);
return byteStream;
}
@@ -112,15 +112,15 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionSingle &exp
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionSingle);
addAesItemId(byteStream, explosionSingle.id());
addName(byteStream, explosionSingle.name());
addEffectStart(byteStream, explosionSingle.effectStart().is_set() ? explosionSingle.effectStart().get() : -1);
addChargeTypeId(byteStream, explosionSingle.chargeStruct().chargeTypeId());
addImpactPosition(byteStream, explosionSingle.impactPosition());
addPartyId(byteStream, explosionSingle.partyId().is_set() ? explosionSingle.partyId().get() : -1);
addFireRequestTime(byteStream, explosionSingle.fireRequestTime());
addAltitude(byteStream, explosionSingle.altitude());
addPurpose(byteStream, explosionSingle.purpose());
addAesItemId(byteStream, explosionSingle.id);
addName(byteStream, explosionSingle.name);
addEffectStart(byteStream, explosionSingle.effectStart.is_set() ? explosionSingle.effectStart.get() : -1);
addChargeTypeId(byteStream, explosionSingle.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, explosionSingle.impactPosition);
addPartyId(byteStream, explosionSingle.partyId.is_set() ? explosionSingle.partyId.get() : -1);
addFireRequestTime(byteStream, explosionSingle.fireRequestTime);
addAltitude(byteStream, explosionSingle.altitude);
addPurpose(byteStream, explosionSingle.purpose);
return byteStream;
}
@@ -132,18 +132,18 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::MineArea &mineArea,
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtMineArea);
addAesItemId(byteStream, mineArea.id());
addName(byteStream, mineArea.name());
addEffectStart(byteStream, mineArea.effectStart().is_set() ? mineArea.effectStart().get() : -1);
addEffectDuration(byteStream, mineArea.effectDuration());
addDensity(byteStream, mineArea.density());
addWidth(byteStream, mineArea.width());
addChargeTypeId(byteStream, mineArea.chargeStruct().chargeTypeId());
addPartyId(byteStream, mineArea.partyId().is_set() ? mineArea.partyId().get() : -1);
addAesMaLayingProcedureType(byteStream, mineArea.layingProcedureType());
addIsLayedHidden(byteStream, mineArea.isLaidHidden());
addIsCenterLine(byteStream, mineArea.isCenterLine());
addSegments(byteStream, mineArea.segments());
addAesItemId(byteStream, mineArea.id);
addName(byteStream, mineArea.name);
addEffectStart(byteStream, mineArea.effectStart.is_set() ? mineArea.effectStart.get() : -1);
addEffectDuration(byteStream, mineArea.effectDuration);
addDensity(byteStream, mineArea.density);
addWidth(byteStream, mineArea.width);
addChargeTypeId(byteStream, mineArea.chargeStruct.chargeTypeId);
addPartyId(byteStream, mineArea.partyId.is_set() ? mineArea.partyId.get() : -1);
addAesMaLayingProcedureType(byteStream, mineArea.layingProcedureType);
addIsLayedHidden(byteStream, mineArea.isLaidHidden);
addIsCenterLine(byteStream, mineArea.isCenterLine);
addSegments(byteStream, mineArea.segments);
return byteStream;
}
@@ -155,21 +155,21 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::FunctionalArea &func
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtFunctionalArea);
addAesItemId(byteStream, functionalArea.id());
addName(byteStream, functionalArea.name());
addEffectStart(byteStream, functionalArea.effectStart().is_set() ? functionalArea.effectStart().get() : -1);
addEffectDuration(byteStream, functionalArea.effectDuration());
addChargeTypeId(byteStream, functionalArea.chargeStruct().chargeTypeId());
addArea(byteStream, functionalArea.area());
addPartyId(byteStream, functionalArea.partyId().is_set() ? functionalArea.partyId().get() : -1);
addPointSymbol(byteStream, functionalArea.pointSymbol().is_set() ? functionalArea.pointSymbol().get() : std::string());
addFunctionalAreaTypeId(byteStream, functionalArea.functionalAreaTypeId());
addDeconMode(byteStream, functionalArea.deconMode());
addDeconTime(byteStream, functionalArea.deconTime());
addMaintMode(byteStream, functionalArea.maintMode());
addMaintTime(byteStream, functionalArea.maintTime());
addMedicMode(byteStream, functionalArea.medicMode());
addMedicTime(byteStream, functionalArea.medicTime());
addAesItemId(byteStream, functionalArea.id);
addName(byteStream, functionalArea.name);
addEffectStart(byteStream, functionalArea.effectStart.is_set() ? functionalArea.effectStart.get() : -1);
addEffectDuration(byteStream, functionalArea.effectDuration);
addChargeTypeId(byteStream, functionalArea.chargeStruct.chargeTypeId);
addArea(byteStream, functionalArea.area);
addPartyId(byteStream, functionalArea.partyId.is_set() ? functionalArea.partyId.get() : -1);
addPointSymbol(byteStream, functionalArea.pointSymbol.is_set() ? functionalArea.pointSymbol.get() : std::string());
addFunctionalAreaTypeId(byteStream, functionalArea.functionalAreaTypeId);
addDeconMode(byteStream, functionalArea.deconMode);
addDeconTime(byteStream, functionalArea.deconTime);
addMaintMode(byteStream, functionalArea.maintMode);
addMaintTime(byteStream, functionalArea.maintTime);
addMedicMode(byteStream, functionalArea.medicMode);
addMedicTime(byteStream, functionalArea.medicTime);
return byteStream;
}
@@ -181,17 +181,17 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::BoobyTrap &boobyTrap
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtBoobyTrap);
addAesItemId(byteStream, boobyTrap.id());
addName(byteStream, boobyTrap.name());
addEffectDuration(byteStream, boobyTrap.effectDuration());
addChargeTypeId(byteStream, boobyTrap.chargeStruct().chargeTypeId());
addImpactPosition(byteStream, boobyTrap.impactPosition());
addImpactRadius(byteStream, boobyTrap.impactRadius());
addTriggerRadius(byteStream, boobyTrap.triggerRadius());
addRotationAngle(byteStream, boobyTrap.rotationAngle().is_set() ? boobyTrap.rotationAngle().get() : -1);
addCentralAngle(byteStream, boobyTrap.centralAngle().is_set() ? boobyTrap.centralAngle().get() : -1);
addEffectStart(byteStream, boobyTrap.effectStart().is_set() ? boobyTrap.effectStart().get() : -1);
addPartyId(byteStream, boobyTrap.partyId().is_set() ? boobyTrap.partyId().get() : -1);
addAesItemId(byteStream, boobyTrap.id);
addName(byteStream, boobyTrap.name);
addEffectDuration(byteStream, boobyTrap.effectDuration);
addChargeTypeId(byteStream, boobyTrap.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, boobyTrap.impactPosition);
addImpactRadius(byteStream, boobyTrap.impactRadius);
addTriggerRadius(byteStream, boobyTrap.triggerRadius);
addRotationAngle(byteStream, boobyTrap.rotationAngle.is_set() ? boobyTrap.rotationAngle.get() : -1);
addCentralAngle(byteStream, boobyTrap.centralAngle.is_set() ? boobyTrap.centralAngle.get() : -1);
addEffectStart(byteStream, boobyTrap.effectStart.is_set() ? boobyTrap.effectStart.get() : -1);
addPartyId(byteStream, boobyTrap.partyId.is_set() ? boobyTrap.partyId.get() : -1);
return byteStream;
}
@@ -203,14 +203,14 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::OffRouteMine &offRou
isPrioritized = false;
addAesType(byteStream, AreaEffectSimulation::AesType::AtOffRouteMine);
addAesItemId(byteStream, offRouteMine.id());
addName(byteStream, offRouteMine.name());
addEffectDuration(byteStream, offRouteMine.effectDuration());
addChargeTypeId(byteStream, offRouteMine.chargeStruct().chargeTypeId());
addArea(byteStream, offRouteMine.area());
addImpactRadius(byteStream, offRouteMine.impactRadius().is_set() ? offRouteMine.impactRadius().get() : -1);
addEffectStart(byteStream, offRouteMine.effectStart().is_set() ? offRouteMine.effectStart().get() : -1);
addPartyId(byteStream, offRouteMine.partyId().is_set() ? offRouteMine.partyId().get() : -1);
addAesItemId(byteStream, offRouteMine.id);
addName(byteStream, offRouteMine.name);
addEffectDuration(byteStream, offRouteMine.effectDuration);
addChargeTypeId(byteStream, offRouteMine.chargeStruct.chargeTypeId);
addArea(byteStream, offRouteMine.area);
addImpactRadius(byteStream, offRouteMine.impactRadius.is_set() ? offRouteMine.impactRadius.get() : -1);
addEffectStart(byteStream, offRouteMine.effectStart.is_set() ? offRouteMine.effectStart.get() : -1);
addPartyId(byteStream, offRouteMine.partyId.is_set() ? offRouteMine.partyId.get() : -1);
return byteStream;
}
@@ -220,18 +220,18 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionCluster &ex
QByteArray byteStream;
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionCluster);
addAesItemId(byteStream, explosionCluster.id());
addName(byteStream, explosionCluster.name());
addEffectStart(byteStream, explosionCluster.effectStart().is_set() ? explosionCluster.effectStart().get() : -1);
addEffectDuration(byteStream, explosionCluster.effectDuration());
addArea(byteStream, explosionCluster.area());
addMhpCount(byteStream, static_cast<int32_t>(explosionCluster.mhPoints().size()));
addMhpRotation(byteStream, explosionCluster.mhpRotation());
addImpactCount(byteStream, explosionCluster.impactCount());
addChargeTypeId(byteStream, explosionCluster.chargeStruct().chargeTypeId());
addPartyId(byteStream, explosionCluster.partyId().is_set() ? explosionCluster.partyId().get() : -1);
addAesItemId(byteStream, explosionCluster.id);
addName(byteStream, explosionCluster.name);
addEffectStart(byteStream, explosionCluster.effectStart.is_set() ? explosionCluster.effectStart.get() : -1);
addEffectDuration(byteStream, explosionCluster.effectDuration);
addArea(byteStream, explosionCluster.area);
addMhpCount(byteStream, static_cast<int32_t>(explosionCluster.mhPoints.size()));
addMhpRotation(byteStream, explosionCluster.mhpRotation);
addImpactCount(byteStream, explosionCluster.impactCount);
addChargeTypeId(byteStream, explosionCluster.chargeStruct.chargeTypeId);
addPartyId(byteStream, explosionCluster.partyId.is_set() ? explosionCluster.partyId.get() : -1);
isPrioritized = explosionCluster.impactCount() == 1; // we prioritize every single fire
isPrioritized = explosionCluster.impactCount == 1; // we prioritize every single fire
return byteStream;
}
@@ -251,7 +251,7 @@ void addAesType(QByteArray &buf, const AreaEffectSimulation::AesType &aesType)
using namespace AreaEffectSimulation;
// we treat EffectClusters as ExplosionClusters
addDdsEnumVal(buf, aesType == AesType::inner_enum::AtEffectCluster ? AesType::inner_enum::AtExplosionCluster : aesType);
addDdsEnumVal(buf, aesType == AesType::AtEffectCluster ? AesType::AtExplosionCluster : aesType);
}
void addAltitude(QByteArray &buf, int32_t altitude)
@@ -261,10 +261,10 @@ void addAltitude(QByteArray &buf, int32_t altitude)
void addArea(QByteArray &buf, const AreaEffectSimulation::Area &area)
{
addPosition2D(buf, area.cornerBottomLeft());
LtsUtils::set8Byte(area.width(), buf);
LtsUtils::set8Byte(area.height(), buf);
LtsUtils::set8Byte(area.rotation(), buf);
addPosition2D(buf, area.cornerBottomLeft);
LtsUtils::set8Byte(area.width, buf);
LtsUtils::set8Byte(area.height, buf);
LtsUtils::set8Byte(area.rotation, buf);
}
void addBorderLengthInner(QByteArray &buf, double borderLengthInner)
@@ -305,7 +305,7 @@ void addChargeTypeId(QByteArray &buf, int32_t chargeType)
template<typename T>
void addDdsEnumVal(QByteArray &buf, const T &ddsEnumVal)
{
LtsUtils::set4Byte(static_cast<int32_t>(ddsEnumVal.underlying()), buf);
LtsUtils::set4Byte(static_cast<int32_t>(ddsEnumVal), buf);
}
void addDeconMode(QByteArray &buf, const AreaEffectSimulation::AesOperatingMode &deconMode)
@@ -430,8 +430,8 @@ void addPointSymbol(QByteArray &buf, const std::string &pointSymbol)
void addPosition2D(QByteArray &buf, const Core::GeoPosition2D &position)
{
LtsUtils::set8Byte(position.lon(), buf);
LtsUtils::set8Byte(position.lat(), buf);
LtsUtils::set8Byte(position.lon, buf);
LtsUtils::set8Byte(position.lat, buf);
// no timestamp, as it is set in the client anyway
}
@@ -457,10 +457,10 @@ void addSegments(QByteArray &buf, const std::vector<AreaEffectSimulation::MineSe
for (const AreaEffectSimulation::MineSegment &currentMineSegment : qAsConst(segments))
{
addPosition2D(buf, currentMineSegment.positionStart());
addPosition2D(buf, currentMineSegment.positionStart);
lastSeg = currentMineSegment;
}
addPosition2D(buf, lastSeg.positionEnd());
addPosition2D(buf, lastSeg.positionEnd);
}
void addSpanAngle(QByteArray &buf, double spanAngle)