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,62 @@
|
||||
/**
|
||||
* Helper Class for handling (Participant) Positions
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Malte Diers, NLE, 2019-07-11
|
||||
*/
|
||||
|
||||
#include "participantposition.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
//
|
||||
// ParticipantPosition
|
||||
//
|
||||
rpr2::WorldLocationStruct ParticipantPosition::toWorldLocation() const
|
||||
{
|
||||
rpr2::WorldLocationStruct wl;
|
||||
|
||||
LtsCoordTrans::lonLatAltToGeocentric(lon, lat, -z, wl.X, wl.Y, wl.Z);
|
||||
|
||||
return wl;
|
||||
}
|
||||
|
||||
QString ParticipantPosition::toString(bool mgrs) const
|
||||
{
|
||||
if (!mgrs)
|
||||
return QStringLiteral("lon: %1, lat: %2, z: %3").arg(lon).arg(lat).arg(z);
|
||||
|
||||
const LtsCoordTrans::UtmCoordinate c1(LtsCoordTrans::UtmCoordinate::fromGeographic(lon, lat));
|
||||
return QStringLiteral("MGRS: %1, Z: %2").arg(c1.mgrs()).arg(z);
|
||||
}
|
||||
|
||||
bool ParticipantPosition::hasMoved(const ParticipantPosition &other) const
|
||||
{
|
||||
const LtsCoordTrans::UtmCoordinate c1(LtsCoordTrans::UtmCoordinate::fromGeographic(lon, lat));
|
||||
const LtsCoordTrans::UtmCoordinate c2(LtsCoordTrans::UtmCoordinate::fromGeographic(other.lon, other.lat));
|
||||
|
||||
if (c1.zone != c2.zone)
|
||||
return true;
|
||||
if (std::abs(c1.x - c2.x) > 1)
|
||||
return true;
|
||||
if (std::abs(c1.y - c2.y) > 1)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ParticipantPosition::isNull() const
|
||||
{
|
||||
return (qFuzzyIsNull(lon) && qFuzzyIsNull(lat));
|
||||
}
|
||||
|
||||
ParticipantPosition::ParticipantPosition(const rpr2::WorldLocationStruct &wl)
|
||||
{
|
||||
LtsCoordTrans::geocentric2LonLatAlt(wl.X, wl.Y, wl.Z, lon, lat, z);
|
||||
z *= -1;
|
||||
}
|
||||
|
||||
} // Namespace
|
||||
|
||||
Reference in new issue
Block a user