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>
48 lines
1.5 KiB
C++
48 lines
1.5 KiB
C++
/**
|
|
* Helper Class for handling (Participant) Positions
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Malte Diers, NLE, 2019-07-11
|
|
*/
|
|
#pragma once
|
|
|
|
#include <WorldLocationStruct.h>
|
|
#include <QString>
|
|
#include <QPointF>
|
|
#include <Core/core.hpp>
|
|
#include <Common/hlacommon_export.h>
|
|
|
|
namespace HighLevelArchitecture
|
|
{
|
|
|
|
struct HLACOMMON_EXPORT ParticipantPosition
|
|
{
|
|
// lon/lat
|
|
double lon = 0;
|
|
double lat = 0;
|
|
double z = 0;
|
|
qint64 msec = 0;
|
|
|
|
|
|
ParticipantPosition() = default;
|
|
explicit inline ParticipantPosition(const QPointF &data)
|
|
: lon(data.x()), lat(data.y()) {}
|
|
explicit ParticipantPosition(const rpr2::WorldLocationStruct &wl);
|
|
explicit inline ParticipantPosition(const Core::GeoPosition &data, qint64 msecsSinceEpoch = 0)
|
|
: lon(data.lon()), lat(data.lat()), z(data.z()), msec(msecsSinceEpoch) {}
|
|
explicit inline ParticipantPosition(const Core::GeoPosition2D &data, qint64 msecsSinceEpoch = 0)
|
|
: lon(data.lon()), lat(data.lat()), msec(msecsSinceEpoch) {}
|
|
|
|
bool hasMoved(const ParticipantPosition &other) const;
|
|
bool isNull() const;
|
|
rpr2::WorldLocationStruct toWorldLocation() const;
|
|
QString toString(bool mgrs = true) const;
|
|
inline Core::GeoPosition2D toGeoPosition2D() const { return Core::GeoPosition2D(lon, lat); }
|
|
inline Core::GeoPosition toGeoPosition() const { return Core::GeoPosition(lon, lat, z); }
|
|
inline QPointF toPoint() const { return QPointF(lon,lat); }
|
|
|
|
};
|
|
|
|
}
|