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>
73 lines
2.0 KiB
C++
73 lines
2.0 KiB
C++
/**
|
|
* Exercise object
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include "aes_db.h"
|
|
#include "object_base.h"
|
|
#include <QSet>
|
|
#include <QPolygonF>
|
|
#include <QPainterPath>
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
class ObjectDangerArea final : public ObjectBaseTmpl<Database::AesDangerArea>
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ObjectDangerArea(MainHandler *mainHandler,
|
|
QObject *parent = nullptr);
|
|
~ObjectDangerArea();
|
|
|
|
Core::FunctionReplyObject createObject(const Database::AesDangerArea &data,
|
|
const std::vector<Core::GeoPosition2D> &segmentsDds,
|
|
const QVector<Database::AesDangerSegment> &segmentsDb);
|
|
|
|
Core::FunctionReplyObject updateObject(const Database::AesDangerArea &data,
|
|
const std::vector<Core::GeoPosition2D> &segments);
|
|
|
|
Database::AesDangerArea get() const { return m_data; }
|
|
|
|
QVector<Database::AesDangerSegment> segments() const { return m_segments; }
|
|
|
|
std::vector<Core::GeoPosition> form() const override { return m_aiv.form(); }
|
|
QPolygonF generateForm() override;
|
|
AesType aesType() const override { return AesType::AtDangerArea; }
|
|
bool isCentral() const override { return m_data.isCentral; }
|
|
|
|
static inline bool intersects(const QPolygonF &p1, const QPolygonF &p2)
|
|
{
|
|
QPainterPath pp1;
|
|
pp1.addPolygon(p1);
|
|
QPainterPath pp2;
|
|
pp2.addPolygon(p2);
|
|
return pp1.intersects(pp2);
|
|
}
|
|
|
|
protected Q_SLOTS:
|
|
void onPublishData() override;
|
|
protected:
|
|
void removeTopics();
|
|
|
|
private Q_SLOTS:
|
|
void onUpdateCorrelation();
|
|
void onNewAiv(const AesItemView &itemView);
|
|
void onRemoveAiv(int32_t aesItemId);
|
|
|
|
private:
|
|
void publishAiv();
|
|
int idForCorrelatedItem(int corItemId) const { return 1000000 * m_data.id + corItemId; }
|
|
private:
|
|
QVector<Database::AesDangerSegment> m_segments;
|
|
AesItemView m_aiv;
|
|
QSet<int> m_correlatedAesItems;
|
|
QPolygonF m_utmPoly;
|
|
int m_zone;
|
|
|
|
QPolygonF utmPolyFromGeoVec(const std::vector<Core::GeoPosition> &geoPos, int zone);
|
|
};
|
|
}
|