lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ void EditCombatNetRadioDialog::setUiValues(const CnrConfig& cnrConfig)
m_ui->chkGlobal->setChecked(m_isGlobal);
initCbChannels(cnrConfig.cnrChannelId());
bool disableParty =
(m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()).frequencyBand() == FrequencyBand_def::REL) || m_isGlobal;
(m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()).frequencyBand() == FrequencyBand::REL) || m_isGlobal;
if (!disableParty)
{
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(cnrConfig.partyId()));
@@ -492,7 +492,7 @@ void EditCombatNetRadioDialog::onChannelChanged(int index)
{
int channelId = m_ui->cbChannel->itemData(index).toInt();
bool disableParty = (m_avmDtc->cnrChannel(channelId).frequencyBand() == FrequencyBand_def::REL) || m_isGlobal;
bool disableParty = (m_avmDtc->cnrChannel(channelId).frequencyBand() == FrequencyBand::REL) || m_isGlobal;
m_ui->cbUnit->setDisabled(disableParty);
m_ui->lbUnit->setDisabled(disableParty);
m_ui->cbParty->setDisabled(disableParty);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
+2 -2
View File
@@ -73,10 +73,10 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
DataModification modType) const
{
if (m_frequencyBand != FrequencyBand_def::REL && data.frequencyBand() != m_frequencyBand)
if (m_frequencyBand != FrequencyBand::REL && data.frequencyBand() != m_frequencyBand)
return true;
if (m_frequencyBand == FrequencyBand_def::REL && data.frequencyBand() != FrequencyBand_def::VHF)
if (m_frequencyBand == FrequencyBand::REL && data.frequencyBand() != FrequencyBand::VHF)
return true;
Q_UNUSED(modType);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp
+4 -4
View File
@@ -45,12 +45,12 @@ EditFrequencyPlanningSetResourceDialog::EditFrequencyPlanningSetResourceDialog(
for (const auto &it : dataVec)
{
if((operatingMode == RcOperatingMode_def::AkwEncEccm ||
operatingMode == RcOperatingMode_def::AkwEncNone)
if((operatingMode == RcOperatingMode::AkwEncEccm ||
operatingMode == RcOperatingMode::AkwEncNone)
&& it.akwRadioCircuit() == 0)
continue;
if((operatingMode != RcOperatingMode_def::AkwEncEccm &&
operatingMode != RcOperatingMode_def::AkwEncNone)
if((operatingMode != RcOperatingMode::AkwEncEccm &&
operatingMode != RcOperatingMode::AkwEncNone)
&& it.akwRadioCircuit() != 0)
continue;
m_frequencyResourceDataModel->insertRow(it);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
+1 -1
View File
@@ -103,7 +103,7 @@ class FrequencyPlanningDialog : public LtsWidgets::LtsDialog,
void setButtonSetActivePlanningEnabled();
static void setBackgroundColor(QWidget* w, Qt::GlobalColor color, bool bSetColor);
void setStatus(const QString& statusText, const QString& requester, qint64 timeStampMsecs,
TransmissionReason reason = TransmissionReason_def::TR_Unknown, Qt::GlobalColor color = Qt::black);
TransmissionReason reason = TransmissionReason::TR_Unknown, Qt::GlobalColor color = Qt::black);
void tableColumnOrganiserSetting() override;
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
+14 -14
View File
@@ -23,9 +23,9 @@ FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface
{
m_ui->setupUi(this);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::VHF), FrequencyBand_def::VHF);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::HF), FrequencyBand_def::HF);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::UHF), FrequencyBand_def::UHF);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::VHF), FrequencyBand::VHF);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::HF), FrequencyBand::HF);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::UHF), FrequencyBand::UHF);
connect(m_ui->leName, &QLineEdit::textChanged, this, &FrequencyPlanningWidget::onNameChanged);
connect(m_ui->cbFrequencyBand, qOverload<int>(&QComboBox::currentIndexChanged), this,
@@ -51,15 +51,15 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit
switch (ft.underlying())
{
case FrequencyBand_def::HF: {
case FrequencyBand::HF: {
createHFWidget(data);
break;
}
case FrequencyBand_def::UHF: {
case FrequencyBand::UHF: {
createUHFWidget(data);
break;
}
case FrequencyBand_def::VHF: {
case FrequencyBand::VHF: {
createVHFWidget(data);
break;
}
@@ -72,13 +72,13 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit
m_ui->lbxFrequencyBand->setVisible(true);
switch (ft.underlying())
{
case FrequencyBand_def::HF:
case FrequencyBand::HF:
createHFWidget(data);
break;
case FrequencyBand_def::UHF:
case FrequencyBand::UHF:
createUHFWidget(data);
break;
case FrequencyBand_def::VHF:
case FrequencyBand::VHF:
createVHFWidget(data);
break;
default:
@@ -117,7 +117,7 @@ void FrequencyPlanningWidget::setRelaisRestrictions(bool restrict)
{
if (restrict)
{
m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(FrequencyBand_def::VHF));
m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(FrequencyBand::VHF));
m_ui->cbFrequencyBand->setEnabled(false);
}
else
@@ -129,7 +129,7 @@ void FrequencyPlanningWidget::setRelaisRestrictions(bool restrict)
QJsonObject FrequencyPlanningWidget::toJson() const
{
return frequencyPlanningJson(m_radioSpecificaWidget->toJson(), m_ui->leName->text(),
static_cast<FrequencyBand::inner_enum>(m_ui->cbFrequencyBand->currentData().toInt()),
static_cast<FrequencyBand>(m_ui->cbFrequencyBand->currentData().toInt()),
m_ui->cbRadioStation->currentData().toInt());
}
@@ -152,13 +152,13 @@ void FrequencyPlanningWidget::onFrequencyBandChanged()
{
switch (m_ui->cbFrequencyBand->currentData().toInt())
{
case FrequencyBand_def::HF:
case FrequencyBand::HF:
createHFWidget();
break;
case FrequencyBand_def::UHF:
case FrequencyBand::UHF:
createUHFWidget();
break;
case FrequencyBand_def::VHF:
case FrequencyBand::VHF:
createVHFWidget();
break;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent = nullptr);
~FrequencyPlanningWidget();
bool init(LtsSession::LtsSession *session, RadioCircuit *data, const CnrConfig &cnrConfigId, int frequencySetId = -1, FrequencyBand ft = FrequencyBand_def::VHF);
bool init(LtsSession::LtsSession *session, RadioCircuit *data, const CnrConfig &cnrConfigId, int frequencySetId = -1, FrequencyBand ft = FrequencyBand::VHF);
void setNameDisabled(bool disable);
void setName(const QString& name);
void setRelaisRestrictions(bool restrict);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
+2 -2
View File
@@ -25,7 +25,7 @@ RadioSpecificaHfWidget::RadioSpecificaHfWidget(QWidget *parent)
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacingHF_def::CS_100_Hz), ChannelSpacingHF_def::CS_100_Hz);
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacingHF::CS_100_Hz), ChannelSpacingHF::CS_100_Hz);
@@ -94,7 +94,7 @@ RadioCircuitHF RadioSpecificaHfWidget::values() const
{
RadioCircuitHF spec;
spec.modulationType = ModulationType::AM;
spec.channelSpacing = static_cast<ChannelSpacingHF::inner_enum>(m_ui->cobChannelSpacing->currentData().toInt());
spec.channelSpacing = static_cast<ChannelSpacingHF>(m_ui->cobChannelSpacing->currentData().toInt());
spec.frequency = m_ui->sbFrequency->value();
spec.squelch = m_ui->chbSquelch->isChecked() ? m_ui->sbSquelch->value() : 0;
return spec;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
+5 -5
View File
@@ -36,9 +36,9 @@ RadioSpecificaUhfWidget::RadioSpecificaUhfWidget(QWidget *parent)
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing_def::CS_25_00_kHz), ChannelSpacing_def::CS_25_00_kHz);
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing_def::CS_12_50_kHz), ChannelSpacing_def::CS_12_50_kHz);
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing_def::CS_8_33_kHz), ChannelSpacing_def::CS_8_33_kHz);
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_25_00_kHz), ChannelSpacing::CS_25_00_kHz);
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_12_50_kHz), ChannelSpacing::CS_12_50_kHz);
m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_8_33_kHz), ChannelSpacing::CS_8_33_kHz);
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
@@ -149,8 +149,8 @@ RadioCircuitUHF RadioSpecificaUhfWidget::values() const
{
RadioCircuitUHF spec;
spec.modulationType = static_cast<ModulationType::inner_enum>(m_ui->bgModulationType->checkedButton()->property("enum").toInt());
spec.channelSpacing = static_cast<ChannelSpacing::inner_enum>(m_ui->cobChannelSpacing->currentData().toInt());
spec.modulationType = static_cast<ModulationType>(m_ui->bgModulationType->checkedButton()->property("enum").toInt());
spec.channelSpacing = static_cast<ChannelSpacing>(m_ui->cobChannelSpacing->currentData().toInt());
spec.frequency = m_ui->sbFrequency->value() * 1000;
spec.squelchDB = m_ui->chbSquelch->isChecked() ? m_ui->sbSquelch->value() : 0;
spec.clipper = m_ui->rbClipperOn->isChecked();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
+7 -7
View File
@@ -22,11 +22,11 @@ RadioSpecificaVhfWidget::RadioSpecificaVhfWidget(QSet<int> &assignedFrequencySet
m_ui->setupUi(this);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::FixedFreqEncNone), RcOperatingMode_def::FixedFreqEncNone);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::FixedFreqEncHwKr), RcOperatingMode_def::FixedFreqEncHwKr);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::FixedFreqEncHwKrKl), RcOperatingMode_def::FixedFreqEncHwKrKl);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::AkwEncNone), RcOperatingMode_def::AkwEncNone);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::AkwEncEccm), RcOperatingMode_def::AkwEncEccm);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncNone), RcOperatingMode::FixedFreqEncNone);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKr), RcOperatingMode::FixedFreqEncHwKr);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKrKl), RcOperatingMode::FixedFreqEncHwKrKl);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncNone), RcOperatingMode::AkwEncNone);
m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncEccm), RcOperatingMode::AkwEncEccm);
m_ui->leFrequencySet->setEnabled(false);
@@ -116,7 +116,7 @@ bool RadioSpecificaVhfWidget::setValues(const QJsonObject &json)
RadioCircuitVHF RadioSpecificaVhfWidget::values() const
{
RadioCircuitVHF spec;
spec.operatingMode = static_cast<RcOperatingMode::inner_enum>(m_ui->cobOperatingMode->currentData().toInt());
spec.operatingMode = static_cast<RcOperatingMode>(m_ui->cobOperatingMode->currentData().toInt());
spec.freqSetDataId = m_frequencySetDataId;
spec.pilotTone = isAkwMode(spec.operatingMode) ? false : m_ui->rbPilotToneOn->isChecked();
return spec;
@@ -163,7 +163,7 @@ void RadioSpecificaVhfWidget::onSelectFrequencySetData()
void RadioSpecificaVhfWidget::onOperatingModeChanged()
{
RcOperatingMode rcMode = static_cast<RcOperatingMode::inner_enum>(m_ui->cobOperatingMode->currentData().toInt());
RcOperatingMode rcMode = static_cast<RcOperatingMode>(m_ui->cobOperatingMode->currentData().toInt());
const bool enablePilotTone = !isAkwMode(rcMode);
m_ui->lbxPilotTone->setEnabled(enablePilotTone);
m_ui->rbPilotToneOn->setEnabled(enablePilotTone);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
+2 -2
View File
@@ -176,7 +176,7 @@ void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka>&& eloka)
{
for (const auto& cnrTvcProfileData : cnrTvcProfile.data())
{
if (cnrTvcProfileData.radioSystemId() == RadioSystem::inner_enum::Cnr)
if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr);
else
userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc);
@@ -250,7 +250,7 @@ bool ElokaDialog::isAnnouncement(ElokaData& data)
QMap<qint32, Stream> streams = m_avmDtc->streams();
for (const Stream& stream : std::as_const(streams))
{
if ((stream.type() == StreamType_def::AudioOut) || (stream.type() == StreamType_def::AudioInOut))
if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut))
announcements.insert(stream.id(), stream);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp
+3 -3
View File
@@ -160,7 +160,7 @@ bool ElokaEditDialog::init(const std::vector<qint32>& usedCnr, const std::vector
const QMap<qint32, Stream> streams = m_avmDtc->streams();
for (const Stream& stream : streams)
{
if ((stream.type() == StreamType_def::AudioOut) || (stream.type() == StreamType_def::AudioInOut))
if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut))
m_announcementMap.insert(stream.id(), stream);
}
@@ -360,7 +360,7 @@ void ElokaEditDialog::onStreamChanged(const Stream& data, DataModification modTy
{
DEBUG_LOG(m_logger) << "onStreamChanged";
if ((data.type() != StreamType_def::AudioOut) && (data.type() != StreamType_def::AudioInOut))
if ((data.type() != StreamType::AudioOut) && (data.type() != StreamType::AudioInOut))
return;
switch (modType)
@@ -410,7 +410,7 @@ void ElokaEditDialog::getUserProfile()
if (cnrTvcProfile.exerciseId() == exerciseId && cnrTvcProfile.operatorId() == operatorId)
{
for (const auto& cnrTvcProfileData : cnrTvcProfile.data())
if (cnrTvcProfileData.radioSystemId() == RadioSystem::inner_enum::Cnr)
if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr);
else
m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc);