torstenandCopilot
7173785915
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>
70 lines
1.8 KiB
C++
70 lines
1.8 KiB
C++
/**
|
|
* CES Point Helpers
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Gerlinde Rudolphus, SLTE, 2016-04-14
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QtCore/QPointF>
|
|
#include <QString>
|
|
#include <LtsCoordTrans/lts_coord_trans.h>
|
|
#include <DDS/Core/core.hpp>
|
|
|
|
namespace CentralEffectSimulation
|
|
{
|
|
|
|
inline QPointF geographic2Utm(double lon, double lat, int *zone = nullptr)
|
|
{
|
|
const int zoneToUse = zone ? *zone : -1;
|
|
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(lon, lat, zoneToUse);
|
|
if (zone)
|
|
*zone = utm.zone;
|
|
return QPointF(utm.x, utm.y);
|
|
}
|
|
|
|
inline QPointF geographic2Utm(const Core::GeoPosition2D &geoPos, int *zone = nullptr)
|
|
{
|
|
const int zoneToUse = zone ? *zone : -1;
|
|
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zoneToUse);
|
|
if (zone)
|
|
*zone = utm.zone;
|
|
return QPointF(utm.x, utm.y);
|
|
}
|
|
|
|
inline QPointF geographic2Utm(const Core::GeoPosition &geoPos, int *zone = nullptr)
|
|
{
|
|
const int zoneToUse = zone ? *zone : -1;
|
|
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zoneToUse);
|
|
if (zone)
|
|
*zone = utm.zone;
|
|
return QPointF(utm.x, utm.y);
|
|
}
|
|
|
|
inline QString geographic2mgrs(const Core::GeoPosition2D &geoPos, int zone)
|
|
{
|
|
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zone);
|
|
return utm.mgrs();
|
|
}
|
|
|
|
inline QPointF geographic2Utm(const Core::GeoPosition2D &geoPos, int zone)
|
|
{
|
|
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zone);
|
|
return QPointF(utm.x, utm.y);
|
|
}
|
|
|
|
inline QString debug(const QPointF &p)
|
|
{
|
|
return QString::number(qRound(p.x())) + QLatin1Char('/') + QString::number(qRound(p.y()));
|
|
}
|
|
|
|
inline double getSquareDistance(const QPointF ¢erUtm, const QPointF &pointUtm)
|
|
{
|
|
QPointF p(pointUtm - centerUtm);
|
|
return p.x() * p.x() + p.y() * p.y();
|
|
} // getSquareDistance
|
|
|
|
}
|