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
+8
-8
@@ -95,35 +95,35 @@ void InfoDialog::showIedInfos()
|
||||
m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState()));
|
||||
|
||||
m_ui->tbwBit->setRowCount(0);
|
||||
if (ied.electronicsError().underlying() != IedError_def::NoError)
|
||||
if (ied.electronicsError().underlying() != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Electronics"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError()));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
if (ied.pyrotechnics1Error().underlying() != IedError_def::NoError)
|
||||
if (ied.pyrotechnics1Error().underlying() != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 1"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error()));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
if (ied.pyrotechnics2Error().underlying() != IedError_def::NoError)
|
||||
if (ied.pyrotechnics2Error().underlying() != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 2"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error()));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
if (ied.pyrotechnics3Error().underlying() != IedError_def::NoError)
|
||||
if (ied.pyrotechnics3Error().underlying() != IedError::NoError)
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 3"));
|
||||
QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error()));
|
||||
addTbwBitEntry(device, error);
|
||||
}
|
||||
|
||||
if ((ied.electronicsError().underlying() == IedError_def::NoError) &&
|
||||
(ied.pyrotechnics1Error().underlying() == IedError_def::NoError) &&
|
||||
(ied.pyrotechnics2Error().underlying() == IedError_def::NoError) &&
|
||||
(ied.pyrotechnics3Error().underlying() == IedError_def::NoError))
|
||||
if ((ied.electronicsError().underlying() == IedError::NoError) &&
|
||||
(ied.pyrotechnics1Error().underlying() == IedError::NoError) &&
|
||||
(ied.pyrotechnics2Error().underlying() == IedError::NoError) &&
|
||||
(ied.pyrotechnics3Error().underlying() == IedError::NoError))
|
||||
{
|
||||
QTableWidgetItem *device = new QTableWidgetItem(tr("no Errors"));
|
||||
addTbwBitEntry(device, nullptr);
|
||||
|
||||
+12
-12
@@ -105,7 +105,7 @@ void PairingEditDialog::onIedSelected(int idx)
|
||||
m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(ied.pairingState().underlying())));
|
||||
|
||||
m_ui->treeViewParticipants->clearSelection();
|
||||
if (ied.pairingState().underlying() == IedPairingState_def::PairedToParticipant)
|
||||
if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
|
||||
{
|
||||
m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId().get()).partyId()));
|
||||
m_participantModel->selectItemByParticipantId(ied.pairedParticipantId().get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
|
||||
@@ -135,7 +135,7 @@ void PairingEditDialog::onParticipantSelected(const QModelIndex &idx)
|
||||
if (checkSelectedParticipantType())
|
||||
{
|
||||
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
|
||||
if (ied.pairingState() == IedPairingState_def::PairedToParticipant)
|
||||
if (ied.pairingState() == IedPairingState::PairedToParticipant)
|
||||
{
|
||||
|
||||
if (m_participantModel->getParticipantData(idx).id() != ied.pairedParticipantId().get())
|
||||
@@ -160,8 +160,8 @@ bool PairingEditDialog::apply()
|
||||
PairIedRequest request;
|
||||
|
||||
request.id(m_ui->cbxIed->currentData().toInt());
|
||||
request.pairingState(static_cast<IedPairingState::inner_enum>(m_ui->cbxPairingState->currentData().toInt()));
|
||||
if (request.pairingState().underlying() == IedPairingState_def::PairedToParticipant)
|
||||
request.pairingState(static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()));
|
||||
if (request.pairingState().underlying() == IedPairingState::PairedToParticipant)
|
||||
request.pairedParticipantId(dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id()));
|
||||
|
||||
return m_requestHelper->startSingleRequest([=]()
|
||||
@@ -177,7 +177,7 @@ bool PairingEditDialog::applyPairingStateCheck()
|
||||
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
|
||||
|
||||
|
||||
if (ied.pairingState() == IedPairingState_def::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying())
|
||||
if (ied.pairingState() == IedPairingState::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@@ -186,10 +186,10 @@ bool PairingEditDialog::applyPairingStateCheck()
|
||||
bool PairingEditDialog::applyParticipantSelectionCheck()
|
||||
{
|
||||
|
||||
if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState_def::PairedToParticipant)
|
||||
if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::PairedToParticipant)
|
||||
{
|
||||
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
|
||||
if (ied.pairingState().underlying() == IedPairingState_def::PairedToParticipant)
|
||||
if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
|
||||
{
|
||||
if (checkSelectedParticipantType())
|
||||
{
|
||||
@@ -209,8 +209,8 @@ bool PairingEditDialog::applyParticipantSelectionCheck()
|
||||
bool PairingEditDialog::checkSelectedParticipantType()
|
||||
{
|
||||
ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId());
|
||||
return ((type.typeClass().underlying() != ParticipantManagement::TypeClass_def::SupportUnit) &&
|
||||
(type.typeClass().underlying() != ParticipantManagement::TypeClass_def::Unit));
|
||||
return ((type.typeClass().underlying() != ParticipantManagement::TypeClass::SupportUnit) &&
|
||||
(type.typeClass().underlying() != ParticipantManagement::TypeClass::Unit));
|
||||
}
|
||||
|
||||
void PairingEditDialog::fillIedCbx()
|
||||
@@ -231,8 +231,8 @@ void PairingEditDialog::fillIedCbx()
|
||||
void PairingEditDialog::fillPairingState()
|
||||
{
|
||||
m_ui->cbxPairingState->clear();
|
||||
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState_def::NotPaired).underlying()), IedPairingState_def::NotPaired);
|
||||
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState_def::PairedToParticipant).underlying()), IedPairingState_def::PairedToParticipant);
|
||||
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired).underlying()), IedPairingState::NotPaired);
|
||||
m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant).underlying()), IedPairingState::PairedToParticipant);
|
||||
}
|
||||
|
||||
void PairingEditDialog::fillPartyCbx()
|
||||
@@ -254,7 +254,7 @@ void PairingEditDialog::enDisableUiElements()
|
||||
m_ui->cbxIed->setEnabled(m_ui->cbxIed->count() > 1);
|
||||
m_ui->cbxPairingState->setEnabled(m_ui->cbxIed->count() > 0 && m_participantModel->rowCount() > 0);
|
||||
|
||||
if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState_def::NotPaired)
|
||||
if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::NotPaired)
|
||||
{
|
||||
m_ui->cbxParty->setEnabled(false);
|
||||
m_ui->treeViewParticipants->setEnabled(false);
|
||||
|
||||
Reference in new issue
Block a user