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/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ void SoundAreaEditDialog::onPlaySound(SoundManagement::SoundCategory category, i
qWarning() << "onPlaySound" << volume;
SoundManagement::PlayControl control =
inLoop ? SoundManagement::PlayControl_def::PlayLoop : SoundManagement::PlayControl_def::PlaySingle;
inLoop ? SoundManagement::PlayControl::PlayLoop : SoundManagement::PlayControl::PlaySingle;
for (const auto& egcuId : std::as_const(m_soundArea->egcuIds))
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
+51 -51
View File
@@ -16,7 +16,7 @@ SoundAreaHelper::SoundAreaHelper(SoundAreaHelper* helper)
{
QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
for (const auto& asset : std::as_const(assets))
if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit)
if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
m_egcuNames.insert(asset.id(), QString::fromStdString(asset.name()));
SoundManagement::Sounds sounds = m_somDtc->sounds();
@@ -30,7 +30,7 @@ SoundAreaHelper::SoundAreaHelper(std::shared_ptr<InfrastructureManagement::Inter
{
QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
for (const auto& asset : std::as_const(assets))
if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit)
if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
m_egcuNames.insert(asset.id(), QString::fromStdString(asset.name()));
SoundManagement::Sounds sounds = m_somDtc->sounds();
@@ -41,10 +41,10 @@ SoundAreaHelper::SoundAreaHelper(std::shared_ptr<InfrastructureManagement::Inter
QVector<SoundManagement::SoundCategory> SoundAreaHelper::soundCategories()
{
QVector<SoundManagement::SoundCategory> categories = QVector<SoundManagement::SoundCategory>{
SoundManagement::SoundCategory_def::Aircraft, SoundManagement::SoundCategory_def::Battlefield,
SoundManagement::SoundCategory_def::Boat, SoundManagement::SoundCategory_def::Explosion,
SoundManagement::SoundCategory_def::Helicopter, SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic,
SoundManagement::SoundCategory_def::Vehicle, SoundManagement::SoundCategory_def::InsideBuilding};
SoundManagement::SoundCategory::Aircraft, SoundManagement::SoundCategory::Battlefield,
SoundManagement::SoundCategory::Boat, SoundManagement::SoundCategory::Explosion,
SoundManagement::SoundCategory::Helicopter, SoundManagement::SoundCategory::MotorsAndUrbanTraffic,
SoundManagement::SoundCategory::Vehicle, SoundManagement::SoundCategory::InsideBuilding};
return categories;
}
@@ -52,23 +52,23 @@ QString SoundAreaHelper::categoryName(SoundManagement::SoundCategory category)
{
switch (category.underlying())
{
case SoundManagement::SoundCategory_def::Aircraft:
case SoundManagement::SoundCategory::Aircraft:
return QStringLiteral("Aircraft");
case SoundManagement::SoundCategory_def::Battlefield:
case SoundManagement::SoundCategory::Battlefield:
return QStringLiteral("Battlefield");
case SoundManagement::SoundCategory_def::Boat:
case SoundManagement::SoundCategory::Boat:
return QStringLiteral("Boat");
case SoundManagement::SoundCategory_def::Explosion:
case SoundManagement::SoundCategory::Explosion:
return QStringLiteral("Explosion");
case SoundManagement::SoundCategory_def::Helicopter:
case SoundManagement::SoundCategory::Helicopter:
return QStringLiteral("Helicopter");
case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic:
case SoundManagement::SoundCategory::MotorsAndUrbanTraffic:
return QStringLiteral("MotorsAndUrbanTraffic");
case SoundManagement::SoundCategory_def::Vehicle:
case SoundManagement::SoundCategory::Vehicle:
return QStringLiteral("Vehicle");
case SoundManagement::SoundCategory_def::InsideBuilding:
case SoundManagement::SoundCategory::InsideBuilding:
return QStringLiteral("InsideBuilding");
case SoundManagement::SoundCategory_def::Unknown:
case SoundManagement::SoundCategory::Unknown:
return QStringLiteral("Unknown");
default:
return QString();
@@ -84,7 +84,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
{
switch (category.underlying())
{
case SoundManagement::SoundCategory_def::Aircraft:
case SoundManagement::SoundCategory::Aircraft:
switch (id)
{
case 1:
@@ -99,7 +99,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::Battlefield:
case SoundManagement::SoundCategory::Battlefield:
switch (id)
{
case 1:
@@ -120,14 +120,14 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::Boat:
case SoundManagement::SoundCategory::Boat:
switch (id)
{
default:
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::Explosion:
case SoundManagement::SoundCategory::Explosion:
switch (id)
{
case 1:
@@ -136,7 +136,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::Helicopter:
case SoundManagement::SoundCategory::Helicopter:
switch (id)
{
case 1:
@@ -153,7 +153,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic:
case SoundManagement::SoundCategory::MotorsAndUrbanTraffic:
switch (id)
{
case 1:
@@ -182,7 +182,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::Vehicle:
case SoundManagement::SoundCategory::Vehicle:
switch (id)
{
case 1:
@@ -191,7 +191,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::InsideBuilding:
case SoundManagement::SoundCategory::InsideBuilding:
switch (id)
{
case 1:
@@ -212,7 +212,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons
return QStringLiteral("Error");
}
case SoundManagement::SoundCategory_def::Unknown:
case SoundManagement::SoundCategory::Unknown:
switch (id)
{
default:
@@ -249,23 +249,23 @@ QColor SoundAreaHelper::soundCategoryTextColor(const int32_t& category)
{
switch (category)
{
case SoundManagement::SoundCategory_def::Aircraft:
case SoundManagement::SoundCategory::Aircraft:
return {Qt::white};
case SoundManagement::SoundCategory_def::Battlefield:
case SoundManagement::SoundCategory::Battlefield:
return {Qt::white};
case SoundManagement::SoundCategory_def::Boat:
case SoundManagement::SoundCategory::Boat:
return {Qt::black};
case SoundManagement::SoundCategory_def::Explosion:
case SoundManagement::SoundCategory::Explosion:
return {Qt::white};
case SoundManagement::SoundCategory_def::Helicopter:
case SoundManagement::SoundCategory::Helicopter:
return {Qt::white};
case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic:
case SoundManagement::SoundCategory::MotorsAndUrbanTraffic:
return {Qt::white};
case SoundManagement::SoundCategory_def::Vehicle:
case SoundManagement::SoundCategory::Vehicle:
return {Qt::black};
case SoundManagement::SoundCategory_def::InsideBuilding:
case SoundManagement::SoundCategory::InsideBuilding:
return {Qt::black};
case SoundManagement::SoundCategory_def::Unknown:
case SoundManagement::SoundCategory::Unknown:
return {Qt::white};
default:
return {Qt::black};
@@ -276,23 +276,23 @@ QColor SoundAreaHelper::soundCategoryBackgroundColor(const int32_t& category)
{
switch (category)
{
case SoundManagement::SoundCategory_def::Aircraft:
case SoundManagement::SoundCategory::Aircraft:
return QColor::fromRgb(25, 25, 112);
case SoundManagement::SoundCategory_def::Battlefield:
case SoundManagement::SoundCategory::Battlefield:
return QColor::fromRgb(160, 82, 45);
case SoundManagement::SoundCategory_def::Boat:
case SoundManagement::SoundCategory::Boat:
return QColor::fromRgb(127, 255, 212);
case SoundManagement::SoundCategory_def::Explosion:
case SoundManagement::SoundCategory::Explosion:
return QColor::fromRgb(255, 0, 0);
case SoundManagement::SoundCategory_def::Helicopter:
case SoundManagement::SoundCategory::Helicopter:
return QColor::fromRgb(153, 50, 204);
case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic:
case SoundManagement::SoundCategory::MotorsAndUrbanTraffic:
return QColor::fromRgb(85, 107, 47);
case SoundManagement::SoundCategory_def::Vehicle:
case SoundManagement::SoundCategory::Vehicle:
return QColor::fromRgb(255, 255, 0);
case SoundManagement::SoundCategory_def::InsideBuilding:
case SoundManagement::SoundCategory::InsideBuilding:
return QColor::fromRgb(255, 160, 122);
case SoundManagement::SoundCategory_def::Unknown:
case SoundManagement::SoundCategory::Unknown:
return QColor::fromRgb(119, 136, 153);
default:
return {Qt::white};
@@ -304,24 +304,24 @@ SoundManagement::SoundCategory SoundAreaHelper::soundCategory(const int& i)
switch (i)
{
case 1:
return SoundManagement::SoundCategory_def::Aircraft;
return SoundManagement::SoundCategory::Aircraft;
case 2:
return SoundManagement::SoundCategory_def::Battlefield;
return SoundManagement::SoundCategory::Battlefield;
case 3:
return SoundManagement::SoundCategory_def::Boat;
return SoundManagement::SoundCategory::Boat;
case 4:
return SoundManagement::SoundCategory_def::Explosion;
return SoundManagement::SoundCategory::Explosion;
case 5:
return SoundManagement::SoundCategory_def::Helicopter;
return SoundManagement::SoundCategory::Helicopter;
case 6:
return SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic;
return SoundManagement::SoundCategory::MotorsAndUrbanTraffic;
case 7:
return SoundManagement::SoundCategory_def::Vehicle;
return SoundManagement::SoundCategory::Vehicle;
case 8:
return SoundManagement::SoundCategory_def::InsideBuilding;
return SoundManagement::SoundCategory::InsideBuilding;
case 9:
default:
return SoundManagement::SoundCategory_def::Unknown;
return SoundManagement::SoundCategory::Unknown;
}
}