Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,63 @@
|
||||
/**
|
||||
* Converting positions relative to the training area
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, NLST, 21-04-2018
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <Core/core.hpp>
|
||||
#include "main_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
namespace AssetManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
}
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
}
|
||||
|
||||
namespace OcSituationServer
|
||||
{
|
||||
|
||||
class DdsHandler;
|
||||
class PositionConverter
|
||||
{
|
||||
public:
|
||||
explicit PositionConverter(MainHandler *m_mainHandler);
|
||||
|
||||
LtsCoordTrans::UtmCoordinate baseCoordinate();
|
||||
inline QPointF relativeFromGeographic(const Core::GeoPosition2D &pos)
|
||||
{
|
||||
return relativeFromGeographic(pos, baseCoordinate());
|
||||
}
|
||||
inline static QPointF relativeFromGeographic(const Core::GeoPosition2D &pos,
|
||||
const LtsCoordTrans::UtmCoordinate &baseCoord)
|
||||
{
|
||||
// convert lon/lat to utm with the given zone from the center point
|
||||
const LtsCoordTrans::UtmCoordinate point(LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat(), baseCoord.zone));
|
||||
// now calc distance from point to base point == relative position
|
||||
return QPointF(point.x - baseCoord.x, point.y - baseCoord.y);
|
||||
}
|
||||
private:
|
||||
bool initCoordConversion();
|
||||
|
||||
MainHandler *m_mainHandler;
|
||||
LtsCoordTrans::UtmCoordinate m_baseCoord;
|
||||
std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
|
||||
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
|
||||
|
||||
LOGGER_T &m_logger;
|
||||
};
|
||||
|
||||
} // namespace OcSituationServer
|
||||
Reference in new issue
Block a user