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>
61 lines
1.5 KiB
C++
61 lines
1.5 KiB
C++
/**
|
|
* Borderline object
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by hjl, SLSE, 2017-06-14
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
|
|
#include "object_base.h"
|
|
#include <DDS/Core/function_reply_object.h>
|
|
#include <AreaEffectSimulation/aes_db.h>
|
|
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
|
|
class ObjectBorderline final : public ObjectBaseTmpl<Database::AesBorderline>
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ObjectBorderline(MainHandler *mainHandler,
|
|
QObject *parent = nullptr);
|
|
|
|
~ObjectBorderline();
|
|
|
|
Core::FunctionReplyObject createObject(const Database::AesBorderline &dbData,
|
|
const std::vector<Core::GeoPosition2D> &ddsSegments,
|
|
const QVector<Database::AesBorderlineSegment> &dbSegments);
|
|
|
|
Core::FunctionReplyObject updateObject(const Database::AesBorderline &dbData,
|
|
const std::vector<Core::GeoPosition2D> &ddsSegments);
|
|
|
|
Database::AesBorderline get() const
|
|
{
|
|
return m_data;
|
|
}
|
|
|
|
Core::FunctionReplyObject removeObject() override;
|
|
|
|
std::vector<Core::GeoPosition> form() const override { return m_aiv.form(); }
|
|
QPolygonF generateForm() override;
|
|
AesType aesType() const override { return AesType::AtBorderline; }
|
|
bool isCentral() const override { return m_data.isCentral; }
|
|
void removeTopics();
|
|
|
|
protected Q_SLOTS:
|
|
void onPublishData() override;
|
|
|
|
private:
|
|
void publishAiv();
|
|
|
|
QVector<Database::AesBorderlineSegment> m_dbSegments;
|
|
AesItemView m_aiv;
|
|
|
|
};
|
|
} // Namespace AreaEffectSimulation
|
|
|