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
@@ -63,12 +63,12 @@ bool BldConfigDialog::init(LtsSession::LtsSession* session)
|
||||
void BldConfigDialog::fillCbx()
|
||||
{
|
||||
m_ui->cmbStatus->clear();
|
||||
m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::NoChange),
|
||||
ProjectDataManagement::VulnerabilityState::NoChange);
|
||||
m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::CombatReady),
|
||||
ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill),
|
||||
ProjectDataManagement::VulnerabilityState::CatastrophicKill);
|
||||
m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange),
|
||||
ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange);
|
||||
m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady),
|
||||
ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
|
||||
m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill),
|
||||
ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
|
||||
m_ui->cmbStatus->setCurrentIndex(m_ui->cmbStatus->findData(m_bldState.vulnerabilityState().underlying()));
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ bool BldConfigDialog::apply()
|
||||
requestData.buildings({building});
|
||||
|
||||
ProjectDataManagement::VulnerabilityState state =
|
||||
static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cmbStatus->currentData().toInt());
|
||||
static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cmbStatus->currentData().toInt());
|
||||
requestData.vulnerabilityState(state);
|
||||
|
||||
requestData.resetContamination(m_ui->chbResetContamination->isChecked());
|
||||
@@ -110,8 +110,8 @@ void Buildings::BldConfigDialog::slotCmbStatusCurrentIndexChanged(int index)
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
ProjectDataManagement::VulnerabilityState state =
|
||||
static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cmbStatus->currentData().toInt());
|
||||
if (state == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
|
||||
static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cmbStatus->currentData().toInt());
|
||||
if (state == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
{
|
||||
m_ui->chbResetContamination->setEnabled(true);
|
||||
m_ui->chbResetContamination->setChecked(false);
|
||||
|
||||
+1
-1
@@ -422,7 +422,7 @@ int BldInfoDialog::findFloorIdByRoomId(int roomId) noexcept(false)
|
||||
if (!getRoom(parentSeId, parentSe))
|
||||
continue;
|
||||
|
||||
if (parentSe.structureElementTypeId().underlying() != StructureElementType_def::Floor)
|
||||
if (parentSe.structureElementTypeId().underlying() != StructureElementType::Floor)
|
||||
continue;
|
||||
|
||||
m_floorNames.insert(parentSeId, QString::fromStdString(parentSe.displayName()));
|
||||
|
||||
+5
-5
@@ -178,13 +178,13 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString)
|
||||
|
||||
const InfrastructureManagement::StructureElement &firstElement = elements.front();
|
||||
|
||||
const InfrastructureManagement::StructureElementType_def::type type = firstElement.structureElementTypeId().underlying();
|
||||
const InfrastructureManagement::StructureElementType type = static_cast<InfrastructureManagement::StructureElementType>(firstElement.structureElementTypeId());
|
||||
|
||||
if (type == InfrastructureManagement::StructureElementType_def::Building)
|
||||
if (type == InfrastructureManagement::StructureElementType::Building)
|
||||
{
|
||||
if (!(m_ismDataIfc && m_ismDataIfc->isBuildingsInCurrentExercise(data.id())))
|
||||
return;
|
||||
} else if (type != InfrastructureManagement::StructureElementType_def::Bridge)
|
||||
} else if (type != InfrastructureManagement::StructureElementType::Bridge)
|
||||
return;
|
||||
|
||||
|
||||
@@ -208,10 +208,10 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString)
|
||||
if (displayName.contains(searchString, Qt::CaseSensitivity::CaseInsensitive))
|
||||
{
|
||||
switch (type) {
|
||||
case InfrastructureManagement::StructureElementType_def::Building:
|
||||
case InfrastructureManagement::StructureElementType::Building:
|
||||
bldIdCont.append(data.id());
|
||||
break;
|
||||
case InfrastructureManagement::StructureElementType_def::Bridge:
|
||||
case InfrastructureManagement::StructureElementType::Bridge:
|
||||
bridgeIdCont.append(data.id());
|
||||
break;
|
||||
default:
|
||||
|
||||
+1
-1
@@ -215,7 +215,7 @@ void BridgeInfoDialog::bridgeStatusChanged()
|
||||
case InfrastructureManagement::BridgeStatus::Intact:
|
||||
data.status(InfrastructureManagement::BridgeStatus::Intact);
|
||||
break;
|
||||
case InfrastructureManagement::BridgeStatus_def::Broken:
|
||||
case InfrastructureManagement::BridgeStatus::Broken:
|
||||
data.status(InfrastructureManagement::BridgeStatus::Broken);
|
||||
break;
|
||||
default:
|
||||
|
||||
+4
-4
@@ -244,9 +244,9 @@ bool EgcuInfoDialog::readAllowance(InfrastructureManagement::EffectOverride eo,
|
||||
return true;
|
||||
|
||||
QJsonObject docObj = QJsonObject(doc.object());
|
||||
if (eo == InfrastructureManagement::EffectOverride_def::PermanentOn)
|
||||
if (eo == InfrastructureManagement::EffectOverride::PermanentOn)
|
||||
return docObj.value(QStringLiteral("allowPermanentOn")).toBool(true);
|
||||
else if (eo == InfrastructureManagement::EffectOverride_def::PermanentOff)
|
||||
else if (eo == InfrastructureManagement::EffectOverride::PermanentOff)
|
||||
return docObj.value(QStringLiteral("allowPermanentOff")).toBool(true);
|
||||
else
|
||||
return true;
|
||||
@@ -367,10 +367,10 @@ void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElem
|
||||
allRelayIds.removeOne(relayId);
|
||||
int value = objState.value(relayIdString).toInt();
|
||||
if (m_relayInfoWidgets.contains(relayId))
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(static_cast<InfrastructureManagement::EffectOverride::inner_enum>(value));
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(static_cast<InfrastructureManagement::EffectOverride>(value));
|
||||
}
|
||||
for (auto relayId : std::as_const(allRelayIds))
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(InfrastructureManagement::EffectOverride_def::Automatic);
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(InfrastructureManagement::EffectOverride::Automatic);
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -255,8 +255,8 @@ void EgcuOperationalDialog::onInstrumentationAssetChanged(
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id:" << data.id();
|
||||
|
||||
if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit
|
||||
&& data.assetStateId() == InfrastructureManagement::InstrumentationAssetState_def::Mounted)
|
||||
if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit
|
||||
&& data.assetStateId() == InfrastructureManagement::InstrumentationAssetState::Mounted)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Insert instrumentation asset id=" << data.id();
|
||||
m_instrumentationAssets.insert(data.id(), data);
|
||||
|
||||
+9
-9
@@ -74,13 +74,13 @@ void RelayInfoWidget::setEffectOverride(InfrastructureManagement::EffectOverride
|
||||
{
|
||||
switch (override.underlying())
|
||||
{
|
||||
case InfrastructureManagement::EffectOverride_def::Automatic:
|
||||
case InfrastructureManagement::EffectOverride::Automatic:
|
||||
m_ui->tbAuto->setChecked(true);
|
||||
break;
|
||||
case InfrastructureManagement::EffectOverride_def::PermanentOn:
|
||||
case InfrastructureManagement::EffectOverride::PermanentOn:
|
||||
m_ui->tbOn->setChecked(true);
|
||||
break;
|
||||
case InfrastructureManagement::EffectOverride_def::PermanentOff:
|
||||
case InfrastructureManagement::EffectOverride::PermanentOff:
|
||||
m_ui->tbOff->setChecked(true);
|
||||
break;
|
||||
}
|
||||
@@ -90,13 +90,13 @@ void RelayInfoWidget::setEffectOverrideEnabled(InfrastructureManagement::EffectO
|
||||
{
|
||||
switch (override.underlying())
|
||||
{
|
||||
case InfrastructureManagement::EffectOverride_def::Automatic:
|
||||
case InfrastructureManagement::EffectOverride::Automatic:
|
||||
m_ui->tbAuto->setEnabled(enable);
|
||||
break;
|
||||
case InfrastructureManagement::EffectOverride_def::PermanentOn:
|
||||
case InfrastructureManagement::EffectOverride::PermanentOn:
|
||||
m_ui->tbOn->setEnabled(enable);
|
||||
break;
|
||||
case InfrastructureManagement::EffectOverride_def::PermanentOff:
|
||||
case InfrastructureManagement::EffectOverride::PermanentOff:
|
||||
m_ui->tbOff->setEnabled(enable);
|
||||
break;
|
||||
}
|
||||
@@ -112,11 +112,11 @@ void RelayInfoWidget::onButtonClicked()
|
||||
QAbstractButton* ab = qobject_cast<QAbstractButton*>(sender());
|
||||
if (!ab)
|
||||
return;
|
||||
InfrastructureManagement::EffectOverride eo = InfrastructureManagement::EffectOverride_def::Automatic;
|
||||
InfrastructureManagement::EffectOverride eo = InfrastructureManagement::EffectOverride::Automatic;
|
||||
if (ab == m_ui->tbOff)
|
||||
eo = InfrastructureManagement::EffectOverride_def::PermanentOff;
|
||||
eo = InfrastructureManagement::EffectOverride::PermanentOff;
|
||||
else if (ab == m_ui->tbOn)
|
||||
eo = InfrastructureManagement::EffectOverride_def::PermanentOn;
|
||||
eo = InfrastructureManagement::EffectOverride::PermanentOn;
|
||||
|
||||
emit effectOverrideChanged(m_id, eo);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user