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
+2
-2
@@ -223,7 +223,7 @@ void ParticipantsMoveDialog::onSelectionChanged()
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, isOne && !isParticipantInUseOrAdler);
|
||||
}
|
||||
|
||||
if (m_ppmDtc->type(data.typeId()).typeClass() != ParticipantManagement::TypeClass_def::Unit)
|
||||
if (m_ppmDtc->type(data.typeId()).typeClass() != ParticipantManagement::TypeClass::Unit)
|
||||
{
|
||||
|
||||
if (!data.equipmentNumber().is_set() || data.equipmentNumber().get() <= 0)
|
||||
@@ -734,7 +734,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest(
|
||||
req.participantId(participantData.id());
|
||||
|
||||
bAskOutdated =
|
||||
m_ppmDtc->type(participantData.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit;
|
||||
m_ppmDtc->type(participantData.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit;
|
||||
}
|
||||
|
||||
bool bOnlyOutdated = false;
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ bool ParticipantMoveModel::isSelectableBySimulation(const QModelIndex& index, bo
|
||||
const ParticipantManagement::ParticipantData data(getParticipantData(index));
|
||||
|
||||
if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
|
||||
m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
|
||||
m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
|
||||
isSimulatable = false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated()
|
||||
|
||||
+2
-2
@@ -151,7 +151,7 @@ bool MissionPlanDialog::canBeLocked() const
|
||||
const auto wpStatus = wayPointCurrentStatus(missionPlan);
|
||||
const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId(), m_session->exerciseId());
|
||||
|
||||
if (uas.uasState() == ProjectDataManagement::UasState_def::Manual || wpStatus == WayPointsStatus::Active)
|
||||
if (uas.uasState() == ProjectDataManagement::UasState::Manual || wpStatus == WayPointsStatus::Active)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@@ -168,7 +168,7 @@ bool MissionPlanDialog::canBeUnlocked() const
|
||||
const auto wpStatus = wayPointCurrentStatus(missionPlan);
|
||||
const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId(), m_session->exerciseId());
|
||||
|
||||
if (uas.uasState() == ProjectDataManagement::UasState_def::Manual || wpStatus != WayPointsStatus::Active)
|
||||
if (uas.uasState() == ProjectDataManagement::UasState::Manual || wpStatus != WayPointsStatus::Active)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
+2
-2
@@ -233,7 +233,7 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen
|
||||
youngestState = si;
|
||||
}
|
||||
|
||||
setReady(youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
setReady(youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
|
||||
}
|
||||
|
||||
void MissionPlanEdit::onMissionPlanChanged(const ParticipantManagement::MissionPlan& data,
|
||||
@@ -314,7 +314,7 @@ bool MissionPlanEdit::apply()
|
||||
ParticipantManagement::UAS uasP =
|
||||
m_ppmDtc->getUasByParticipantId(m_ui->participantCBox->currentData().toInt(), m_session->exerciseId());
|
||||
|
||||
if (uasP.uasState() == ProjectDataManagement::UasState_def::Manual &&
|
||||
if (uasP.uasState() == ProjectDataManagement::UasState::Manual &&
|
||||
uasP.participantId() != m_missionPlan.participantId())
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Waypoints can't be saved!: Uas switched to %1-Mode")
|
||||
|
||||
Reference in new issue
Block a user