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>
66 lines
1.5 KiB
C++
66 lines
1.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Class Viewpoint2D
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
// Own
|
|
#include "situation_map_types.h"
|
|
#include <Common/situation_map_logging.h>
|
|
#include <situation_map_export.h>
|
|
|
|
// Qt
|
|
#include <QString>
|
|
|
|
class QJsonObject;
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace SituationMap
|
|
{
|
|
|
|
//----------------------------------------------------------------------------
|
|
// for 2D:
|
|
class SITUATIONMAP_EXPORT Viewpoint2D
|
|
{
|
|
public:
|
|
static constexpr double defaultScale = 999999.9;
|
|
|
|
Viewpoint2D(const QPointF ¢erGeo = QPointF(), double scale = defaultScale, double rotation = 0);
|
|
|
|
bool isNull() const;
|
|
|
|
void resetViewpoint();
|
|
|
|
QPointF centerGeo() const;
|
|
void setCenterGeo(const QPointF ¢erGeo);
|
|
|
|
double scale() const;
|
|
void setScale(double scale);
|
|
|
|
double rotation() const;
|
|
void setRotation(double rotation);
|
|
|
|
static Viewpoint2D read(const QJsonObject &json);
|
|
QJsonObject toJsonObject() const;
|
|
|
|
QString toString() const;
|
|
|
|
protected:
|
|
QPointF m_centerGeo; ///< lon, lat
|
|
double m_scale = defaultScale; // '0' may lead to an ESRI exception. Try to avoid and use another value
|
|
double m_rotation = 0; ///< absoluteAngleDegrees
|
|
};
|
|
//----------------------------------------------------------------------------
|
|
|
|
SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream,
|
|
const SituationMap::Viewpoint2D &value);
|
|
|
|
|
|
|
|
} // namespace SituationMap
|
|
|