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>
100 lines
2.3 KiB
C++
100 lines
2.3 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Class Camera
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
// Own
|
|
#include "camera.h"
|
|
|
|
|
|
// Qt
|
|
#include <QJsonObject>
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace SituationMap
|
|
{
|
|
|
|
Camera::Camera()
|
|
{
|
|
resetCamera();
|
|
}
|
|
|
|
void Camera::resetCamera()
|
|
{
|
|
loc_x_lon = 0;
|
|
loc_y_lat = 0;
|
|
loc_z = 0;
|
|
heading = 0;
|
|
pitch = 0;
|
|
roll = 0;
|
|
}
|
|
|
|
bool Camera::isNull() const
|
|
{
|
|
return qFuzzyIsNull(loc_x_lon) && qFuzzyIsNull(loc_y_lat) && qFuzzyIsNull(loc_z) &&
|
|
qFuzzyIsNull(heading) && qFuzzyIsNull(pitch) && qFuzzyIsNull(roll);
|
|
|
|
}
|
|
|
|
Camera Camera::read(const QJsonObject &json)
|
|
{
|
|
Camera cam;
|
|
if (json.contains(QLatin1String("loc_x_lon")))
|
|
cam.loc_x_lon = json[QLatin1String("loc_x_lon")].toDouble();
|
|
if (json.contains(QLatin1String("loc_y_lat")))
|
|
cam.loc_y_lat = json[QLatin1String("loc_y_lat")].toDouble();
|
|
if (json.contains(QLatin1String("loc_z")))
|
|
cam.loc_z = json[QLatin1String("loc_z")].toDouble();
|
|
|
|
if (json.contains(QLatin1String("heading")))
|
|
cam.heading = json[QLatin1String("heading")].toDouble();
|
|
if (json.contains(QLatin1String("loc_x_lon")))
|
|
cam.pitch = json[QLatin1String("pitch")].toDouble();
|
|
if (json.contains(QLatin1String("roll")))
|
|
cam.roll = json[QLatin1String("roll")].toDouble();
|
|
|
|
return cam;
|
|
}
|
|
QJsonObject Camera::toJsonObject() const
|
|
{
|
|
QJsonObject json;
|
|
json[QLatin1String("loc_x_lon")] = loc_x_lon;
|
|
json[QLatin1String("loc_y_lat")] = loc_y_lat;
|
|
json[QLatin1String("loc_z")] = loc_z;
|
|
json[QLatin1String("heading")] = heading;
|
|
json[QLatin1String("pitch")] = pitch;
|
|
json[QLatin1String("roll")] = roll;
|
|
return json;
|
|
}
|
|
|
|
|
|
QString Camera::toString() const
|
|
{
|
|
QString str;
|
|
str.append(QStringLiteral("xLon;yLat=%1;%2[rad").arg(loc_x_lon).arg(loc_y_lat) );
|
|
str.append(QStringLiteral("xLon;yLat=%1;%2[deg").arg(loc_x_lon*180.0/M_PI).arg(loc_y_lat*180.0/M_PI) );
|
|
str.append(QStringLiteral(" z=%1").arg(loc_z));
|
|
|
|
str.append(QStringLiteral(" heading=%1").arg(heading));
|
|
str.append(QStringLiteral(" pitch=%1").arg(pitch));
|
|
str.append(QStringLiteral(" roll=%1").arg(roll));
|
|
return str;
|
|
}
|
|
|
|
|
|
std::ostream &operator<< (std::ostream &stream,
|
|
const Camera &value)
|
|
{
|
|
stream << "Camera(" << value.toString() << "): ";
|
|
return stream;
|
|
}
|
|
|
|
|
|
|
|
} // namespace SituationMap
|
|
|