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>
89 lines
2.6 KiB
C++
89 lines
2.6 KiB
C++
/**
|
|
**
|
|
** @RDE_HEADER@
|
|
** 2D matrix operations
|
|
** $Id$
|
|
** $HeadURL$
|
|
** $Author$
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Hardware-Environment: Intel-PC
|
|
** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
|
|
**
|
|
** Language ........: C++ 11
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Author ...........: Jörg Turla, SPD G, Tel. 3132
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Notes .........:
|
|
**
|
|
** 22.06.2016, JT : First edition for use with Qt5
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QtCore/QPoint>
|
|
|
|
#include <Map/point3D.h>
|
|
#include <situation_map_export.h>
|
|
|
|
namespace Esri {
|
|
namespace ArcGISRuntime {
|
|
class Geometry;
|
|
} }
|
|
|
|
|
|
namespace SituationMap
|
|
{
|
|
class Map;
|
|
class AbstractMapObject;
|
|
class CoordTranslationFunctor;
|
|
|
|
namespace MathUtils
|
|
{
|
|
|
|
class SITUATIONMAP_EXPORT GeometryEngine
|
|
{
|
|
|
|
public:
|
|
|
|
using Geometry = Esri::ArcGISRuntime::Geometry;
|
|
|
|
|
|
static Geometry *createLine (Map *map, const QPointF &p1, const QPointF &p2);
|
|
static Geometry *createPolyline(Map *map, const QVector<QPointF> &vertices);
|
|
static Geometry *createPolyline(Map *map, const QList<QPointF> &vertices);
|
|
static Geometry *createPolygon (Map *map, const QVector<QPointF> &vertices);
|
|
static Geometry *createPolygon (Map *map, const QList<QPointF> &vertices);
|
|
|
|
static void deleteGeometry(Geometry *geom);
|
|
|
|
static bool contains(const Geometry &geom, const Geometry &hull);
|
|
static bool contains(AbstractMapObject *mapObj, const Geometry &hull);
|
|
|
|
static bool intersect(const Geometry &inputGeom, const Geometry &intersector);
|
|
static bool intersect(AbstractMapObject *mapObj , const Geometry &intersector);
|
|
|
|
/**
|
|
Calculating a parallel line.
|
|
@param mapCtFunctor CoordTranslationFunctor to translate coordinates from geographic to map coordinate system and vis versa.
|
|
@param line Line to use as input, the coordinates are geograpihc coordinates.
|
|
@param distance Distance in meter.
|
|
*/
|
|
static QVector<QPointF> parallelTranslation(SituationMap::CoordTranslationFunctor *mapCtFunctor, const QVector<QPointF> &line, double distance );
|
|
|
|
static QVector<SituationMap::Point3D> buffer(AbstractMapObject *mapObj, double distance);
|
|
|
|
|
|
}; // GeometryEngine
|
|
|
|
|
|
} // namespace MathUtils
|
|
} // namespace SituationMap
|