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/SAAs/Gui/saa_dialog_model.cpp
+31 -30
View File
@@ -15,6 +15,7 @@ namespace SAAInterfaceAdapterAdler
using namespace SAAUtils;
SaaDialogModel::SaaDialogModel(QObject *parent)
: LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>({tr("Id"), tr("Name"), tr("scenario is running"), tr("Used by Party")}, parent)
, m_logger(getLogger("SaaDialogModel"))
, m_ppmDtc(nullptr)
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
@@ -49,19 +50,19 @@ bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
m_asmDtc->assets(
[this](const AssetManagement::Asset &asset)
{
if (asset.id() <= 1 || asset.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
if (asset.id <= 1 || asset.assetTypeId != AssetManagement::AssetType::AdlerSAA)
return;
AsmAssetProps asmProps(QString::fromStdString(asset.properties()));
AsmAssetProps asmProps(QString::fromStdString(asset.properties));
if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId())
return;
PingItem pi;
pi.assetId = asset.id();
pi.assetId = asset.id;
pi.process = new QProcess(this);
pi.host = asmProps.host;
pi.port = asmProps.port;
m_saaPingItems.insert(asset.id(), pi);
pi.host = asmProps.host;
pi.port = asmProps.port;
m_saaPingItems.insert(asset.id, pi);
onDataChanged(asset, DataModification::eAdded);
@@ -98,7 +99,7 @@ void SaaDialogModel::pingAllSaa()
{
ParticipantManagement::Party party;
getPartyWithAssetId(pi.assetId, party);
DEBUG_LOG(m_logger) << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id() > 0) << " Ip: " << pi.host
DEBUG_LOG(m_logger) << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id > 0) << " Ip: " << pi.host
<< " PortNumb: " << pi.port;
pi.reachable = (exitCode == 0);
pi.process->kill();
@@ -146,18 +147,18 @@ void SaaDialogModel::updateView()
void SaaDialogModel::onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType)
{
Q_UNUSED(modType)
DEBUG_LOG(m_logger) << ">>> SAA Dialog Party Data Changed: " << data.id() << " properties: " << data.properties();
DEBUG_LOG(m_logger) << ">>> SAA Dialog Party Data Changed: " << data.id << " properties: " << data.properties;
update();
}
bool SaaDialogModel::isFiltered(const AssetManagement::Asset &data, DataModification modType) const
{
if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
if (data.id <= 1 || data.assetTypeId != AssetManagement::AssetType::AdlerSAA)
return true;
AsmAssetProps asmProps(QString::fromStdString(data.properties()));
AsmAssetProps asmProps(QString::fromStdString(data.properties));
if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId())
return true;
return LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>::isFiltered(data, modType);
@@ -166,9 +167,9 @@ bool SaaDialogModel::isFiltered(const AssetManagement::Asset &data, DataModifica
void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataModification modType)
{
if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
if (data.id <= 1 || data.assetTypeId != AssetManagement::AssetType::AdlerSAA)
return;
AsmAssetProps asmProps(QString::fromStdString(data.properties()));
AsmAssetProps asmProps(QString::fromStdString(data.properties));
if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId())
return;
@@ -178,17 +179,17 @@ void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataMo
{
onDataChanged(data, DataModification::eAdded);
PingItem pi;
pi.assetId = data.id();
pi.assetId = data.id;
pi.process = new QProcess(this);
pi.host = asmProps.host;
pi.port = asmProps.port;
m_saaPingItems.insert(data.id(), pi);
m_saaPingItems.insert(data.id, pi);
}
break;
case DataModification::eModified:
{
onDataChanged(data, DataModification::eModified);
PingItem pi = m_saaPingItems.take(data.id());
PingItem pi = m_saaPingItems.take(data.id);
if (pi.process != nullptr && pi.process->state() != QProcess::NotRunning)
{
pi.process->kill();
@@ -196,19 +197,19 @@ void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataMo
}
pi.process = nullptr;
pi.assetId = data.id();
pi.assetId = data.id;
pi.host = asmProps.host;
pi.port = asmProps.port;
pi.connected = false;
pi.reachable = false;
pi.process = new QProcess(this);
m_saaPingItems.insert(data.id(), pi);
m_saaPingItems.insert(data.id, pi);
}
break;
case DataModification::eRemoved:
onDataChanged(data, DataModification::eRemoved);
auto pi = m_saaPingItems.take(data.id());
auto pi = m_saaPingItems.take(data.id);
if (pi.process != nullptr && pi.process->state() != QProcess::NotRunning)
{
pi.process->kill();
@@ -224,7 +225,7 @@ void SaaDialogModel::getPartyWithAssetId(int assetId, ParticipantManagement::Par
const auto &partys = m_ppmDtc->partys();
for (const auto &p : partys)
{
SaaProps saaprops(QString::fromStdString(p.properties()));
SaaProps saaprops(QString::fromStdString(p.properties));
if (!saaprops.hasAsset())
continue;
if (saaprops.assetId == assetId)
@@ -241,23 +242,23 @@ QVariant SaaDialogModel::data(const QModelIndex &index, int role) const
return {};
const AssetManagement::Asset &asset = m_vecData.at(index.row());
const AsmAssetProps assetProps(QString::fromStdString(asset.properties()));
const AsmAssetProps assetProps(QString::fromStdString(asset.properties));
ParticipantManagement::Party party;
if (asset.assetTypeId() == AssetManagement::AssetType::AdlerSAA && assetProps.hasExerciseId())
getPartyWithAssetId(asset.id(), party);
if (asset.assetTypeId == AssetManagement::AssetType::AdlerSAA && assetProps.hasExerciseId())
getPartyWithAssetId(asset.id, party);
if (role == Qt::DisplayRole)
{
switch (index.column())
{
case Id:
return asset.id();
return asset.id;
case Name:
return QString::fromStdString(asset.name());
return QString::fromStdString(asset.name);
case IsUseByParty:
return party.id() > 0 ? ParticipantManagement::trPartyName(party.name()) : QStringLiteral("--");
return party.id > 0 ? ParticipantManagement::trPartyName(party.name) : QStringLiteral("--");
default:
return {};
}
@@ -275,12 +276,12 @@ QVariant SaaDialogModel::data(const QModelIndex &index, int role) const
static const QIcon red(QLatin1String("icon:red_light.svg"));
static const QIcon yellow(QLatin1String("icon:yellow_light.svg"));
static const QIcon gray(QLatin1String("icon:gray_light.svg"));
const bool reacheable = m_saaPingItems.value(asset.id()).reachable;
const bool reacheable = m_saaPingItems.value(asset.id).reachable;
switch (index.column())
{
case Connected:
{
const bool szenar = (party.id() > 0);
const bool szenar = (party.id > 0);
if (szenar && reacheable)
return green;
if (szenar && !reacheable)