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
+9
-9
@@ -201,9 +201,9 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(m_ppmDtc->participant(entry.participantId).typeId()).typeClass();
|
||||
const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ?
|
||||
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityState vs = static_cast<ProjectDataManagement::VulnerabilityState_def::type>(entry.vbg);
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityState vs = static_cast<ProjectDataManagement::VulnerabilityState>(entry.vbg);
|
||||
vulnerabilityState = ProjectDataManagement::toString(vs, vc);
|
||||
}
|
||||
return vulnerabilityState;
|
||||
@@ -253,7 +253,7 @@ void HgrAndMineSearchModel::onEquipmentSystemEventDataReply(const Core::Function
|
||||
return;
|
||||
HgrAndMineSearchEntry entry;
|
||||
|
||||
entry.type = ProjectDataManagement::HgrMineSearchFilterType(ProjectDataManagement::HgrMineSearchFilterType_def::Handgrenade);
|
||||
entry.type = ProjectDataManagement::HgrMineSearchFilterType(ProjectDataManagement::HgrMineSearchFilterType::Handgrenade);
|
||||
entry.pos = event.position();
|
||||
entry.timeStamp = event.timeStamp();
|
||||
entry.source = event.equipmentNumber();
|
||||
@@ -287,7 +287,7 @@ void HgrAndMineSearchModel::onRequestedDataAvailable(TimeLineManagement::Timelin
|
||||
event.properties().size())).object();
|
||||
entry.type = m_evtFlt.value(obj.value(QStringLiteral("OriginatorChargeTypeId")).toInt());
|
||||
|
||||
if (entry.type == ProjectDataManagement::HgrMineSearchFilterType::inner_enum::Mine)
|
||||
if (entry.type == ProjectDataManagement::HgrMineSearchFilterType::Mine)
|
||||
continue;
|
||||
|
||||
entry.pos = event.position();
|
||||
@@ -347,9 +347,9 @@ void HgrAndMineSearchModel::doEventRequests()
|
||||
arr += QJsonValue(it.key());
|
||||
const QJsonObject filter({{QStringLiteral("OriginatorChargeTypeId"), arr}});
|
||||
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::Hit,
|
||||
ProjectDataManagement::PdmEventType_def::HitEffectSimulation,
|
||||
ProjectDataManagement::PdmEventType_def::HitMine}, filter);
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_Hit,
|
||||
ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation,
|
||||
ProjectDataManagement::PdmEventType::EventType_HitMine}, filter);
|
||||
|
||||
|
||||
startTime += (24 * 60 * 60 * 1000) + 1;
|
||||
@@ -364,7 +364,7 @@ void HgrAndMineSearchModel::doInsertMines()
|
||||
HgrAndMineSearchEntry entry;
|
||||
QJsonObject properties;
|
||||
|
||||
entry.type = ProjectDataManagement::HgrMineSearchFilterType::inner_enum::Mine;
|
||||
entry.type = ProjectDataManagement::HgrMineSearchFilterType::Mine;
|
||||
entry.timeStamp = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
for (auto it = dusMineStates.constBegin(); it != dusMineStates.constEnd(); ++it)
|
||||
|
||||
Reference in new issue
Block a user