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
+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())
|
||||
|
||||
Reference in new issue
Block a user