Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+198
-198
@@ -203,14 +203,14 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
|
||||
}
|
||||
|
||||
else if (data.effectStateId() == AesEffectState::EsPrepared &&
|
||||
data.aesTypeId() == AesType_def::AtExplosionAreaSingleExplosions)
|
||||
data.aesTypeId() == AesType::AtExplosionAreaSingleExplosions)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " added";
|
||||
m_aesItemViews.insert(data.aesItemId(), data);
|
||||
m_takenIndicesForAesItem.insert(data.aesItemId(), QVector<int32_t>());
|
||||
}
|
||||
|
||||
else if (data.aesTypeId() == AesType_def::AtBCContamination)
|
||||
else if (data.aesTypeId() == AesType::AtBCContamination)
|
||||
{
|
||||
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
|
||||
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
|
||||
@@ -247,7 +247,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
|
||||
m_takenIndicesForAesItem.remove(data.aesItemId());
|
||||
return;
|
||||
}
|
||||
if (data.aesTypeId() != AesType_def::AtExplosionAreaSingleExplosions)
|
||||
if (data.aesTypeId() != AesType::AtExplosionAreaSingleExplosions)
|
||||
return;
|
||||
|
||||
if (!m_aesItemViews.contains(data.aesItemId()))
|
||||
@@ -289,7 +289,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
|
||||
m_handledImpactsStorage.removeAesItem(aesItemId);
|
||||
return;
|
||||
}
|
||||
if (data.aesTypeId() != AesType_def::AtExplosionClusterSingleExplosions)
|
||||
if (data.aesTypeId() != AesType::AtExplosionClusterSingleExplosions)
|
||||
return;
|
||||
|
||||
const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = data.singleEffects();
|
||||
@@ -324,7 +324,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
|
||||
{
|
||||
++curSeIndex;
|
||||
|
||||
if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered)
|
||||
if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -478,10 +478,10 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
|
||||
|
||||
bool AesHandler::isModifiable(const AreaEffectSimulation::AesItem &item)
|
||||
{
|
||||
return (item.effectStateId() == AesEffectState_def::EsCreated ||
|
||||
item.effectStateId() == AesEffectState_def::EsPrepared ||
|
||||
item.effectStateId() == AesEffectState_def::EsUnknown ||
|
||||
item.effectStateId() == AesEffectState_def::EsReceived);
|
||||
return (item.effectStateId() == AesEffectState::EsCreated ||
|
||||
item.effectStateId() == AesEffectState::EsPrepared ||
|
||||
item.effectStateId() == AesEffectState::EsUnknown ||
|
||||
item.effectStateId() == AesEffectState::EsReceived);
|
||||
}
|
||||
|
||||
|
||||
@@ -493,9 +493,9 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
{
|
||||
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -509,7 +509,7 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
|
||||
req->name(newName);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -523,34 +523,34 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
|
||||
req->name(newName);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -567,9 +567,9 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
{
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -577,7 +577,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
|
||||
});
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -585,34 +585,34 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
|
||||
});
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
return;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
return;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
return;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -629,9 +629,9 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
{
|
||||
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -645,7 +645,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
|
||||
req->effectStart(msecsSinceEpoch);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea";
|
||||
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
@@ -661,34 +661,34 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
|
||||
req->effectStart(msecsSinceEpoch);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -701,9 +701,9 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
{
|
||||
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -717,7 +717,7 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
|
||||
req->partyId(partyId);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -731,34 +731,34 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
|
||||
req->partyId(partyId);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -784,9 +784,9 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
{
|
||||
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
const int timeMSec = checkDuration(u_time, 60 * 60 * 1000, m_logger);
|
||||
@@ -801,7 +801,7 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
|
||||
req->effectDuration(timeMSec);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
const int timeMSec = checkDuration(u_time, 60 * 60 * 1000, m_logger);
|
||||
@@ -816,34 +816,34 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
|
||||
req->effectDuration(timeMSec);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -856,11 +856,11 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId)
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -874,34 +874,34 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId)
|
||||
req->chargeStruct().chargeTypeId(chargeTypeId);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -962,9 +962,9 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
|
||||
|
||||
switch (type.underlying())
|
||||
{
|
||||
case AreaEffectSimulation::AesType_def::AtBCContamination:
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtMineCorridor:
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
{
|
||||
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -987,7 +987,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
|
||||
req->width(width);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtMineArea:
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
{
|
||||
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
|
||||
if (!req)
|
||||
@@ -1011,34 +1011,34 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
|
||||
req->width(width);
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtNContamination:
|
||||
case AreaEffectSimulation::AesType::AtNContamination:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionArea:
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
break;
|
||||
case AreaEffectSimulation::AesType_def::AtUnknown:
|
||||
case AreaEffectSimulation::AesType_def::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtBorderline:
|
||||
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType_def::AtReconArea:
|
||||
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType_def::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
case AreaEffectSimulation::AesType::AtTechnicalArea:
|
||||
case AreaEffectSimulation::AesType::AtReconArea:
|
||||
case AreaEffectSimulation::AesType::AtDusSingleMine:
|
||||
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
|
||||
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user