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/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
+11 -11
View File
@@ -39,7 +39,7 @@ TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataPro
, m_prtCnvApp(nullptr)
, m_exerciseId(0)
, m_radioGrpId(0)
.getNGLLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
@@ -68,16 +68,16 @@ bool TetraJsonInterfaceImpl::init()
void TetraJsonInterfaceImpl::exerciseChanged()
{
NOTICE_LOG(m_logger) << "TetraJsonInterfaceImpl::exerciseChanged";
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
if (m_pdp->exerciseRadioGroup().id != m_radioGrpId)
if (!updatePrtCnv())
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
<< m_radioGrpId
<< " to " << m_pdp->exerciseRadioGroup().id();
<< " to " << m_pdp->exerciseRadioGroup().id;
}
bool TetraJsonInterfaceImpl::updatePrtCnv()
{
int newRadioGrpId = m_pdp->exerciseRadioGroup().id();
int newRadioGrpId = m_pdp->exerciseRadioGroup().id;
if (newRadioGrpId == m_radioGrpId)
{
@@ -103,13 +103,13 @@ bool TetraJsonInterfaceImpl::updatePrtCnv()
s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId));
s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId));
s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection"));
s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname()));
s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort());
s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname()));
s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort());
s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi());
s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1());
s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2());
s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname));
s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort);
s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname));
s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort);
s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi);
s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1);
s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2);
s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0);
s.setValue(QStringLiteral("Injection/Port"), m_socketDispatcher->randomListenPort());
NOTICE_LOG(m_logger) << "TetraJson Injection/Port = " << s.value(QStringLiteral("Injection/Port")).toInt();