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>
114 lines
2.5 KiB
C++
114 lines
2.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Class Viewpoint2D
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
// Own
|
|
#include "viewpoint2D.h"
|
|
|
|
|
|
// Qt
|
|
#include <QJsonObject>
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace SituationMap
|
|
{
|
|
|
|
Viewpoint2D::Viewpoint2D(const QPointF ¢erGeo, double scale, double rotation)
|
|
: m_centerGeo(centerGeo), m_scale(scale), m_rotation(rotation)
|
|
{
|
|
// Q_ASSERT(scale > 0);
|
|
}
|
|
|
|
bool Viewpoint2D::isNull() const
|
|
{
|
|
return m_centerGeo.isNull() && qFuzzyCompare(m_scale, defaultScale) && qFuzzyIsNull(m_rotation);
|
|
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
}
|
|
|
|
void Viewpoint2D::resetViewpoint()
|
|
{
|
|
m_centerGeo = QPointF();
|
|
m_scale = defaultScale;
|
|
m_rotation = 0;
|
|
}
|
|
|
|
QPointF Viewpoint2D::centerGeo() const
|
|
{
|
|
return m_centerGeo;
|
|
}
|
|
void Viewpoint2D::setCenterGeo(const QPointF ¢erGeo)
|
|
{
|
|
m_centerGeo = centerGeo;
|
|
}
|
|
|
|
double Viewpoint2D::scale() const
|
|
{
|
|
return m_scale;
|
|
}
|
|
void Viewpoint2D::setScale(double scale)
|
|
{
|
|
m_scale = scale;
|
|
}
|
|
|
|
double Viewpoint2D::rotation() const
|
|
{
|
|
return m_rotation;
|
|
}
|
|
void Viewpoint2D::setRotation(double rotation)
|
|
{
|
|
m_rotation = rotation;
|
|
}
|
|
|
|
Viewpoint2D Viewpoint2D::read(const QJsonObject &json)
|
|
{
|
|
Viewpoint2D vp;
|
|
if (json.contains(QLatin1String("centerLon")) && json.contains(QLatin1String("centerLat")))
|
|
{
|
|
QPointF centerGeo;
|
|
centerGeo.rx() = json[QLatin1String("centerLon")].toDouble();
|
|
centerGeo.ry() = json[QLatin1String("centerLat")].toDouble();
|
|
vp.setCenterGeo(centerGeo);
|
|
}
|
|
if (json.contains(QLatin1String("scale")))
|
|
vp.setScale(json[QLatin1String("scale")].toDouble());
|
|
|
|
if (json.contains(QLatin1String("rotation")))
|
|
vp.setRotation(json[QLatin1String("rotation")].toDouble());
|
|
return vp;
|
|
}
|
|
|
|
QJsonObject Viewpoint2D::toJsonObject() const
|
|
{
|
|
QJsonObject json;
|
|
json[QLatin1String("centerLon")] = m_centerGeo.x();
|
|
json[QLatin1String("centerLat")] = m_centerGeo.y();
|
|
json[QLatin1String("scale")] = m_scale;
|
|
json[QLatin1String("rotation")] = m_rotation;
|
|
return json;
|
|
}
|
|
|
|
QString Viewpoint2D::toString() const
|
|
{
|
|
QString asString = QStringLiteral("center %1;%2[rad] %3;%4[deg], scale=%5, rotation=%6")
|
|
.arg(m_centerGeo.x()).arg(m_centerGeo.y())
|
|
.arg(m_centerGeo.x()*180.0/M_PI).arg(m_centerGeo.y()*180.0/M_PI)
|
|
.arg(m_scale).arg(m_rotation);
|
|
return asString;
|
|
}
|
|
|
|
std::ostream &operator<< (std::ostream &stream,
|
|
const SituationMap::Viewpoint2D &value)
|
|
{
|
|
stream << "Viewpoint2D(" << value.toString() << "): ";
|
|
return stream;
|
|
}
|
|
|
|
|
|
} // namespace SituationMap
|
|
|