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
+15
-15
@@ -119,10 +119,10 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
|
||||
else
|
||||
{
|
||||
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.participantTypeId());
|
||||
if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::SupportUnit
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::Unit
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::Unknown)
|
||||
if (typeClass == ParticipantManagement::TypeClass::SupportEntity
|
||||
|| typeClass == ParticipantManagement::TypeClass::SupportUnit
|
||||
|| typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| typeClass == ParticipantManagement::TypeClass::Unknown)
|
||||
return;
|
||||
|
||||
// [GUEZE-3102] Aufgesessene Teilnehmer bekommen den Schaden vom Fahrzeug, auf dem sie aufgesessen sind.
|
||||
@@ -224,14 +224,14 @@ void HandlerParticipant::onDynamicParticipantDataChanged(const ParticipantManage
|
||||
|
||||
CesParticipantData &participantPosition = m_positionsMap[data.participantId()]; // reference!
|
||||
// save vulnerabilityState in participantHandler
|
||||
ProjectDataManagement::VulnerabilityState newVulnerabilityState = ProjectDataManagement::VulnerabilityState_def::CombatReady;
|
||||
ProjectDataManagement::VulnerabilityState newVulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady;
|
||||
if (data.stateHistory().size() > 0)
|
||||
{
|
||||
const ParticipantManagement::StateInformation &vul = ParticipantManagement::youngestStateInformation(data.stateHistory());
|
||||
newVulnerabilityState = vul.vulnerabilityState();
|
||||
DEBUG_LOG(m_logger) << "newVulnerabilityState" << vul.vulnerabilityState();
|
||||
|
||||
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady)
|
||||
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
|
||||
{
|
||||
emit participantDecontaminated(participantPosition.participantId());
|
||||
DEBUG_LOG(m_logger) << "emit participantDecontaminated id=" << participantPosition.participantId();
|
||||
@@ -259,10 +259,10 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
|
||||
|
||||
// No OC in CES
|
||||
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.typeId());
|
||||
if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::SupportUnit
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::Unit
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::Unknown)
|
||||
if (typeClass == ParticipantManagement::TypeClass::SupportEntity
|
||||
|| typeClass == ParticipantManagement::TypeClass::SupportUnit
|
||||
|| typeClass == ParticipantManagement::TypeClass::Unit
|
||||
|| typeClass == ParticipantManagement::TypeClass::Unknown)
|
||||
return;
|
||||
m_participantData[data.id()] = data;
|
||||
|
||||
@@ -353,7 +353,7 @@ QHash<int, HandlerParticipant::CesParticipantData> HandlerParticipant::positions
|
||||
for (const HandlerParticipant::CesParticipantData &pos : m_positionsMap)
|
||||
{
|
||||
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(pos.participantTypeId());
|
||||
if (typeClass != ParticipantManagement::TypeClass_def::Aircraft)
|
||||
if (typeClass != ParticipantManagement::TypeClass::Aircraft)
|
||||
continue;
|
||||
if (!m_participantData.contains(pos.participantId()))
|
||||
continue;
|
||||
@@ -391,7 +391,7 @@ bool HandlerParticipant::handleCheating(const ParticipantManagement::TypeClass t
|
||||
if (typeClass == ParticipantManagement::TypeClass::Human)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "handle Cheating for Human";
|
||||
if (newVulnerabilityState >= ProjectDataManagement::VulnerabilityState::MediumDamage)
|
||||
if (newVulnerabilityState >= ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage)
|
||||
return true;
|
||||
}
|
||||
if (typeClass == ParticipantManagement::TypeClass::GroundVehicle
|
||||
@@ -399,8 +399,8 @@ bool HandlerParticipant::handleCheating(const ParticipantManagement::TypeClass t
|
||||
|| typeClass == ParticipantManagement::TypeClass::VehicleWithGear)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "handle Cheating for Vehicle";
|
||||
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill
|
||||
|| newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill)
|
||||
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill
|
||||
|| newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -427,7 +427,7 @@ void HandlerParticipant::checkCheating(const int participantId,
|
||||
}
|
||||
else
|
||||
{
|
||||
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
|
||||
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "checkCheating remove id= " << participantId;
|
||||
m_positionsCheatingMap.remove(participantId);
|
||||
|
||||
Reference in new issue
Block a user