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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.cpp
+13 -13
View File
@@ -19,14 +19,14 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
{
auto cb = [cbx,filter](const InfrastructureManagement::MainStructureElement &mse)
{
if (mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::RadioStation && !mse.isDeleted() && mse.id() > 0 )
if (mse.structureElementTypeId == InfrastructureManagement::StructureElementType::RadioStation && !mse.isDeleted && mse.id > 0 )
{
const RadioStation &rs = RadioStation::fromMSE(mse);
if (((filter >= 0) && rs.radios.contains(static_cast<FrequencyBand>(filter))) ||
(filter < 0))
{
cbx->addItem(QString::fromStdString(mse.name()), mse.id());
cbx->setItemData(cbx->findData(mse.id()), rs.radioStationId, Qt::UserRole + 1);
cbx->addItem(QString::fromStdString(mse.name), mse.id);
cbx->setItemData(cbx->findData(mse.id), rs.radioStationId, Qt::UserRole + 1);
}
}
};
@@ -37,10 +37,10 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
{
auto cb = [cbx](const InfrastructureManagement::MainStructureElement &mse)
{
if ((mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::ApproachingPoint) && !mse.isDeleted() && (mse.id() > 0))
if ((mse.structureElementTypeId == InfrastructureManagement::StructureElementType::ApproachingPoint) && !mse.isDeleted && (mse.id > 0))
{
cbx->addItem(QString::fromStdString(mse.name()), mse.id());
cbx->setItemData(cbx->findData(mse.id()), mse.angle(), Qt::UserRole + 1);
cbx->addItem(QString::fromStdString(mse.name), mse.id);
cbx->setItemData(cbx->findData(mse.id), mse.angle, Qt::UserRole + 1);
}
};
dtc->mainStructureElements(cb);
@@ -48,14 +48,14 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
}
case IsmComboBoxType::CbScheduleStatus:
{
cbx->addItem(toString(ScheduleStatus::Active), ScheduleStatus::Active);
cbx->addItem(toString(ScheduleStatus::Inactive), ScheduleStatus::Inactive);
cbx->addItem(toString(ScheduleStatus::Active), static_cast<int>(ScheduleStatus::Active));
cbx->addItem(toString(ScheduleStatus::Inactive), static_cast<int>(ScheduleStatus::Inactive));
break;
}
case IsmComboBoxType::CbBridgeStatus:
{
cbx->addItem(toString(BridgeStatus::Intact), BridgeStatus::Intact);
cbx->addItem(toString(BridgeStatus::Broken), BridgeStatus::Broken);
cbx->addItem(toString(BridgeStatus::Intact), static_cast<int>(BridgeStatus::Intact));
cbx->addItem(toString(BridgeStatus::Broken), static_cast<int>(BridgeStatus::Broken));
}
case IsmComboBoxType::CbUnknown:
default:
@@ -68,10 +68,10 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
RadioStation RadioStation::fromMSE(const MainStructureElement &mse)
{
RadioStation rs;
rs.mse_id = mse.id();
rs.name = QString::fromStdString(mse.name());
rs.mse_id = mse.id;
rs.name = QString::fromStdString(mse.name);
LtsUtils::JsonObject jo = LtsUtils::JsonObject::fromJson(mse.properties());
LtsUtils::JsonObject jo = LtsUtils::JsonObject::fromJson(mse.properties);
LtsUtils::JsonArray radios = jo.valueOr<LtsUtils::JsonArray>("radios", {});