Qt6 Migration: LtsWidgets, BUILD_RTI Guards, externe Dependencies dokumentiert

- LtsWidgets Verzeichnis vollständig migriert (Qt5→Qt6)
- BUILD_RTI Guards für RTI-spezifische Module hinzugefügt
- Externe Dependencies in EXTERNAL_DEPS.md dokumentiert
- Qt6 API-Änderungen: QRegExp→QRegularExpression, enterEvent(QEnterEvent*)
- AutoUic-Fehler bei ui_requirement behoben (SKIP_AUTOUIC)
- Include-Pfade korrigiert (LtsElevation, LtsMultiMonitor, LtsUtilsCore)
- MOC-Fehler behoben (Q_INTERFACES entfernt wo nicht benötigt)
- CMakeLists.txt Anpassungen für Qt6 (PUBLIC statt INTERFACE)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-21 10:29:34 +02:00
1 parent 27fe03a03a
commit d890b11c5f
145 files changed
+17700 -14377

No files matched your search

@@ -5,14 +5,7 @@
#ifdef BUILD_RTI
#include <Plugins/AssetManagement/asm_data_plugin_interface.h>
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
#endif
#include <QDir>
#include <QHash>
#include <QSharedPointer>
#include <QUrl>
#include <Common/resource_path.h>
#include <Viewer/SituationMap/ElevationMap/elevation_map_manager.h>
#include <utility>
static_assert((int)SituationMap::ElevationMapManager::LineOfSight::LOS_UNDEFINED ==
(int)LtsElevation::LineOfSight::LOS_UNDEFINED,
@@ -26,6 +19,7 @@ static_assert((int)SituationMap::ElevationMapManager::LineOfSight::LOS_VISIBLE =
static_assert((int)SituationMap::ElevationMapManager::LineOfSight::LOS_INVISIBLE ==
(int)LtsElevation::LineOfSight::LOS_INVISIBLE,
"LineOfSight mismatch");
#endif
namespace LtsElevation
{
@@ -62,16 +56,18 @@ class LtsElevationManager::Private
~Private()
{
#ifdef BUILD_RTI
delete m_elevationManager;
#endif
}
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
#ifdef BUILD_RTI
std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
SituationMap::ElevationMapManager* m_elevationManager{nullptr};
#endif
QStringList m_filePaths_rough_to_fine;
SituationMap::ElevationMapManager* m_elevationManager{nullptr};
};
LtsElevationManager::LtsElevationManager()
@@ -335,6 +331,7 @@ QStringList LtsElevationManager::getFilenamesForTrainingArea(int /*trainingAreaI
bool LtsElevationManager::init(const QStringList& filePaths_rough_to_fine)
{
#ifdef BUILD_RTI
delete d->m_elevationManager;
d->m_elevationManager = new SituationMap::ElevationMapManager();
@@ -347,11 +344,14 @@ bool LtsElevationManager::init(const QStringList& filePaths_rough_to_fine)
FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!";
return false;
}
return true;
#else
Q_UNUSED(filePaths_rough_to_fine);
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, init not available";
return false;
#endif
}
#ifdef BUILD_RTI
@@ -403,28 +403,47 @@ int LtsElevationManager::exerciseIdToTrainingAreaId(int exerciseId,
bool LtsElevationManager::waitForInitialization()
{
#ifdef BUILD_RTI
if (!d->m_elevationManager)
return false;
return d->m_elevationManager->waitForInitialization();
#else
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, waitForInitialization not available";
return false;
#endif
}
bool LtsElevationManager::isValid() const
{
#ifdef BUILD_RTI
if (!d->m_elevationManager)
return false;
return d->m_elevationManager->isValid();
#else
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, isValid not available";
return false;
#endif
}
double LtsElevationManager::elevation(double lon_rad, double lat_rad, double defaultValue, bool* bIsCovered) const
{
#ifdef BUILD_RTI
if (!d->m_elevationManager)
return defaultValue;
return d->m_elevationManager->elevation(lon_rad, lat_rad, defaultValue, bIsCovered);
#else
Q_UNUSED(lon_rad);
Q_UNUSED(lat_rad);
Q_UNUSED(bIsCovered);
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, elevation not available";
return defaultValue;
#endif
}
LineOfSight LtsElevationManager::lineOfSightCalculation(const LtsUtils::QPoint3D& startPointGeo_absZ,
const LtsUtils::QPoint3D& endPointGeo_absZ)
{
#ifdef BUILD_RTI
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< ", startPointGeo_absZ = " << startPointGeo_absZ
<< ", endPointGeo_absZ = " << endPointGeo_absZ;
@@ -444,11 +463,18 @@ LineOfSight LtsElevationManager::lineOfSightCalculation(const LtsUtils::QPoint3D
<< ", startPointGeo = " << startPointGeo_absZ << ", endPointGeo = " << endPointGeo_absZ
<< " -> LineOfSight " << result;
return result;
#else
Q_UNUSED(startPointGeo_absZ);
Q_UNUSED(endPointGeo_absZ);
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, lineOfSightCalculation not available";
return LineOfSight::LOS_ERROR;
#endif
}
LineOfSight LtsElevationManager::lineOfSightCalculation(const QPointF& startPointGeo, double startHat,
const QPointF& endPointGeo, double endHat)
{
#ifdef BUILD_RTI
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< ", startPointGeo = " << startPointGeo << ", startHat = " << startHat
<< ", endPointGeo = " << endPointGeo << ", endHat = " << endHat;
@@ -463,6 +489,14 @@ LineOfSight LtsElevationManager::lineOfSightCalculation(const QPointF& startPoin
<< ", endPointGeo = " << endPointGeo << ", endHat = " << endHat << " -> LineOfSight "
<< static_cast<int>(eleMapMgrResult);
return result;
#else
Q_UNUSED(startPointGeo);
Q_UNUSED(startHat);
Q_UNUSED(endPointGeo);
Q_UNUSED(endHat);
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, lineOfSightCalculation not available";
return LineOfSight::LOS_ERROR;
#endif
}
const QString toString(const LineOfSight& value)