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
@@ -180,9 +180,9 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
if (m_session->getForeignGuiInterface<AesBCContamination::ForeignGuiInterface>(ifc))
|
||||
{
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
|
||||
if (gearClass == ProjectDataManagement::GearClass_def::Biological)
|
||||
if (gearClass == ProjectDataManagement::GearClass::Biological)
|
||||
registerDialog(ifc->showEditWindow(aiv.aesItemId(), false, this));
|
||||
else if (gearClass == ProjectDataManagement::GearClass_def::Chemical)
|
||||
else if (gearClass == ProjectDataManagement::GearClass::Chemical)
|
||||
registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
|
||||
}
|
||||
else
|
||||
|
||||
+23
-23
@@ -107,8 +107,8 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView& aesItemView)
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap"));
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: {
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: {
|
||||
handleOffRouteMine(aesItemView);
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this,
|
||||
&AesInfoDialog::onOffRouteMineChanged);
|
||||
@@ -284,14 +284,14 @@ bool AesInfoDialog::init(LtsSession::LtsSession* session, const std::shared_ptr<
|
||||
|
||||
m_ui->lbAesId->setText(tr("AES Id:"));
|
||||
|
||||
if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
|
||||
if (m_aesType == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
|
||||
{
|
||||
|
||||
handleMineAraeSingleMine();
|
||||
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dusMineStateChanged, this,
|
||||
&AesInfoDialog::onDusMineStateChanged);
|
||||
}
|
||||
else if (m_aesType == AreaEffectSimulation::AesType_def::AtDusSingleMine)
|
||||
else if (m_aesType == AreaEffectSimulation::AesType::AtDusSingleMine)
|
||||
{
|
||||
|
||||
handleSingleDusMine();
|
||||
@@ -363,7 +363,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap& data)
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType_def::AtBoobyTrap);
|
||||
handleAesItem(data, AesType::AtBoobyTrap);
|
||||
|
||||
m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
|
||||
|
||||
@@ -390,7 +390,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine&
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType_def::AtOffRouteMine);
|
||||
handleAesItem(data, AesType::AtOffRouteMine);
|
||||
|
||||
m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
|
||||
|
||||
@@ -595,17 +595,17 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
|
||||
|
||||
QStringList chargeTypesNames;
|
||||
QStringList chargeTypesShortNames;
|
||||
if (data.medicMode() != AesOperatingMode_def::OmNotUsed)
|
||||
if (data.medicMode() != AesOperatingMode::OmNotUsed)
|
||||
{
|
||||
chargeTypesNames << m_pdmDtc->trChargeTypeName(411, true);
|
||||
chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(411, true);
|
||||
}
|
||||
if (data.maintMode() != AesOperatingMode_def::OmNotUsed)
|
||||
if (data.maintMode() != AesOperatingMode::OmNotUsed)
|
||||
{
|
||||
chargeTypesNames << m_pdmDtc->trChargeTypeName(412, true);
|
||||
chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(412, true);
|
||||
}
|
||||
if (data.deconMode() != AesOperatingMode_def::OmNotUsed)
|
||||
if (data.deconMode() != AesOperatingMode::OmNotUsed)
|
||||
{
|
||||
chargeTypesNames << m_pdmDtc->trChargeTypeName(413, true);
|
||||
chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(413, true);
|
||||
@@ -693,7 +693,7 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
|
||||
m_ui->lblChargeTypeId->setText(QString::number(ctId));
|
||||
}
|
||||
|
||||
const bool isDus = static_cast<MineClass::type>(m_pdmDtc->mineClass(ctId, 0, 0)) == MineClass::DUS;
|
||||
const bool isDus = static_cast<MineClass>(m_pdmDtc->mineClass(ctId, 0, 0)) == MineClass::DUS;
|
||||
if (isDus)
|
||||
m_ui->lbAesId->setText(tr("DUS Mine Id:"));
|
||||
else
|
||||
@@ -763,28 +763,28 @@ void AesInfoDialog::handleSingleDusMine()
|
||||
|
||||
switch (dsm.effectStateId().underlying())
|
||||
{
|
||||
case AesEffectState_def::EsExpired:
|
||||
case AesEffectState::EsExpired:
|
||||
m_ui->lblStatus->setText(tr("Inactive"));
|
||||
break;
|
||||
case AesEffectState_def::EsRemoved:
|
||||
case AesEffectState::EsRemoved:
|
||||
m_ui->lblStatus->setText(tr("Removed"));
|
||||
break;
|
||||
case AesEffectState_def::EsCreated:
|
||||
case AesEffectState::EsCreated:
|
||||
m_ui->lblStatus->setText(tr("Created"));
|
||||
break;
|
||||
case AesEffectState_def::EsPrepared:
|
||||
case AesEffectState::EsPrepared:
|
||||
m_ui->lblStatus->setText(tr("Prepared"));
|
||||
break;
|
||||
case AesEffectState_def::EsActivated:
|
||||
case AesEffectState::EsActivated:
|
||||
m_ui->lblStatus->setText(tr("Active"));
|
||||
break;
|
||||
case AesEffectState_def::EsPaused:
|
||||
case AesEffectState::EsPaused:
|
||||
m_ui->lblStatus->setText(tr("Paused"));
|
||||
break;
|
||||
case AesEffectState_def::EsError:
|
||||
case AesEffectState::EsError:
|
||||
m_ui->lblStatus->setText(tr("Error"));
|
||||
break;
|
||||
case AesEffectState_def::EsReceived:
|
||||
case AesEffectState::EsReceived:
|
||||
m_ui->lblStatus->setText(tr("Received"));
|
||||
break;
|
||||
default:
|
||||
@@ -847,8 +847,8 @@ void AesInfoDialog::handleAesItem(const AesItem& aesData, AesType aesTypeId)
|
||||
m_pdmDtc->gearClassFromChargeTypeId(aesData.chargeStruct().chargeTypeId());
|
||||
switch (gearClass.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass_def::Biological:
|
||||
case ProjectDataManagement::GearClass_def::Chemical:
|
||||
case ProjectDataManagement::GearClass::Biological:
|
||||
case ProjectDataManagement::GearClass::Chemical:
|
||||
m_ui->lblAesType->setText(ProjectDataManagement::toString(gearClass));
|
||||
break;
|
||||
default:
|
||||
@@ -916,7 +916,7 @@ void AesInfoDialog::onShowDetails()
|
||||
if (m_session->getForeignGuiInterface<AesBCContamination::ForeignGuiInterface>(ifc))
|
||||
{
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_bcChargeTypeId);
|
||||
if (gearClass == ProjectDataManagement::GearClass_def::Biological)
|
||||
if (gearClass == ProjectDataManagement::GearClass::Biological)
|
||||
{
|
||||
AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, false, this);
|
||||
if (dialog)
|
||||
@@ -925,7 +925,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
|
||||
if (gearClass == ProjectDataManagement::GearClass_def::Chemical)
|
||||
if (gearClass == ProjectDataManagement::GearClass::Chemical)
|
||||
{
|
||||
AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, true, this);
|
||||
if (dialog)
|
||||
@@ -1146,7 +1146,7 @@ void AesInfoDialog::onShowDetails()
|
||||
|
||||
bool AesInfoDialog::onResetDusMines()
|
||||
{
|
||||
if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
|
||||
if (m_aesType == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
|
||||
MineResetRequest req(0, {m_aesEntityId});
|
||||
|
||||
Reference in new issue
Block a user