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
+21
-21
@@ -203,7 +203,7 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
|
||||
ttData.partyId = data.partyId;
|
||||
ttData.vitality = lastVitality(data.participantId, data.sampleTime);
|
||||
ttData.vulnerability = lastVulnerabilityKind(data.participantId, data.sampleTime);
|
||||
ttData.vulnerabilityState = m_vulnStateMap[data.participantId];
|
||||
ttData.vulnerabilityState = static_cast<int>(m_vulnStateMap[data.participantId]);
|
||||
ttData.eventTime = timeMounted;
|
||||
ttData.eventTypeId = ReportManagement::EventType::TransportInitiated;
|
||||
ttData.id = 0; // force insert
|
||||
@@ -360,7 +360,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
tData.participantId = data.participantId;
|
||||
tData.participantTypeId = pData.typeId;
|
||||
tData.partyId = pData.partyId;
|
||||
tData.qualification = data.qualification;
|
||||
tData.qualification = static_cast<qint32>(data.qualification);
|
||||
|
||||
// Report Treatment Timeline
|
||||
Database::RepTreatmentTimelineData ttData;
|
||||
@@ -388,10 +388,10 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
|
||||
// Report Unit Power
|
||||
upData.ready = isCombatReady;
|
||||
upData.vulnerabilityState = vulnState;
|
||||
upData.vulnerabilityState = static_cast<qint32>(vulnState);
|
||||
|
||||
// Report Treatment (add vulnerabiltyState without treatment )
|
||||
tData.vulnerabilityState = vulnState;
|
||||
tData.vulnerabilityState = static_cast<qint32>(vulnState);
|
||||
tData.timeVulnerability = stateInfo.stateTime;
|
||||
tData.timeTreatment = 0;
|
||||
|
||||
@@ -405,11 +405,11 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
}
|
||||
|
||||
// Report Firings
|
||||
fData.vulnerabilityState = vulnState;
|
||||
fData.vulnerabilityState = static_cast<qint32>(vulnState);
|
||||
fData.chargeTypeId = stateInfo.originatorChargeTypeId; // here we keep the original chargeId
|
||||
|
||||
// Report AirSupport
|
||||
airSupData.vulnerabilityState = vulnState;
|
||||
airSupData.vulnerabilityState = static_cast<qint32>(vulnState);
|
||||
airSupData.chargeTypeId = stateInfo.originatorChargeTypeId;
|
||||
|
||||
// get the corresponding originator participant, it should be already in the map
|
||||
@@ -454,7 +454,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
|
||||
//save TreatmentTimeline events too
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
|
||||
@@ -510,7 +510,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
|
||||
//save TreatmentTimeline events too
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
|
||||
@@ -614,7 +614,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
{
|
||||
if (nbcData.nbcId == 0) // get the id from AES Item View ?
|
||||
nbcData.nbcId = aesItemView.aesItemId;
|
||||
nbcData.aesType = aesType;
|
||||
nbcData.aesType = static_cast<int>(aesType);
|
||||
nbcData.chargeTypeId = aesItemView.chargeStruct.chargeTypeId;
|
||||
if (nbcData.nbcId > 0 && nbcData.chargeTypeId > 0)
|
||||
{
|
||||
@@ -635,7 +635,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
ERROR_LOG(m_logger) << "Error while inserting maintenance data for participantId: " << vrData.participantId;
|
||||
|
||||
// treatment timeline event EnterFunctionalArea
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
ttData.eventTime = stateInfo.stateTime;
|
||||
@@ -671,7 +671,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
{
|
||||
//const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory());
|
||||
|
||||
tData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
tData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
tData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
tData.vitality = stateInfo.vitality;
|
||||
|
||||
@@ -696,8 +696,8 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
}
|
||||
|
||||
tData.timeTreatment = data.sampleTime;
|
||||
tData.sanitationResult = stateInfo.sanitationResult;
|
||||
tData.sanitationEvaluation = stateInfo.sanitationEvaluation;
|
||||
tData.sanitationResult = static_cast<qint32>(stateInfo.sanitationResult);
|
||||
tData.sanitationEvaluation = static_cast<qint32>(stateInfo.sanitationEvaluation);
|
||||
tData.sanitationProceduresTaken = stateInfo.sanitationProceduresTaken;
|
||||
tData.timePositionChanged = getLastSignificantParticipantPositionChanged(tData.participantId, tData.timeTreatment, getLastPosition(tData.participantId));
|
||||
|
||||
@@ -723,7 +723,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
|
||||
// now treatment timeline events
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
|
||||
@@ -780,7 +780,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
// treatment timeline events NineLinerSet and TransportRequested
|
||||
if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController)
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
if (stateInfo.originatorChargeTypeId == 1) // 9Liner created
|
||||
@@ -806,7 +806,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
// DemandVulnerabilityStateChange TAB -> StateChange -> SetInjury
|
||||
if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl)
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
ttData.eventTime = stateInfo.stateTime;
|
||||
@@ -821,9 +821,9 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
|
||||
// Vitality and Vulnerability reset manually
|
||||
if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization)
|
||||
// && stateInfo.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady)
|
||||
// && stateInfo.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
ttData.eventTime = stateInfo.stateTime;
|
||||
@@ -837,7 +837,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
// StateChange -> VBGSet
|
||||
if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout)
|
||||
{
|
||||
ttData.vulnerabilityState = stateInfo.vulnerabilityState;
|
||||
ttData.vulnerabilityState = static_cast<qint32>(stateInfo.vulnerabilityState);
|
||||
ttData.vulnerability = stateInfo.vulnerabilityKindId;
|
||||
ttData.vitality = stateInfo.vitality;
|
||||
ttData.eventTime = stateInfo.stateTime;
|
||||
@@ -970,7 +970,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
sanData.participantTypeId = pData.typeId;
|
||||
sanData.eventTime = data.sampleTime;
|
||||
sanData.sanitationUniqueId = data.sanitationUniqueId;
|
||||
sanData.qualification = data.qualification;
|
||||
sanData.qualification = static_cast<qint32>(data.qualification);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Qualification = " << sanData.qualification;
|
||||
|
||||
@@ -1006,7 +1006,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
|
||||
airSupData.buildingId = data.structureElementId;
|
||||
airSupData.chargeTypeId = data.chargeTypeId;
|
||||
// Hits on Building will be stored as catastrophic kill
|
||||
airSupData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
|
||||
airSupData.vulnerabilityState = static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
|
||||
airSupData.hitBuilding = 1;
|
||||
airSupData.eventTime = data.sampleTime;
|
||||
|
||||
|
||||
+4
-4
@@ -238,9 +238,9 @@ bool HandlerReportData::generateAirSupportResult(const CreateModifyReportRequest
|
||||
|
||||
if (!vbgMap.contains(vbg))
|
||||
vbgMap.insert(vbg, {0, 0, 0});
|
||||
if (vbg == ProjectDataManagement::VulnerabilityState_def::CombatReady ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState_def::NearMiss ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect)
|
||||
if (vbg == ProjectDataManagement::VulnerabilityState::CombatReady ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState::NearMiss ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState::HitWithNoEffect)
|
||||
continue;
|
||||
|
||||
vbgMap[vbg][0] += qSelect2.value(1).toInt(); // hits
|
||||
@@ -274,7 +274,7 @@ bool HandlerReportData::generateAirSupportResult(const CreateModifyReportRequest
|
||||
|
||||
if (vbgMap.isEmpty())
|
||||
{
|
||||
qInsert.bindValue(QStringLiteral(":vbg"),ProjectDataManagement::VulnerabilityState_def::NearMiss);
|
||||
qInsert.bindValue(QStringLiteral(":vbg"),ProjectDataManagement::VulnerabilityState::NearMiss);
|
||||
qInsert.bindValue(QStringLiteral(":impacts"), impacts);
|
||||
qInsert.bindValue(QStringLiteral(":hit"), 0);
|
||||
qInsert.bindValue(QStringLiteral(":hit_ff"), 0);
|
||||
|
||||
+1
-1
@@ -207,7 +207,7 @@ void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdent
|
||||
break;
|
||||
}
|
||||
|
||||
case ReportManagement::ReportType_def::MedevacNineLiner:
|
||||
case ReportManagement::ReportType::MedevacNineLiner:
|
||||
{
|
||||
ok = generateMedevacNineLinerResult(request, reportId);
|
||||
break;
|
||||
|
||||
+3
-3
@@ -105,9 +105,9 @@ bool HandlerReportData::generateFiringsResult(const CreateModifyReportRequest &r
|
||||
int vbg = qSelect.value(0).toInt();
|
||||
if (!vbgMap.contains(vbg))
|
||||
vbgMap.insert(vbg, {0, 0, 0});
|
||||
if (vbg == ProjectDataManagement::VulnerabilityState_def::CombatReady ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState_def::NearMiss ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect)
|
||||
if (vbg == ProjectDataManagement::VulnerabilityState::CombatReady ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState::NearMiss ||
|
||||
vbg == ProjectDataManagement::VulnerabilityState::HitWithNoEffect)
|
||||
vbgMap[vbg][0] ++; // firings
|
||||
|
||||
vbgMap[vbg][1] += qSelect.value(1).toInt(); // hits
|
||||
|
||||
+3
-3
@@ -147,7 +147,7 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest
|
||||
|
||||
bool kiaAfterWia = false;
|
||||
// Check if KIA is also KIA after WIA
|
||||
if (tData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
|
||||
if (tData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
kiaAfterWia = checkVulnerabilityStateWIA(tData.participantId, tData.time_vulnerability);
|
||||
|
||||
qInsert.bindValue(QStringLiteral(":kia_after_wia"), kiaAfterWia);
|
||||
@@ -549,8 +549,8 @@ bool HandlerReportData::checkVulnerabilityStateWIA(int participantId, qint64 cur
|
||||
|
||||
qSelect.prepare(stmtSelect);
|
||||
qSelect.bindValue(QStringLiteral(":currTime"), currTime);
|
||||
qSelect.bindValue(QStringLiteral(":eventTypeId"), ReportManagement::EventType_def::VBGSet);
|
||||
qSelect.bindValue(QStringLiteral(":vulnerabilityState"), ProjectDataManagement::VulnerabilityState_def::CatastrophicKill);
|
||||
qSelect.bindValue(QStringLiteral(":eventTypeId"), ReportManagement::EventType::VBGSet);
|
||||
qSelect.bindValue(QStringLiteral(":vulnerabilityState"), ProjectDataManagement::VulnerabilityState::CatastrophicKill);
|
||||
qSelect.bindValue(QStringLiteral(":participantId"), participantId);
|
||||
|
||||
if (!qSelect.exec())
|
||||
|
||||
+1
-1
@@ -157,7 +157,7 @@ void RepTests::tryCreate(ReportType repType, VisualisationType visType)
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Report";
|
||||
CreateModifyReportRequest request;
|
||||
|
||||
QString repName = QStringLiteral("Test Report - type ") + QString::number(repType);
|
||||
QString repName = QStringLiteral("Test Report - type ") + QString::number(static_cast<int>(repType));
|
||||
request.name = repName.toStdString();
|
||||
request.description = "Test Report Description";
|
||||
request.reportType = repType;
|
||||
|
||||
Reference in new issue
Block a user