Migrates OcSituation and ServiceManagement to generated rtiddsgen API

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

No files matched your search

@@ -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)
@@ -46,52 +46,52 @@ void CentralAesDataQueue::addRemoveMessage(int32_t aesItemId, AreaEffectSimulati
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::EffectCluster &effectCluster)
{
// we treat EffectClusters as ExplosionClusters for the ABT
addRemoveMessage(effectCluster.id(), AreaEffectSimulation::AesType::inner_enum::AtExplosionCluster);
addRemoveMessage(effectCluster.id, AreaEffectSimulation::AesType::AtExplosionCluster);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::NContamination &nContamination)
{
addRemoveMessage(nContamination.id(), AreaEffectSimulation::AesType::inner_enum::AtNContamination);
addRemoveMessage(nContamination.id, AreaEffectSimulation::AesType::AtNContamination);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::BCContamination &bCContamination)
{
addRemoveMessage(bCContamination.id(), AreaEffectSimulation::AesType::inner_enum::AtBCContamination);
addRemoveMessage(bCContamination.id, AreaEffectSimulation::AesType::AtBCContamination);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::ExplosionArea &explosionArea)
{
addRemoveMessage(explosionArea.id(), AreaEffectSimulation::AesType::inner_enum::AtExplosionArea);
addRemoveMessage(explosionArea.id, AreaEffectSimulation::AesType::AtExplosionArea);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::ExplosionSingle &explosionSingle)
{
addRemoveMessage(explosionSingle.id(), AreaEffectSimulation::AesType::inner_enum::AtExplosionSingle);
addRemoveMessage(explosionSingle.id, AreaEffectSimulation::AesType::AtExplosionSingle);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::MineArea &mineArea)
{
addRemoveMessage(mineArea.id(), AreaEffectSimulation::AesType::inner_enum::AtMineArea);
addRemoveMessage(mineArea.id, AreaEffectSimulation::AesType::AtMineArea);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::FunctionalArea &functionalArea)
{
addRemoveMessage(functionalArea.id(), AreaEffectSimulation::AesType::inner_enum::AtFunctionalArea);
addRemoveMessage(functionalArea.id, AreaEffectSimulation::AesType::AtFunctionalArea);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::BoobyTrap &boobyTrap)
{
addRemoveMessage(boobyTrap.id(), AreaEffectSimulation::AesType::inner_enum::AtBoobyTrap);
addRemoveMessage(boobyTrap.id, AreaEffectSimulation::AesType::AtBoobyTrap);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::OffRouteMine &offRouteMine)
{
addRemoveMessage(offRouteMine.id(), AreaEffectSimulation::AesType::inner_enum::AtOffRouteMine);
addRemoveMessage(offRouteMine.id, AreaEffectSimulation::AesType::AtOffRouteMine);
}
void CentralAesDataQueue::addRemoveMessage(const AreaEffectSimulation::ExplosionCluster &explosionCluster)
{
addRemoveMessage(explosionCluster.id(), AreaEffectSimulation::AesType::inner_enum::AtExplosionCluster, explosionCluster.impactCount() == 1); // we prioritize every single fire
addRemoveMessage(explosionCluster.id, AreaEffectSimulation::AesType::AtExplosionCluster, explosionCluster.impactCount == 1); // we prioritize every single fire
}
QByteArray CentralAesDataQueue::getSendingData(qint32 size)
@@ -31,15 +31,15 @@ public:
QByteArray data;
bool isPrioritized = false; // we prioritize every single fire
clearSpecificMessage(aesItem.id(), OcSituation::AddMod);
clearSpecificMessage(aesItem.id, OcSituation::AddMod);
DataBuilder::addCentralAesChangeType(data, OcSituation::AddMod);
data.append(DataBuilder::getByteStreamAesItem(aesItem, isPrioritized));
if (isPrioritized)
m_internalPrioritizedQueue.enqueue({aesItem.id(), OcSituation::AddMod, data});
m_internalPrioritizedQueue.enqueue({aesItem.id, OcSituation::AddMod, data});
else
m_internalQueue.enqueue({aesItem.id(), OcSituation::AddMod, data});
m_internalQueue.enqueue({aesItem.id, OcSituation::AddMod, data});
DEBUG_LOG(m_logger) << "New AesItem added. " << m_internalQueue.size() << " normal, "
<< m_internalPrioritizedQueue.size() << " prioritized and "
@@ -34,7 +34,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_dtcCore = Core::Interface::Dtc::create(m_ddsConnector);
bool bRet = m_dtcCore->enablePartitionTime();
connect(m_dtcCore.get(), &Core::Interface::Dtc::partitionTimeChanged,
this, [this](const Core::PartitionTime & t) { emit partitionTimeChanged(t.timeStamp());});
this, [this](const Core::PartitionTime & t) { emit partitionTimeChanged(t.timeStamp);});
// Pacemaker
m_pacemaker = std::make_shared<Core::Pacemaker>(m_ddsConnector);
@@ -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);
}
}
@@ -149,71 +149,71 @@ HandlerOcCentralAesData::HandlerOcCentralAesData(const std::shared_ptr<DdsHandle
// fetch aes items
m_aesDtc->effectClusters([this](const AreaEffectSimulation::EffectCluster & data)
{
if (data.isCentral())
m_allCentralEffectClusters.insert(data.id(), data);
if (data.isCentral)
m_allCentralEffectClusters.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralEffectClusters.size() << " central EffectClusters on startup.";
m_aesDtc->nContaminations([this](const AreaEffectSimulation::NContamination & data)
{
if (data.isCentral())
m_allCentralNContaminations.insert(data.id(), data);
if (data.isCentral)
m_allCentralNContaminations.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralNContaminations.size() << " central NContaminations on startup.";
m_aesDtc->bCContaminations([this](const AreaEffectSimulation::BCContamination & data)
{
if (data.isCentral())
m_allCentralBCContaminations.insert(data.id(), data);
if (data.isCentral)
m_allCentralBCContaminations.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralBCContaminations.size() << " central BCContaminations on startup.";
m_aesDtc->explosionAreas([this](const AreaEffectSimulation::ExplosionArea & data)
{
if (data.isCentral())
m_allCentralExplosionsArea.insert(data.id(), data);
if (data.isCentral)
m_allCentralExplosionsArea.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralExplosionsArea.size() << " central ExplosionsAreas on startup.";
m_aesDtc->explosionSingles([this](const AreaEffectSimulation::ExplosionSingle & data)
{
if (data.isCentral())
m_allCentralExplosionsSingle.insert(data.id(), data);
if (data.isCentral)
m_allCentralExplosionsSingle.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralExplosionsSingle.size() << " central ExplosionsSingles on startup.";
m_aesDtc->mineAreas([this](const AreaEffectSimulation::MineArea & data)
{
if (data.isCentral())
m_allCentralMineAreas.insert(data.id(), data);
if (data.isCentral)
m_allCentralMineAreas.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralMineAreas.size() << " central MineAreas on startup.";
m_aesDtc->functionalAreas([this](const AreaEffectSimulation::FunctionalArea & data)
{
if (data.isCentral())
m_allCentralFunctionalAreas.insert(data.id(), data);
if (data.isCentral)
m_allCentralFunctionalAreas.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralFunctionalAreas.size() << " central FunctionalAreas on startup.";
m_aesDtc->boobyTraps([this](const AreaEffectSimulation::BoobyTrap & data)
{
if (data.isCentral())
m_allCentralBoobyTraps.insert(data.id(), data);
if (data.isCentral)
m_allCentralBoobyTraps.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralBoobyTraps.size() << " central BoobyTraps on startup.";
m_aesDtc->offRouteMines([this](const AreaEffectSimulation::OffRouteMine & data)
{
if (data.isCentral())
m_allCentralOffRouteMines.insert(data.id(), data);
if (data.isCentral)
m_allCentralOffRouteMines.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralOffRouteMines.size() << " central OffRouteMines on startup.";
m_aesDtc->explosionClusters([this](const AreaEffectSimulation::ExplosionCluster &data)
{
if (data.isCentral())
m_allCentralExplosionClusters.insert(data.id(), data);
if (data.isCentral)
m_allCentralExplosionClusters.insert(data.id, data);
});
TRACE_LOG(m_logger) << "Got " << m_allCentralExplosionClusters.size() << " central ExplosionClusters on startup.";
@@ -221,8 +221,8 @@ HandlerOcCentralAesData::HandlerOcCentralAesData(const std::shared_ptr<DdsHandle
QList<qint32> aesItemIds = allInternalAesItemIds();
m_aesDtc->aesItemViews([this, aesItemIds](const AreaEffectSimulation::AesItemView & data)
{
if (aesItemIds.contains(data.aesItemId()))
m_allCentralAesItemViews.insert(data.aesItemId(), data);
if (aesItemIds.contains(data.aesItemId))
m_allCentralAesItemViews.insert(data.aesItemId, data);
});
TRACE_LOG(m_logger) << "Got " << allInternalAesItemIds().size() << " central AesItems in total on startup. And " << m_allCentralAesItemViews.size() << " AesItemViews.";
@@ -269,7 +269,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
{
ParticipantManagement::Participant centerParticipant = m_ppmDtc->participant(m_ppmDtc->participantIdByEquipmentNumber(m_centerEquipmentId));
if (centerParticipant.id() <= 0)
if (centerParticipant.id <= 0)
{
ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
<< " as center of the oc situation request does not exist!";
@@ -279,7 +279,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
{
const ParticipantManagement::ParticipantPosition &partPosition = m_ppmDtc->participantPosition(m_ppmDtc->participantIdByEquipmentNumber(m_centerEquipmentId));
if (partPosition.participantId() == 0)
if (partPosition.participantId == 0)
{
ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
<< " as center of the oc situation request has no position!";
@@ -287,8 +287,8 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
}
else
{
m_centerPosition = partPosition.pos();
m_centerParticipantId = centerParticipant.id();
m_centerPosition = partPosition.pos;
m_centerParticipantId = centerParticipant.id;
}
}
if (endThread && ++m_retryCount < 5)
@@ -319,7 +319,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
endThread = true;
}
}
else if ((centerPosition.lon() == std::nan("")) || (centerPosition.lat() == std::nan("")))
else if ((centerPosition.lon == std::nan("")) || (centerPosition.lat == std::nan("")))
{
DEBUG_LOG(m_logger) << "m_centerParticipantId == 0";
endThread = true;
@@ -348,10 +348,10 @@ void HandlerOcCentralAesData::onParticipantPositionChanged(const ParticipantMana
{
if (modType != DataModification::eModified
|| m_centerType != OcSituation::SituationCenterType::Equipment
|| data.participantId() != m_centerParticipantId)
|| data.participantId != m_centerParticipantId)
return;
m_centerPosition = data.pos();
m_centerPosition = data.pos;
buildSituationCircle();
}
@@ -407,35 +407,35 @@ void HandlerOcCentralAesData::onExplosionClusterChanged(const AreaEffectSimulati
void HandlerOcCentralAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
{
const QVector<AreaEffectSimulation::AesType> validTypes = {AreaEffectSimulation::AesType::inner_enum::AtEffectCluster,
AreaEffectSimulation::AesType::inner_enum::AtNContamination,
AreaEffectSimulation::AesType::inner_enum::AtBCContamination ,
AreaEffectSimulation::AesType::inner_enum::AtExplosionArea,
AreaEffectSimulation::AesType::inner_enum::AtExplosionSingle,
AreaEffectSimulation::AesType::inner_enum::AtMineArea,
AreaEffectSimulation::AesType::inner_enum::AtFunctionalArea,
AreaEffectSimulation::AesType::inner_enum::AtBoobyTrap,
AreaEffectSimulation::AesType::inner_enum::AtOffRouteMine,
AreaEffectSimulation::AesType::inner_enum::AtExplosionCluster};
const QVector<AreaEffectSimulation::AesType> validTypes = {AreaEffectSimulation::AesType::AtEffectCluster,
AreaEffectSimulation::AesType::AtNContamination,
AreaEffectSimulation::AesType::AtBCContamination ,
AreaEffectSimulation::AesType::AtExplosionArea,
AreaEffectSimulation::AesType::AtExplosionSingle,
AreaEffectSimulation::AesType::AtMineArea,
AreaEffectSimulation::AesType::AtFunctionalArea,
AreaEffectSimulation::AesType::AtBoobyTrap,
AreaEffectSimulation::AesType::AtOffRouteMine,
AreaEffectSimulation::AesType::AtExplosionCluster};
if (!validTypes.contains(data.aesTypeId()))
if (!validTypes.contains(data.aesTypeId))
return;
switch (modType)
{
case DataModification::eAdded:
if (!allInternalAesItemIds().contains(data.aesItemId()))
if (!allInternalAesItemIds().contains(data.aesItemId))
return;
m_allCentralAesItemViews.insert(data.aesItemId(), data);
m_allCentralAesItemViews.insert(data.aesItemId, data);
break;
case DataModification::eModified:
{
if (!m_allCentralAesItemViews.contains(data.aesItemId()))
if (!m_allCentralAesItemViews.contains(data.aesItemId))
return;
m_allCentralAesItemViews[data.aesItemId()] = data;
m_allCentralAesItemViews[data.aesItemId] = data;
break;
}
@@ -521,10 +521,10 @@ void HandlerOcCentralAesData::handleSituation()
payload += m_bWithCompression ? qCompress(sendingData) : sendingData;
TrainingAreaBase::SendOcDataRequest req;
req.equipmentNumber(m_equipmentId);
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.equipmentNumber = m_equipmentId;
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
DEBUG_LOG(m_logger) << "Sending " << req.payload().size() << " Bytes payload.";
DEBUG_LOG(m_logger) << "Sending " << req.payload.size() << " Bytes payload.";
emit sendOcData(req);
}
@@ -568,7 +568,7 @@ void HandlerOcCentralAesData::fetchAesItemsInRange()
if (m_centerType == OcSituation::SituationCenterType::Equipment)
INFO_LOG(m_logger) << "Fetching AesItems in radius around equipment " << m_centerEquipmentId
<< " with position " << relCenterPos.x() << "/" << relCenterPos.y() << " and radius: " << m_radius << ", " << m_baseCoordinate.mgrs()
<< ", " << m_centerPosition.lon() << ", " << m_centerPosition.lat();
<< ", " << m_centerPosition.lon << ", " << m_centerPosition.lat;
else
INFO_LOG(m_logger) << "Fetching AesItems in radius of position " << relCenterPos.x() << "/" << relCenterPos.y() << " radius: " << m_radius;
@@ -612,17 +612,17 @@ qint32 HandlerOcCentralAesData::fetchAesItemsInCircle(const QHash<qint32, T> &ae
AreaEffectSimulation::AesItemView aesItemView = m_allCentralAesItemViews.value(it.key());
if (it.value().effectStateId() == AreaEffectSimulation::AesEffectState::inner_enum::EsExpired ||
it.value().effectStateId() == AreaEffectSimulation::AesEffectState::inner_enum::EsRemoved)
if (it.value().effectStateId == AreaEffectSimulation::AesEffectState::EsExpired ||
it.value().effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
{
TRACE_LOG(m_logger) << "AesItem of type " << aesItemView.aesTypeId() << ", with id " << it.key() << " is removed or expired --> skipping.";
TRACE_LOG(m_logger) << "AesItem of type " << aesItemView.aesTypeId << ", with id " << it.key() << " is removed or expired --> skipping.";
continue;
}
#if QT_VERSION < QT_VERSION_CHECK(5,10,0)
if (polygonFromForm(aesItemView.form()).intersected(m_situationCircle).size() > 0)
#else
if (polygonFromForm(aesItemView.form()).intersects(m_situationCircle))
if (polygonFromForm(aesItemView.form).intersects(m_situationCircle))
#endif
{
m_aesItemsInRange.insert(it.key());
@@ -639,7 +639,7 @@ QPolygonF HandlerOcCentralAesData::polygonFromForm(const std::vector<Core::GeoPo
result.reserve(form.size());
for (const Core::GeoPosition &currentPosition : qAsConst(form))
result.append(PositionConverter::relativeFromGeographic({currentPosition.lon(), currentPosition.lat()}, m_baseCoordinate));
result.append(PositionConverter::relativeFromGeographic({currentPosition.lon, currentPosition.lat}, m_baseCoordinate));
return result;
}
@@ -698,32 +698,32 @@ void HandlerOcCentralAesData::removeKickedOutAesItems(const QSet<qint32> &aesIte
DEBUG_LOG(m_logger) << "Found " << kickedOutAesItems.size() << " AesItems to kick out.";
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::inner_enum::AtUnknown;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtUnknown;
for (qint32 currentAesItemId : qAsConst(kickedOutAesItems))
{
if (m_allCentralAesItemViews.contains(currentAesItemId))
aesType = m_allCentralAesItemViews.value(currentAesItemId).aesTypeId();
aesType = m_allCentralAesItemViews.value(currentAesItemId).aesTypeId;
else if (m_allCentralEffectClusters.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtEffectCluster;
aesType = AreaEffectSimulation::AesType::AtEffectCluster;
else if (m_allCentralNContaminations.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtNContamination;
aesType = AreaEffectSimulation::AesType::AtNContamination;
else if (m_allCentralBCContaminations.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtBCContamination;
aesType = AreaEffectSimulation::AesType::AtBCContamination;
else if (m_allCentralExplosionsArea.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtExplosionArea;
aesType = AreaEffectSimulation::AesType::AtExplosionArea;
else if (m_allCentralExplosionsSingle.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtExplosionSingle;
aesType = AreaEffectSimulation::AesType::AtExplosionSingle;
else if (m_allCentralMineAreas.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtMineArea;
aesType = AreaEffectSimulation::AesType::AtMineArea;
else if (m_allCentralFunctionalAreas.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtFunctionalArea;
aesType = AreaEffectSimulation::AesType::AtFunctionalArea;
else if (m_allCentralBoobyTraps.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtBoobyTrap;
aesType = AreaEffectSimulation::AesType::AtBoobyTrap;
else if (m_allCentralOffRouteMines.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtOffRouteMine;
aesType = AreaEffectSimulation::AesType::AtOffRouteMine;
else if (m_allCentralExplosionClusters.contains(currentAesItemId))
aesType = AreaEffectSimulation::AesType::inner_enum::AtExplosionCluster;
aesType = AreaEffectSimulation::AesType::AtExplosionCluster;
else
{
WARNING_LOG(m_logger) << "Could not remove AesItem with id " << currentAesItemId << ". There is no way to find out its AesType";
@@ -766,7 +766,7 @@ qreal HandlerOcCentralAesData::calculateDistanceToCircleCenter(qint32 aesItemId)
return -1.0;
}
QPolygonF aesItemForm = polygonFromForm(m_allCentralAesItemViews.value(aesItemId).form());
QPolygonF aesItemForm = polygonFromForm(m_allCentralAesItemViews.value(aesItemId).form);
QLineF distanceLine(aesItemForm.boundingRect().center(), m_situationCircle.boundingRect().center());
return distanceLine.length();
@@ -778,20 +778,20 @@ void HandlerOcCentralAesData::onAesItemChanged(QHash<qint32, T> &container, cons
switch (modType)
{
case DataModification::eAdded:
if (!data.isCentral())
if (!data.isCentral)
return;
container.insert(data.id(), data);
container.insert(data.id, data);
return;
case DataModification::eModified:
container[data.id()] = data;
container[data.id] = data;
if (m_aesItemsInRange.contains(data.id()))
if (m_aesItemsInRange.contains(data.id))
{
if (data.effectStateId() == AreaEffectSimulation::AesEffectState::inner_enum::EsExpired
|| data.effectStateId() == AreaEffectSimulation::AesEffectState::inner_enum::EsRemoved)
if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired
|| data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
{
m_aesItemsInRange.remove(data.id());
m_aesItemsInRange.remove(data.id);
m_dataQueue->addRemoveMessage(data);
}
else
@@ -800,16 +800,16 @@ void HandlerOcCentralAesData::onAesItemChanged(QHash<qint32, T> &container, cons
return;
case DataModification::eRemoved:
container.remove(data.id());
container.remove(data.id);
if (m_allCentralAesItemViews.contains(data.id()))
if (m_allCentralAesItemViews.contains(data.id))
{
AreaEffectSimulation::AesItemView aesItemView = m_allCentralAesItemViews.take(data.id());
AreaEffectSimulation::AesItemView aesItemView = m_allCentralAesItemViews.take(data.id);
if (m_aesItemsInRange.contains(data.id()))
if (m_aesItemsInRange.contains(data.id))
{
m_aesItemsInRange.remove(data.id());
m_dataQueue->addRemoveMessage(data.id(), aesItemView.aesTypeId());
m_aesItemsInRange.remove(data.id);
m_dataQueue->addRemoveMessage(data.id, aesItemView.aesTypeId);
}
}
@@ -143,7 +143,7 @@ private:
AesItemInfo()
: id(-1)
, type(AreaEffectSimulation::AesType::inner_enum::AtUnknown)
, type(AreaEffectSimulation::AesType::AtUnknown)
{}
AesItemInfo(int32_t id, AreaEffectSimulation::AesType type)
@@ -155,8 +155,8 @@ void HandlerOcData::onSendOcDataReply(const Core::FunctionReplyObject &reply)
void HandlerOcData::onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply)
{
if (reply.errorString().size())
ERROR_LOG(m_logger) << "Modify Participant data could not be send: " << reply.errorString();
if (reply.errorString.size())
ERROR_LOG(m_logger) << "Modify Participant data could not be send: " << reply.errorString;
else
DEBUG_LOG(m_logger) << "Modify Participant data send successfully to ppm!";
}
@@ -166,8 +166,8 @@ void HandlerOcData::onEvaluationSchemaChanged(const Evaluations::EvaluationSchem
if ((modType != DataModification::eAdded) && (modType != DataModification::eModified))
return;
if (data.sendToTa())
m_currentActiveEvaluationSchemaId = data.id();
if (data.sendToTa)
m_currentActiveEvaluationSchemaId = data.id;
}
void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataModification modType)
@@ -175,10 +175,10 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
if ((modType != DataModification::eAdded) && (modType != DataModification::eModified))
return;
if (data.sampleTime() < QDateTime::currentMSecsSinceEpoch() - 1000 * 60 * 10) // older than 10 mins -> ignore
if (data.sampleTime < QDateTime::currentMSecsSinceEpoch() - 1000 * 60 * 10) // older than 10 mins -> ignore
return;
const QByteArray payload = LtsUtils::toQByteArray(data.payload());
const QByteArray payload = LtsUtils::toQByteArray(data.payload);
unsigned int telegramId;
LtsUtils::get1Byte(payload, telegramId);
@@ -195,7 +195,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
}
case OcSituation::TelegramId::DemandEvaluationSchema:
{
handleDemandEvaluationSchema(payload, data.equipmentNumber());
handleDemandEvaluationSchema(payload, data.equipmentNumber);
break;
}
case OcSituation::TelegramId::Evaluation:
@@ -205,7 +205,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
}
case OcSituation::TelegramId::DemandSituation:
{
handleDemandSituation(payload, data.equipmentNumber());
handleDemandSituation(payload, data.equipmentNumber);
break;
}
case OcSituation::TelegramId::DemandAesItems:
@@ -213,7 +213,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
OcSituation::AesType aesType;
size_t pos = 1;
LtsUtils::get1Byte(payload, pos, aesType);
m_handlerOcAesData->demandAesItems(aesType, data.equipmentNumber());
m_handlerOcAesData->demandAesItems(aesType, data.equipmentNumber);
break;
}
case OcSituation::TelegramId::EquipmentErrorRegistration:
@@ -248,7 +248,7 @@ void HandlerOcData::sendStateInformation()
LtsUtils::set2Byte(m_handlerOcAesData->iedResetCnt(), payload);
TrainingAreaBase::SendOcDataRequest out;
out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
out.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
/*!
* \details Only if Tetra is connected, the OcData telegram will be send
* If we not check = A bunch of telegrams will be queued/stored until Tetra is connected, than Tetra is in Overload
@@ -257,9 +257,9 @@ void HandlerOcData::sendStateInformation()
while (conIt.hasNext())
{
conIt.next();
for (TrainingAreaBase::ConnectionState conState : conIt.value().connections())
for (TrainingAreaBase::ConnectionState conState : conIt.value().connections)
{
if (conState.name() == "TETRA" && conState.state() == false)
if (conState.name == "TETRA" && conState.state == false)
return;
}
}
@@ -297,39 +297,39 @@ void HandlerOcData::onSendEquipmentMessageOcRequest(const rti::core::SampleIdent
LtsUtils::set1Byte(OcSituation::TelegramId::Message, preparedPayload);
LtsUtils::set2Byte(0, preparedPayload); // dummy receiverId is individually set for each eqId in list
LtsUtils::set1Byte(Messaging::AddressType::ObserverController, preparedPayload);
LtsUtils::set2Byte(request.sender(), preparedPayload);
LtsUtils::set1Byte(request.senderType().underlying(), preparedPayload);
LtsUtils::set2Byte(request.sender, preparedPayload);
LtsUtils::set1Byte(request.senderType, preparedPayload);
LtsUtils::set2Byte(m_mainHandler->exerciseId(), preparedPayload);
preparedPayload.append(QByteArray::fromStdString(request.subject()));
preparedPayload.append(QByteArray::fromStdString(request.subject));
preparedPayload.append('\n'); // separating subject from message
preparedPayload.append(QByteArray::fromStdString(request.message()));
preparedPayload.append(QByteArray::fromStdString(request.message));
for (const auto equipmentNumber : request.equipmentNumbers())
for (const auto equipmentNumber : request.equipmentNumbers)
{
TrainingAreaBase::SendOcDataRequest out;
out.equipmentNumber(equipmentNumber);
out.equipmentNumber = equipmentNumber;
// replace 2 bytes with current receiver
QByteArray receiverId;
LtsUtils::set2Byte(equipmentNumber, receiverId);
QByteArray payload = preparedPayload.replace(1, 2, receiverId);
out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
out.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
onSendOcData(out);
}
m_fts->sendEquipmentMessageOcReply(cookie, Core::FunctionReplyObject(request.requestId()));
m_fts->sendEquipmentMessageOcReply(cookie, Core::FunctionReplyObject(request.requestId));
}
void HandlerOcData::onEquipmentErrorRequest(const rti::core::SampleIdentity &cookie, const EquipmentErrorRequest &request)
{
ERROR_LOG(m_logger) << "onEquipmentErrorRequest" << request.equipmentNumber();
ERROR_LOG(m_logger) << "onEquipmentErrorRequest" << request.equipmentNumber;
EquipmentErrorRegistration out;
// out.id(request.requestId());
out.sampleTime(QDateTime::currentMSecsSinceEpoch());
out.participant(QString::number(request.equipmentNumber()).toStdString());
out.device(request.device());
out.text(request.text());
out.sampleTime = QDateTime::currentMSecsSinceEpoch();
out.participant = QString::number(request.equipmentNumber).toStdString();
out.device = request.device;
out.text = request.text;
m_dts->publish(out);
m_fts->equipmentErrorReply(cookie, Core::FunctionReplyObject(request.requestId()));
m_fts->equipmentErrorReply(cookie, Core::FunctionReplyObject(request.requestId));
}
void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentId)
@@ -337,8 +337,8 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
OcSituation::SituationCenterType centerType;
int centerEquipmentId = 0, radius = 0;
Core::GeoPosition2D position;
position.lon(std::nan(""));
position.lat(std::nan(""));
position.lon = std::nan("");
position.lat = std::nan("");
bool initial = false;
size_t pos = 1;
@@ -355,9 +355,9 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
{
double tmp;
LtsUtils::get8Byte(data, pos, tmp);
position.lon(tmp);
position.lon = tmp;
LtsUtils::get8Byte(data, pos, tmp);
position.lat(tmp);
position.lat = tmp;
LtsUtils::get2Byte(data, pos, radius);
DEBUG_LOG(m_logger) << "Request from O/C-Laptop-Id: " << equipmentId
@@ -367,7 +367,7 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
LtsUtils::get1Byte(data, pos, initial);
LtsUtils::get1Byte(data, pos, filterActive);
QSet<ParticipantManagement::TypeClass::type> typeClassList{};
QSet<ParticipantManagement::TypeClass> typeClassList{};
QSet<int> partyList{};
if (filterActive)
{
@@ -387,7 +387,7 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
{
int typClass;
LtsUtils::get1Byte(data, pos, typClass);
typeClassList.insert((ParticipantManagement::TypeClass::type)typClass);
typeClassList.insert((ParticipantManagement::TypeClass)typClass);
}
}
@@ -444,14 +444,14 @@ void HandlerOcData::handleDemandEvaluationSchema(const QByteArray &data, int equ
DEBUG_LOG(m_logger) << "Sending to equipmentnumber: " << equipmentNumber << " evaluation schmema: " << m_currentActiveEvaluationSchemaId;
TrainingAreaBase::SendOcDataRequest out;
out.equipmentNumber(equipmentNumber);
out.equipmentNumber = equipmentNumber;
QByteArray payload;
LtsUtils::set1Byte(OcSituation::TelegramId::EvaluationSchema, payload);
LtsUtils::set2Byte(schema.id(), payload);
QByteArray compressed = qCompress(QByteArray::fromStdString(schema.schemadata()));
LtsUtils::set2Byte(schema.id, payload);
QByteArray compressed = qCompress(QByteArray::fromStdString(schema.schemadata));
payload.append(compressed);
out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
out.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
onSendOcData(out);
}
@@ -464,27 +464,27 @@ void HandlerOcData::handleEvaluation(const QByteArray &data)
// get schema id
LtsUtils::get2Byte(data, pos, tmp);
out.schemaId(tmp);
out.schemaId = tmp;
// get sender operator id
LtsUtils::get4Byte(data, pos, tmp);
out.senderOperatorId(tmp);
out.senderOperatorId = tmp;
// get receiver operator id
LtsUtils::get4Byte(data, pos, tmp);
if (tmp > 0)
out.receiverOperatorId(dds::core::optional<int32_t>(tmp));
out.receiverOperatorId = dds::core::optional<int32_t>(tmp);
// get timeStamp
int64_t timeStamp;
LtsUtils::get8Byte(data, pos, timeStamp);
out.ts(timeStamp);
out.ts = timeStamp;
// get hierarchy string
unsigned int hierarchyLength;
LtsUtils::get2Byte(data, pos, hierarchyLength);
out.hierarchy(QByteArray(data.mid(pos, hierarchyLength)).toStdString());
out.hierarchy = QByteArray(data.mid(pos, hierarchyLength)).toStdString();
pos += hierarchyLength;
// get text string
unsigned int textLength;
LtsUtils::get2Byte(data, pos, textLength);
out.text(QByteArray(data.mid(pos, textLength)).toStdString());
out.text = QByteArray(data.mid(pos, textLength)).toStdString();
DEBUG_LOG(m_logger) << "Got new evl comment: " << out;
@@ -504,9 +504,9 @@ void HandlerOcData::handleMessage(const QByteArray &data)
recipientIds.push_back(tmp);
// get address type
LtsUtils::get1Byte(data, pos, addressType);
out.recipientType(static_cast<Messaging::AddressType::inner_enum>(addressType));
out.recipientType = static_cast<Messaging::AddressType>(addressType);
if (addressType == Messaging::AddressType::ObserverController)
if (addressType == static_cast<int>(Messaging::AddressType::ObserverController))
{
int participantId = m_ppmDtc->participantIdByEquipmentNumber(tmp);
if (participantId > 0)
@@ -517,48 +517,48 @@ void HandlerOcData::handleMessage(const QByteArray &data)
return;
}
}
out.recipientIds(recipientIds);
out.recipientIds = recipientIds;
// get sender
LtsUtils::get2Byte(data, pos, tmp);
LtsUtils::get1Byte(data, pos, addressType);
out.senderType(static_cast<Messaging::AddressType::inner_enum>(addressType));
if (addressType == Messaging::AddressType::ObserverController)
out.senderType = static_cast<Messaging::AddressType>(addressType);
if (addressType == static_cast<int>(Messaging::AddressType::ObserverController))
{
int participantId = m_ppmDtc->participantIdByEquipmentNumber(tmp);
if (participantId > 0)
out.senderId(participantId);
out.senderId = participantId;
else
{
WARNING_LOG(m_logger) << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
out.senderId(0);
out.senderType(Messaging::AddressType::ObserverController);
out.senderId = 0;
out.senderType = Messaging::AddressType::ObserverController;
}
}
else
{
// no need to check if operator still exists, there is no harm if not
out.senderId(tmp);
out.senderId = tmp;
}
// get exerciseId
LtsUtils::get2Byte(data, pos, tmp);
if (tmp == 0)
WARNING_LOG(m_logger) << "Could'n set ExerciseId" << " " << tmp << " set to 0";
out.exerciseId(tmp);
out.exerciseId = tmp;
// get address type
const QByteArray msg(data.right(data.size() - pos));
int idx = msg.indexOf('\n');
if (idx < 0)
{
out.subject((tr("Message from %1").arg(out.senderId())).toStdString());
out.message(msg.constData());
out.subject = (tr("Message from %1").arg(out.senderId)).toStdString();
out.message = msg.constData();
}
else
{
out.subject(msg.left(idx).constData());
out.message(msg.mid(idx + 1).constData());
out.subject = msg.left(idx).constData();
out.message = msg.mid(idx + 1).constData();
}
DEBUG_LOG(m_logger) << "Got new message: " << out;
@@ -573,19 +573,19 @@ void HandlerOcData::handleEquipmentErrorRegistration(const QByteArray &data)
// equipmentNumber
LtsUtils::get2Byte(data, pos, tmp);
out.equipmentNumber(tmp);
out.equipmentNumber = tmp;
// participant
out.participant(data.mid(pos, 36).toStdString());
out.participant = data.mid(pos, 36).toStdString();
pos += 36;
// device
out.device(data.mid(pos, 36).toStdString());
out.device = data.mid(pos, 36).toStdString();
pos += 36;
// length
LtsUtils::get1Byte(data, pos, tmp);
// text
out.text(data.mid(pos, tmp).toStdString());
out.text = data.mid(pos, tmp).toStdString();
out.sampleTime(QDateTime::currentMSecsSinceEpoch());
out.sampleTime = QDateTime::currentMSecsSinceEpoch();
DEBUG_LOG(m_logger) << "Got new error registration: " << out;
m_dts->publish(out);
@@ -605,28 +605,28 @@ void HandlerOcData::handleEquipmentRegistration(const QByteArray &data)
ParticipantManagement::Participant part = m_ppmDtc->participant(participantId);
if (part.equipmentNumber().is_set() && equipmentNumber > 0)
if (part.equipmentNumber.is_set() && equipmentNumber > 0)
{
// we need a deregistration first!
ParticipantManagement::RegisterParticipantRequest dereq;
dereq.assignState(ParticipantManagement::ParticipantAssignState::NotAssigned);
dereq.equipmentNumber(0);
dereq.participantId(participantId);
dereq.info(part.info());
dereq.identification(part.identification());
dereq.assignState = ParticipantManagement::ParticipantAssignState::NotAssigned;
dereq.equipmentNumber = 0;
dereq.participantId = participantId;
dereq.info = part.info;
dereq.identification = part.identification;
m_ppmFtc->registerParticipantRequest(dereq, this);
}
ParticipantManagement::RegisterParticipantRequest req;
if (equipmentNumber > 0)
req.assignState(ParticipantManagement::ParticipantAssignState::HandoutExcon);
req.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
else
req.assignState(ParticipantManagement::ParticipantAssignState::NotAssigned);
req.equipmentNumber(equipmentNumber);
req.participantId(participantId);
req.info(part.info());
req.identification(part.identification());
DEBUG_LOG(m_logger) << "Try to register part with id: " << req.participantId() << " and eqNumeber " << req.equipmentNumber();
req.assignState = ParticipantManagement::ParticipantAssignState::NotAssigned;
req.equipmentNumber = equipmentNumber;
req.participantId = participantId;
req.info = part.info;
req.identification = part.identification;
DEBUG_LOG(m_logger) << "Try to register part with id: " << req.participantId << " and eqNumeber " << req.equipmentNumber;
m_ppmFtc->registerParticipantRequest(req, this);
}
@@ -27,7 +27,7 @@ ThreadOcSituationData::ThreadOcSituationData(MainHandler *mainHandler,
int radius,
bool filterActive,
QSet<int> partys,
QSet<ParticipantManagement::TypeClass::type> typeClasses)
QSet<ParticipantManagement::TypeClass> typeClasses)
: m_baseCoordinate(mainHandler->positionConverter()->baseCoordinate())
, m_equipmentId(equipmentId)
, m_centerEquipmentId(centerEquipmentId)
@@ -45,7 +45,7 @@ void ThreadOcSituationData::requestOcSituationData(OcSituation::SituationCenterT
int radius,
bool filterActive,
QSet<int> partyList,
QSet<ParticipantManagement::TypeClass::type> typeClassList,
QSet<ParticipantManagement::TypeClass> typeClassList,
bool initial)
{
INFO_LOG(m_logger) << "OC-Situation Request for centerEquipmentId: " << centerEquipmentId
@@ -157,7 +157,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
int radius,
bool filterActive,
QSet<int> partys,
QSet<ParticipantManagement::TypeClass::type> typeClasses,
QSet<ParticipantManagement::TypeClass> typeClasses,
bool initial)
{
TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << LOGFUNCTION;
@@ -185,14 +185,14 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
ParticipantManagement::Participant centerParticipant;
for (const auto &participant : qAsConst(m_allParticipants))
{
if (participant.equipmentNumber().is_set() && participant.equipmentNumber().get() == m_centerEquipmentId)
if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == m_centerEquipmentId)
{
centerParticipant = participant;
break;
}
};
if (centerParticipant.id() <= 0)
if (centerParticipant.id <= 0)
{
ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
<< " as center of the oc situation request does not exist!";
@@ -200,8 +200,8 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
}
else
{
const ParticipantManagement::ParticipantPosition &partPosition = m_allParticipantPositions.value(centerParticipant.id());
if (partPosition.participantId() == 0)
const ParticipantManagement::ParticipantPosition &partPosition = m_allParticipantPositions.value(centerParticipant.id);
if (partPosition.participantId == 0)
{
ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
<< " as center of the oc situation request has no position!";
@@ -209,8 +209,8 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
}
else
{
m_centerPosition = partPosition.pos();
m_centerParticipantId = centerParticipant.id();
m_centerPosition = partPosition.pos;
m_centerParticipantId = centerParticipant.id;
}
}
if (endThread && ++m_retryCount < 5)
@@ -238,7 +238,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
if (m_centerParticipantId == 0)
endThread = true;
}
else if ((centerPosition.lon() == std::nan("")) || (centerPosition.lat() == std::nan("")))
else if ((centerPosition.lon == std::nan("")) || (centerPosition.lat == std::nan("")))
endThread = true;
}
@@ -263,7 +263,7 @@ void HandlerOcSituationData::onParticipantChanged(const ParticipantManagement::P
if (modType == DataModification::eRemoved)
return;
const int participantId = data.id();
const int participantId = data.id;
m_allParticipants[participantId] = data;
if (!m_participants.contains(participantId))
@@ -276,16 +276,16 @@ void HandlerOcSituationData::onParticipantChanged(const ParticipantManagement::P
const ParticipantManagement::Participant &oldParticipantData = m_participants[participantId];
// check structure
if (oldParticipantData.equipmentNumber() != data.equipmentNumber() ||
oldParticipantData.superiorId() != data.superiorId() ||
oldParticipantData.symbol() != data.symbol() ||
oldParticipantData.typeId() != data.typeId() ||
oldParticipantData.partyId() != data.partyId())
if (oldParticipantData.equipmentNumber != data.equipmentNumber ||
oldParticipantData.superiorId != data.superiorId ||
oldParticipantData.symbol != data.symbol ||
oldParticipantData.typeId != data.typeId ||
oldParticipantData.partyId != data.partyId)
setModified(participantId, OcSituation::ModificationFlag::eStructure);
// check designator
if (oldParticipantData.designator() != data.designator() ||
oldParticipantData.tacticalIdentifier() != data.tacticalIdentifier())
if (oldParticipantData.designator != data.designator ||
oldParticipantData.tacticalIdentifier != data.tacticalIdentifier)
setModified(participantId, OcSituation::ModificationFlag::eDesignator);
m_participants[participantId] = data;
@@ -303,9 +303,9 @@ static inline int getEquipmentStateBits(const ParticipantManagement::DynamicPart
{
int ret = 0;
ret |= int(data.hasNbcProtectionConfigured()) << 1;
ret |= int(data.hasNbcProtectionActive()) << 2;
ret |= int(data.manipulation().size() > 0) << 7;
ret |= int(data.hasNbcProtectionConfigured) << 1;
ret |= int(data.hasNbcProtectionActive) << 2;
ret |= int(data.manipulation.size() > 0) << 7;
return ret;
}
@@ -316,7 +316,7 @@ void HandlerOcSituationData::onDynamicParticipantDataChanged(const ParticipantMa
if (modType == DataModification::eRemoved)
return;
const int participantId = data.participantId();
const int participantId = data.participantId;
m_allDynamicParticpantData[participantId] = data;
if (!m_participants.contains(participantId))
@@ -329,12 +329,12 @@ void HandlerOcSituationData::onDynamicParticipantDataChanged(const ParticipantMa
const ParticipantManagement::DynamicParticipantData &oldDynamicData = m_dynamicParticpantData[participantId];
// check injury state
ParticipantManagement::StateInformation newYoungestInformation = ParticipantManagement::youngestStateInformation(data.stateHistory());
ParticipantManagement::StateInformation oldYoungestInformation = ParticipantManagement::youngestStateInformation(oldDynamicData.stateHistory());
if (oldYoungestInformation.stateTime() != newYoungestInformation.stateTime() ||
oldYoungestInformation.vulnerabilityState() != newYoungestInformation.vulnerabilityState() ||
oldYoungestInformation.vulnerabilityBits() != newYoungestInformation.vulnerabilityBits() || // TODO: do we really want to send those bit?
m_allParticipants.value(oldYoungestInformation.originatorId()).partyId() != m_allParticipants.value(newYoungestInformation.originatorId()).partyId())
ParticipantManagement::StateInformation newYoungestInformation = ParticipantManagement::youngestStateInformation(data.stateHistory);
ParticipantManagement::StateInformation oldYoungestInformation = ParticipantManagement::youngestStateInformation(oldDynamicData.stateHistory);
if (oldYoungestInformation.stateTime != newYoungestInformation.stateTime ||
oldYoungestInformation.vulnerabilityState != newYoungestInformation.vulnerabilityState ||
oldYoungestInformation.vulnerabilityBits != newYoungestInformation.vulnerabilityBits || // TODO: do we really want to send those bit?
m_allParticipants.value(oldYoungestInformation.originatorId).partyId != m_allParticipants.value(newYoungestInformation.originatorId).partyId)
setModified(participantId, OcSituation::ModificationFlag::eVBG);
// check special bits
@@ -357,13 +357,13 @@ void HandlerOcSituationData::onParticipantPositionChanged(const ParticipantManag
TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << LOGFUNCTION;
if (modType == DataModification::eRemoved)
return;
const int participantId = data.participantId();
const int participantId = data.participantId;
m_allParticipantPositions[participantId] = data;
// update current center position when we're following a participant
if (m_centerType == OcSituation::SituationCenterType::Equipment &&
participantId == m_centerParticipantId)
m_centerPosition = data.pos();
m_centerPosition = data.pos;
if (!m_participants.contains(participantId))
{
@@ -375,10 +375,10 @@ void HandlerOcSituationData::onParticipantPositionChanged(const ParticipantManag
const ParticipantManagement::ParticipantPosition &oldPosition = m_participantPositions[participantId];
// check for ePosition / ePosition3D
if (oldPosition.sampleTime() <= data.sampleTime())
if (oldPosition.sampleTime <= data.sampleTime)
{
//bool isNullOld = qFuzzyIsNull(oldPosition.pos().z());
bool isNullNew = qFuzzyIsNull(data.pos().z());
bool isNullNew = qFuzzyIsNull(data.pos.z);
// if (isNullOld && isNullNew)
if (isNullNew)
@@ -419,13 +419,13 @@ void HandlerOcSituationData::onAesItemViewChanged(const AreaEffectSimulation::Ae
{
case DataModification::eAdded:
case DataModification::eModified:
if (data.partyId().is_set())
m_aesId2PartyId[data.id()] = data.partyId().get();
if (data.partyId.is_set())
m_aesId2PartyId[data.id] = data.partyId.get();
else
m_aesId2PartyId.remove(data.id());
m_aesId2PartyId.remove(data.id);
break;
case DataModification::eRemoved:
m_aesId2PartyId.remove(data.id());
m_aesId2PartyId.remove(data.id);
break;
}
}
@@ -435,7 +435,7 @@ void HandlerOcSituationData::onDusMineStateChanged(const AreaEffectSimulation::D
auto copy = m_dynamicParticpantData;
for (const ParticipantManagement::DynamicParticipantData &dynPartData : qAsConst(copy))
{
if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId()))
if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId))
continue;
onDynamicParticipantDataChanged(dynPartData, DataModification::eModified);
}
@@ -474,8 +474,8 @@ void HandlerOcSituationData::handleSituation()
updatePrioOfNotSendParticipants();
TrainingAreaBase::SendOcDataRequest req;
req.equipmentNumber(m_equipmentId);
req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
req.equipmentNumber = m_equipmentId;
req.payload = LtsUtils::convert<std::vector<uint8_t>>(payload);
emit sendOcData(req);
}
@@ -519,7 +519,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
if (m_centerType == OcSituation::SituationCenterType::Equipment)
INFO_LOG(m_logger) << "Fetching participants in radius around equipment " << m_centerEquipmentId
<< " with position " << relCenterPos.x() << "/" << relCenterPos.y() << " and radius: " << m_radius << ", " << m_baseCoordinate.mgrs()
<< ", " << m_centerPosition.lon() << ", " << m_centerPosition.lat();
<< ", " << m_centerPosition.lon << ", " << m_centerPosition.lat;
else
INFO_LOG(m_logger) << "Fetching participants in radius of position " << relCenterPos.x() << "/" << relCenterPos.y() << " radius: " << m_radius;
@@ -530,22 +530,22 @@ void HandlerOcSituationData::fetchParticipantsInRange()
for (const auto &position : qAsConst(m_allParticipantPositions))
{
if (!LtsUtils::isPositionTimeOutdated(m_partitionTime, position.sampleTime())) // only if position is not outdated
if (!LtsUtils::isPositionTimeOutdated(m_partitionTime, position.sampleTime)) // only if position is not outdated
{
ParticipantManagement::Participant participant = m_allParticipants.value(position.participantId());
if (!participant.equipmentNumber().is_set() || participant.partyId() == 0)
ParticipantManagement::Participant participant = m_allParticipants.value(position.participantId);
if (!participant.equipmentNumber.is_set() || participant.partyId == 0)
continue; // no units and participants without equipmentnumber or party: pool
if (m_filterActive)
{
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(participant.typeId()).typeClass();
if ((m_partyList.count() > 0 && m_partyList.contains(participant.partyId()) == false) ||
(m_typeClassList.count() > 0 && m_typeClassList.contains(typeClass.underlying()) == false))
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(participant.typeId).typeClass;
if ((m_partyList.count() > 0 && m_partyList.contains(participant.partyId) == false) ||
(m_typeClassList.count() > 0 && m_typeClassList.contains(typeClass) == false))
{
DEBUG_LOG(m_logger) << participant.id() << " filtered out";
DEBUG_LOG(m_logger) << participant.id << " filtered out";
continue;
}
}
const QPointF relPartPos(PositionConverter::relativeFromGeographic(position.pos(), m_baseCoordinate));
const QPointF relPartPos(PositionConverter::relativeFromGeographic(position.pos, m_baseCoordinate));
double x = relCenterPos.x() - relPartPos.x();
double y = relCenterPos.y() - relPartPos.y();
@@ -553,16 +553,16 @@ void HandlerOcSituationData::fetchParticipantsInRange()
if (distanceSqr > rangeSqr)
{
DEBUG_LOG(m_logger) << "Participant NOT in range equipment number: " << participant.equipmentNumber().get()
DEBUG_LOG(m_logger) << "Participant NOT in range equipment number: " << participant.equipmentNumber.get()
<< " pos: " << relPartPos.x() << "/" << relPartPos.y()
<< " distance: " << std::sqrt(distanceSqr) << " distanceSqr: " << distanceSqr;
continue;
}
DEBUG_LOG(m_logger) << "Participant in range equipment number: " << participant.equipmentNumber().get()
DEBUG_LOG(m_logger) << "Participant in range equipment number: " << participant.equipmentNumber.get()
<< " pos: " << relPartPos.x() << "/" << relPartPos.y()
<< " distance: " << std::sqrt(distanceSqr) << " distanceSqr: " << distanceSqr;
curParticipantsInRange.insertMulti(distanceSqr, participant.id());
curParticipantsInRange.insertMulti(distanceSqr, participant.id);
}
}
m_participantOverloaded = quint32(curParticipantsInRange.count()) > Settings::maxParticipantsInSituation();
@@ -583,7 +583,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
// insert participants, that are now out of range/outdated
for (const auto &oldPart : oldParticipants)
{
const int id = oldPart.id();
const int id = oldPart.id;
if (!curParticipants.contains(id))
{
if (!m_outdatedParticipants.contains(id))
@@ -601,9 +601,9 @@ void HandlerOcSituationData::handleParticipant(const ParticipantManagement::Part
{
TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << LOGFUNCTION;
int participantId = participant.id();
if (participant.equipmentNumber().is_set())
m_participantId2EqId[participantId] = participant.equipmentNumber().get();
int participantId = participant.id;
if (participant.equipmentNumber.is_set())
m_participantId2EqId[participantId] = participant.equipmentNumber.get();
else
m_participantId2EqId.remove(participantId);
@@ -653,8 +653,8 @@ QVector<QPair<int, float>> HandlerOcSituationData::createPrioQueue() const
if (!m_participants.contains(participantId))
continue;
const ParticipantManagement::ParticipantPosition &position = m_participantPositions[participantId];
float x = m_centerPosition.lon() - position.pos().lon();
float y = m_centerPosition.lat() - position.pos().lon();
float x = m_centerPosition.lon - position.pos.lon;
float y = m_centerPosition.lat - position.pos.lon;
float r2 = x * x + y * y;
float prio = r2;
int cntNotSendDbg = 0;
@@ -834,8 +834,8 @@ void HandlerOcSituationData::addPosition2D(QByteArray &buf, const ParticipantMan
{
if (!bAdd)
return;
LtsUtils::set8Byte(data.pos().lon(), buf);
LtsUtils::set8Byte(data.pos().lat(), buf);
LtsUtils::set8Byte(data.pos.lon, buf);
LtsUtils::set8Byte(data.pos.lat, buf);
// no timestamp, as it is set in the client anyway
}
@@ -845,9 +845,9 @@ void HandlerOcSituationData::addPosition3D(QByteArray &buf, const ParticipantMan
if (!bAdd)
return;
addPosition2D(buf, data, bAdd);
LtsUtils::set8Byte(data.pos().z(), buf);
LtsUtils::set2Byte(data.buildingId(), buf);
LtsUtils::set4Byte(data.roomId(), buf);
LtsUtils::set8Byte(data.pos.z, buf);
LtsUtils::set2Byte(data.buildingId, buf);
LtsUtils::set4Byte(data.roomId, buf);
}
void HandlerOcSituationData::addVBG(QByteArray &buf, const ParticipantManagement::DynamicParticipantData &data, bool bAdd) const
@@ -855,78 +855,78 @@ void HandlerOcSituationData::addVBG(QByteArray &buf, const ParticipantManagement
if (!bAdd)
return;
const ParticipantManagement::StateInformation &youngestStateInformation = ParticipantManagement::youngestStateInformation(data.stateHistory(), true, false);
const ParticipantManagement::StateInformation &youngestStateInformation = ParticipantManagement::youngestStateInformation(data.stateHistory, true, false);
LtsUtils::set1Byte(youngestStateInformation.vulnerabilityState().underlying(), buf);
LtsUtils::set4Byte(youngestStateInformation.vulnerabilityKindId(), buf);
LtsUtils::set2Byte(youngestStateInformation.vulnerabilityBits(), buf);
LtsUtils::set1Byte(youngestStateInformation.vulnerabilityState, buf);
LtsUtils::set4Byte(youngestStateInformation.vulnerabilityKindId, buf);
LtsUtils::set2Byte(youngestStateInformation.vulnerabilityBits, buf);
int injuryPartyId = 1;
switch (youngestStateInformation.originatorType().underlying())
switch (youngestStateInformation.originatorType)
{
case ProjectDataManagement::StateChangeOriginator_def::Unknown:
case ProjectDataManagement::StateChangeOriginator_def::ExerciseControl:
case ProjectDataManagement::StateChangeOriginator_def::ObserverController:
case ProjectDataManagement::StateChangeOriginator_def::Initialization:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
injuryPartyId = 1; // O/C
break;
case ProjectDataManagement::StateChangeOriginator_def::Participant:
injuryPartyId = m_allParticipants.value(youngestStateInformation.originatorId()).partyId();
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
injuryPartyId = m_allParticipants.value(youngestStateInformation.originatorId).partyId;
if (injuryPartyId == 0)
injuryPartyId = 1;
break;
case ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator_def::FunctionalArea:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
{
auto it = m_aesId2PartyId.constFind(youngestStateInformation.originatorId());
auto it = m_aesId2PartyId.constFind(youngestStateInformation.originatorId);
if (it != m_aesId2PartyId.constEnd())
injuryPartyId = it.value();
break;
}
case ProjectDataManagement::StateChangeOriginator_def::DusMine:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
{
int partyId = m_aesDtc->partyForDusMine(youngestStateInformation.originatorId());
int partyId = m_aesDtc->partyForDusMine(youngestStateInformation.originatorId);
if (partyId >= 0)
injuryPartyId = partyId;
if (partyId == -1)
m_participantWithMaybeMissingPartyId.insert(data.participantId());
m_participantWithMaybeMissingPartyId.insert(data.participantId);
else
m_participantWithMaybeMissingPartyId.remove(data.participantId());
m_participantWithMaybeMissingPartyId.remove(data.participantId);
break;
}
case ProjectDataManagement::StateChangeOriginator_def::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
{
const auto ied = m_gimDtc->iedForEquipmentNumber(youngestStateInformation.originatorId());
if (ied.equipmentNumber() != 0)
injuryPartyId = ied.partyId();
const auto ied = m_gimDtc->iedForEquipmentNumber(youngestStateInformation.originatorId);
if (ied.equipmentNumber != 0)
injuryPartyId = ied.partyId;
break;
}
case ProjectDataManagement::StateChangeOriginator_def::WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator_def::MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator_def::Sanitation:
case ProjectDataManagement::StateChangeOriginator_def::MedicalTimeout:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
// not yet used
break;
}
LtsUtils::set1Byte(injuryPartyId, buf);
if (m_bWithVBGTime)
LtsUtils::set4Byte(youngestStateInformation.stateTime() / 1000, buf);
LtsUtils::set4Byte(youngestStateInformation.stateTime / 1000, buf);
//add vitality and sanitation result
// Quick fix: If vitality is
uint8_t vitRes = (youngestStateInformation.vitality() / 10);
uint8_t vitRes = (youngestStateInformation.vitality / 10);
if (vitRes > 10)
{
WARNING_LOG(m_logger) << "Vitality of Participant " << data.participantId() << " is not between 0 and 100%. Putting to 100%";
WARNING_LOG(m_logger) << "Vitality of Participant " << data.participantId << " is not between 0 and 100%. Putting to 100%";
vitRes = 10;
}
vitRes += ((int)youngestStateInformation.sanitationResult().underlying() << 4);
vitRes += ((int)youngestStateInformation.sanitationResult << 4);
LtsUtils::set1Byte(vitRes, buf);
//finall 1 Byte for originator and maybe more
LtsUtils::set1Byte(youngestStateInformation.originatorType().underlying(), buf);
LtsUtils::set1Byte(youngestStateInformation.originatorType, buf);
}
@@ -942,9 +942,9 @@ void HandlerOcSituationData::addStructure(QByteArray &buf, const ParticipantMana
{
if (!bAdd)
return;
LtsUtils::set2Byte(data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0, buf);
LtsUtils::set2Byte(data.typeId(), buf);
LtsUtils::set2Byte(data.partyId(), buf);
LtsUtils::set2Byte(data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0, buf);
LtsUtils::set2Byte(data.typeId, buf);
LtsUtils::set2Byte(data.partyId, buf);
#ifndef GUEZ_MODE
LtsUtils::set2Byte(data.superiorId(), buf);
#endif
@@ -954,29 +954,29 @@ void HandlerOcSituationData::addDesignator(QByteArray &buf, const ParticipantMan
{
if (!bAdd)
return;
const size_t len1 = std::min(data.designator().size(), size_t(15));
const size_t len2 = std::min(data.tacticalIdentifier().size(), size_t(15));
const size_t len1 = std::min(data.designator.size(), size_t(15));
const size_t len2 = std::min(data.tacticalIdentifier.size(), size_t(15));
unsigned char len = ((len1 & 0x0F) | ((len2 & 0x0F) << 4));
LtsUtils::set1Byte(len, buf);
buf.append(data.designator().c_str(), len1);
buf.append(data.tacticalIdentifier().c_str(), len2);
buf.append(data.designator.c_str(), len1);
buf.append(data.tacticalIdentifier.c_str(), len2);
}
void HandlerOcSituationData::addSymbolSidc(QByteArray &buf, const ParticipantManagement::Participant &data, bool bAdd) const
{
if (!bAdd)
return;
const auto type = m_ppmDtc->type(data.typeId());
if (type.symbol() == data.symbol())
const auto type = m_ppmDtc->type(data.typeId);
if (type.symbol == data.symbol)
{
LtsUtils::set1Byte(0, buf); // 0 bytes -> marker for not sending the symbol sidc since it can be taken from the type
return;
}
if (data.symbol().size() > 255)
if (data.symbol.size() > 255)
return;
const size_t len1 = std::min(data.symbol().size(), size_t(255));
const size_t len1 = std::min(data.symbol.size(), size_t(255));
LtsUtils::set1Byte(len1, buf);
buf.append(data.symbol().c_str(), len1);
buf.append(data.symbol.c_str(), len1);
}
} // namespace OcSituationServer
@@ -40,7 +40,7 @@ public:
int radius,
bool filterActive,
QSet<int> partys,
QSet<ParticipantManagement::TypeClass::type> typeClasses);
QSet<ParticipantManagement::TypeClass> typeClasses);
public slots:
void requestOcSituationData(OcSituation::SituationCenterType centerType,
@@ -49,7 +49,7 @@ public slots:
int radius,
bool filterActive,
QSet<int> partyList,
QSet<ParticipantManagement::TypeClass::type> typeClassList,
QSet<ParticipantManagement::TypeClass> typeClassList,
bool initial);
signals:
@@ -68,7 +68,7 @@ private:
int m_radius{0}; // observer radius in meter
QSet<int> m_partyList;
bool m_filterActive;
QSet<ParticipantManagement::TypeClass::type> m_typeClassList;
QSet<ParticipantManagement::TypeClass> m_typeClassList;
MainHandler *m_mainHandler{nullptr}; // provides TAB FTC and PPM DTC
HandlerOcSituationData *m_handler{nullptr}; // OC-Thread-Object
@@ -118,7 +118,7 @@ public slots:
const Core::GeoPosition2D &centerPosition,
int radius, bool filterActive,
QSet<int> partys,
QSet<ParticipantManagement::TypeClass::type> typeClasses,
QSet<ParticipantManagement::TypeClass> typeClasses,
bool initial);
private slots:
@@ -175,7 +175,7 @@ private:
QSet<int> m_newlyOutdatedParticipants;
QMap<int, int> m_participantsNotSend; // map <particpant Id, count of not send>
QMap<int, int> m_participantId2EqId; // for debugging purposes
QSet<ParticipantManagement::TypeClass::type> m_typeClassList;
QSet<ParticipantManagement::TypeClass> m_typeClassList;
QSet<int> m_partyList;
bool m_filterActive;
@@ -46,7 +46,7 @@ bool PositionConverter::initCoordConversion()
return false;
}
const auto ex = m_exmDtc->exercise(m_mainHandler->exerciseId());
if (ex.id() <= 0)
if (ex.id <= 0)
{
ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
return false;
@@ -56,16 +56,16 @@ bool PositionConverter::initCoordConversion()
ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
return false;
}
const auto ta = m_asmDtc->trainingArea(ex.trainingAreaId());
if (ta.id() <= 0)
const auto ta = m_asmDtc->trainingArea(ex.trainingAreaId);
if (ta.id <= 0)
{
ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId();
ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId;
return false;
}
// calc tetra base point from training area center
const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat()));
const QPointF mid(bottomLeft.geographic(ta.width() / 2, ta.height() / 2));
const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat));
const QPointF mid(bottomLeft.geographic(ta.width / 2, ta.height / 2));
// our center point is NNxYY 00000 00000 by definition
// (we can also use current ta center but the it's hard to debug the coordinates in Tetra LogViewer)
@@ -45,7 +45,7 @@ public:
const LtsCoordTrans::UtmCoordinate &baseCoord)
{
// convert lon/lat to utm with the given zone from the center point
const LtsCoordTrans::UtmCoordinate point(LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat(), baseCoord.zone));
const LtsCoordTrans::UtmCoordinate point(LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon, pos.lat, baseCoord.zone));
// now calc distance from point to base point == relative position
return QPointF(point.x - baseCoord.x, point.y - baseCoord.y);
}