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

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

No files matched your search

@@ -22,18 +22,12 @@ IF(BUILD_RTI)
SET(mrk_common_gui_SRCS
mrk_dialog_model.cpp
mrk_dialog_model.h
mrk_apply_filter.cpp
mrk_apply_filter.h
CustomViews/mrk_marker.cpp
CustomViews/mrk_marker.h
)
# FilterManagement-Plugins temporär ausgeschlossen für BUILD_RTI=OFF
# if(BUILD_RTI)
# list(APPEND mrk_common_gui_SRCS
# mrk_apply_filter.cpp
# mrk_apply_filter.h
# )
# endif()
NGL_WRAP_UI(mrk_common_gui_SRCS
CustomViews/mrk_marker.ui
)
@@ -50,11 +44,10 @@ if(QT6_GUI_AVAILABLE)
LtsSession
LtsSessionData
LtsUtilsGuiDds
# OpmDataPluginInterface # External dependency
svcOpmCommon # OperatorManagement::Interface::Dtc (legacy: OpmDataPluginInterface)
ngltools
# svcMrkCommon # External dependency
PUBLIC
# MrkDataPluginInterface # External dependency - check if available
svcMrkCommon # MarkerManagement::Interface::Dtc (legacy: MrkDataPluginInterface)
${Qt6_Widgets}
LtsWidgets
LtsDataView
@@ -20,6 +20,7 @@ MarkerManagementApplyFilter::MarkerManagementApplyFilter(LtsSession::LtsSession
, m_fltParticipantIfc(fltParticipantIfc)
, m_fltAesIfc(fltAesIfc)
, m_fltBuildingComponentIfc(fltBuildingComponenIfc)
, m_logger(getLogger("MarkerManagementApplyFilter"))
{
std::shared_ptr<SituationMap::ForeignGuiInterface> spSitMapGuiIfc;
m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(spSitMapGuiIfc);
@@ -112,7 +113,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
if (innerObj.isEmpty())
ERROR_LOG(m_logger) << "inner content AesFilterJson is empty";
else
aesFilter.content(QJsonDocument(innerObj).toJson().constData());
aesFilter.content = QJsonDocument(innerObj).toJson().constData();
}
@@ -125,7 +126,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
if (innerObj.isEmpty())
ERROR_LOG(m_logger) << "inner content SymbolAppearanceJson is empty";
else
symbolAppearance.content(QJsonDocument(innerObj).toJson().constData());
symbolAppearance.content = QJsonDocument(innerObj).toJson().constData();
}
@@ -138,7 +139,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
if (innerObj.isEmpty())
ERROR_LOG(m_logger) << "inner content BuildingComponentSettingsJson is empty";
else
buildingComponentFilter.content(QJsonDocument(innerObj).toJson().constData());
buildingComponentFilter.content = QJsonDocument(innerObj).toJson().constData();
}
@@ -164,10 +165,10 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
aesFilter.id(0);
aesFilter.operatorId(operatorId);
aesFilter.sampleTime(0);
aesFilter.ctx(wsId_context.toStdString());
aesFilter.id = 0;
aesFilter.operatorId = operatorId;
aesFilter.sampleTime = 0;
aesFilter.ctx = wsId_context.toStdString();
std::shared_ptr<FilterManagement::AesDisplayFilter> aesDisplayFilter
= fltIfcPtr->aesFilterForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), wsId_context);
@@ -176,10 +177,10 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
symbolAppearance.id(0);
symbolAppearance.operatorId(operatorId);
symbolAppearance.sampleTime(0);
symbolAppearance.ctx(wsId_context.toStdString());
symbolAppearance.id = 0;
symbolAppearance.operatorId = operatorId;
symbolAppearance.sampleTime = 0;
symbolAppearance.ctx = wsId_context.toStdString();
std::shared_ptr<FilterManagement::SymbolAppearanceSettings> appearanceSettings
= fltParticipantIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), wsId_context);
@@ -195,10 +196,10 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
{
buildingComponentFilter.id(0);
buildingComponentFilter.operatorId(operatorId);
buildingComponentFilter.sampleTime(0);
buildingComponentFilter.ctx(wsId_context.toStdString());
buildingComponentFilter.id = 0;
buildingComponentFilter.operatorId = operatorId;
buildingComponentFilter.sampleTime = 0;
buildingComponentFilter.ctx = wsId_context.toStdString();
std::shared_ptr<FilterManagement::BuildingComponentSettings> buildingComponentSettings
= fltBldgCmpntIfc->buildingComponentSettingsForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), wsId_context);
@@ -9,11 +9,11 @@
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <OperatorManagement/opm_dtc.h>
#include <MarkerManagement/mrk_dtc.h>
#include <MarkerManagement/mrk_translation.h>
#endif
#include <ngltools/ngltools_dtg.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsProjectionWorkstation/lts_projection_workstation.h>
#include <QtCore/QBuffer>
#include <QtCore/QSet>
#include <QtCore/QTimer>
@@ -33,7 +33,7 @@ MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
tr("File Id"),
tr("Image")},
parent)
, m_logger(LtsProjectionWorkstation::getLogger("MarkerManagementDialogModel"))
, m_logger(getLogger("MarkerManagementDialogModel"))
{}
@@ -54,7 +54,7 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr<MarkerManageme
{
auto cbUser = [this](const OperatorManagement::User &user)
{
m_operatorNames.insert(user.id(), QString::fromStdString(user.name()));
m_operatorNames.insert(user.id, QString::fromStdString(user.name));
};
connect(opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged, this, cbUser);
opmDtc->users(cbUser);
@@ -149,13 +149,13 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
{
if (index.column() == ColOperator)
return marker.operatorId();
return marker.operatorId;
return QVariant();
}
if (role == Qt::ToolTipRole)
{
const int fileContentId = marker.fileContentId();
const int fileContentId = marker.fileContentId;
if (fileContentId > 0)
{
auto it = m_previews.find(fileContentId);
@@ -175,31 +175,31 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
switch (index.column())
{
case ColNote:
return QString::fromStdString(marker.note());
return QString::fromStdString(marker.note);
case ColOperator:
if (marker.operatorId() <= 0)
if (marker.operatorId <= 0)
return tr("Global");
return m_operatorNames.value(marker.operatorId());
return m_operatorNames.value(marker.operatorId);
case ColType:
{
QStringList slTypes;
slTypes.reserve(marker.descriptions().size());
for (const MarkerManagement::MarkerDescription &desc : marker.descriptions())
slTypes.append(MarkerManagement::toString(desc.markerType()));
slTypes.reserve(marker.descriptions.size());
for (const MarkerManagement::MarkerDescription &desc : marker.descriptions)
slTypes.append(MarkerManagement::toString(desc.markerType));
return slTypes.join(QStringLiteral(", "));
}
case ColStreams:
{
QString ret;
for (const MarkerManagement::MarkerDescription &desc : marker.descriptions())
for (const MarkerManagement::MarkerDescription &desc : marker.descriptions)
{
if (desc.markerType() != MarkerManagement::MarkerType::Audio &&
desc.markerType() != MarkerManagement::MarkerType::Video)
if (desc.markerType != MarkerManagement::MarkerType::Audio &&
desc.markerType != MarkerManagement::MarkerType::Video)
continue;
if (!ret.isEmpty())
ret += QLatin1Char(',');
ret += QString::fromStdString(desc.content());
ret += QString::fromStdString(desc.content);
}
return ret;
}
@@ -209,16 +209,16 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
return QDateTime::fromMSecsSinceEpoch(marker.timeStamp() + (m_timezoneHoursOffset * 3600 * 1000)).toString(QStringLiteral("dd.MM.yy HH:mm:ss"));
return QDateTime::fromMSecsSinceEpoch(marker.timeStamp + (m_timezoneHoursOffset * 3600 * 1000)).toString(QStringLiteral("dd.MM.yy HH:mm:ss"));
}
else
return QDateTime::fromMSecsSinceEpoch(marker.timeStamp() - marker.timeStampOffset());
return QDateTime::fromMSecsSinceEpoch(marker.timeStamp - marker.timeStampOffset);
case ColOffset:
return QVariant::fromValue<qlonglong>(marker.timeStampOffset() / 1000);
return QVariant::fromValue<qlonglong>(marker.timeStampOffset / 1000);
case ColFileId:
return marker.fileContentId();
return QVariant::fromValue<qlonglong>(marker.fileContentId);
case ColImage:
return m_previews.value(marker.fileContentId());
return m_previews.value(marker.fileContentId);
}
}
return QVariant();
@@ -228,7 +228,7 @@ void MarkerManagementDialogModel::updateOperatorNames()
{
QSet<int> operatorIds;
for (const auto &op : std::as_const(m_vecData))
operatorIds.insert(op.operatorId());
operatorIds.insert(op.operatorId);
LtsWidgets::ComboboxFilterContent cfc;
LtsWidgets::ComboboxFilterData cfd;
@@ -270,8 +270,8 @@ bool MarkerSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIn
if (!m_showOtherUsersMarkers)
{
bool bAccepted = marker.operatorId() == 0 ||
marker.operatorId() == m_operatorId;
bool bAccepted = marker.operatorId == 0 ||
marker.operatorId == m_operatorId;
if (!bAccepted)
return false;
}
@@ -288,7 +288,7 @@ bool MarkerSortFilterProxyModel::lessThan(const QModelIndex &source_left, const
switch (source_left.column())
{
case MarkerManagementDialogModel::ColTime:
return left.timeStamp() < right.timeStamp();
return left.timeStamp < right.timeStamp;
default:
break;
}
@@ -6,7 +6,6 @@
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <MarkerManagement/mrk_dtc.h>
#include <MarkerManagement/mrk_marker.h>
#include <MarkerManagement/logger.h>
#include <mrkcommon_export.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>