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>
76 lines
2.0 KiB
C++
76 lines
2.0 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Class Geometry
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
// Own
|
|
#include "geometry.h"
|
|
#include <cmath>
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace SituationMap
|
|
{
|
|
|
|
|
|
QList<QPointF> Geometry::createCircle(const QPointF ¢er, qreal radius, int steps)
|
|
{
|
|
QList<QPointF> circle;
|
|
circle.reserve(steps);
|
|
|
|
if (steps < 10)
|
|
steps = 10;
|
|
for (int i = 0; i < 360; i += (360 / steps))
|
|
{
|
|
double winkel = i * M_PI / 180.0;
|
|
circle << (center + QPointF(cos(winkel) * radius, sin(winkel) * radius));
|
|
}
|
|
circle << circle.value(0); // 'close' the circle
|
|
// circle.translate(center);
|
|
return circle;
|
|
}
|
|
|
|
|
|
QList<QPointF> Geometry::createArcSegment(const QPointF ¢er, qreal radius,
|
|
double startAngle_degree,
|
|
double angleOffset_clockwise_degree,
|
|
int stepsPer360)
|
|
{
|
|
QList<QPointF> points;
|
|
|
|
if (stepsPer360 < 10)
|
|
stepsPer360 = 10;
|
|
|
|
startAngle_degree *= -1.0;
|
|
startAngle_degree += 90;
|
|
|
|
// normalize
|
|
startAngle_degree = fmod(startAngle_degree, 360);
|
|
angleOffset_clockwise_degree = fmod(angleOffset_clockwise_degree, 360);
|
|
|
|
// steps
|
|
int steps = fabs(angleOffset_clockwise_degree) * stepsPer360 / 360;
|
|
points.reserve(steps + 1);
|
|
|
|
double startAngle_rad = startAngle_degree * M_PI / 180.0;
|
|
double angleOffset_right_rad = angleOffset_clockwise_degree * M_PI / 180.0;
|
|
for (int i = 0; i < steps; ++i)
|
|
{
|
|
// '-' to go clockwise:
|
|
double winkel_rad = (startAngle_rad - (i * angleOffset_right_rad / steps));
|
|
points << (center + QPointF(cos(winkel_rad) * radius, sin(winkel_rad) * radius));
|
|
}
|
|
// calculate very last iteration (independent from 'steps'):
|
|
double winkel_rad = (startAngle_rad - (angleOffset_right_rad));
|
|
points << (center + QPointF(cos(winkel_rad) * radius, sin(winkel_rad) * radius));
|
|
|
|
return points;
|
|
}
|
|
|
|
|
|
|
|
} // namespace SituationMap
|
|
|