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>
68 lines
2.2 KiB
C++
68 lines
2.2 KiB
C++
/**
|
|
* Handler for all training area objects
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, SLSE, 2016-03-04
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <QMap>
|
|
#include <QVector>
|
|
#include "asm_db_structs.h"
|
|
#include "object_map_description.h"
|
|
|
|
#include "dds_handler.h"
|
|
#include "logger.h"
|
|
|
|
namespace AssetManagement
|
|
{
|
|
class MainHandler;
|
|
class ObjectTrainingArea;
|
|
class HandlerTrainingArea final : public QObject
|
|
, protected Interface::Fts::TrainingAreaModifyRequestHandler
|
|
, protected Interface::Fts::TrainingAreaRemoveRequestHandler
|
|
, protected Interface::Fts::MapDescriptionModifyRequestHandler
|
|
, protected Interface::Fts::MapDescriptionRemoveRequestHandler
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
|
|
struct MapDescriptionSeq
|
|
{
|
|
QMap <int, Database::AsmMapDescription> map2D;
|
|
QMap <int, Database::AsmMapDescription> scene3D;
|
|
QMap <int, Database::AsmMapDescription> elevation;
|
|
QMap <int, Database::AsmMapDescription> sceneObj;
|
|
};
|
|
|
|
public:
|
|
explicit HandlerTrainingArea(MainHandler *mainHandler,
|
|
QObject *parent = nullptr);
|
|
~HandlerTrainingArea();
|
|
|
|
bool init();
|
|
|
|
private:
|
|
void onTrainingAreaModifyRequest(const rti::core::SampleIdentity &cookie,
|
|
const TrainingArea &request) override;
|
|
Core::FunctionReplyObject trainingAreaModifyRequest(const TrainingArea &request);
|
|
void onTrainingAreaRemoveRequest(const rti::core::SampleIdentity &cookie,
|
|
const Core::RemoveElementRequest &request) override;
|
|
void removeMapDescriptions(int trainingAreaId);
|
|
void onMapDescriptionModifyRequest(const rti::core::SampleIdentity &cookie,
|
|
const MapDescription &request) override;
|
|
Core::FunctionReplyObject mapDescriptionModifyRequest(const MapDescription &request);
|
|
void onMapDescriptionRemoveRequest(const rti::core::SampleIdentity &cookie,
|
|
const Core::RemoveElementRequest &request) override;
|
|
|
|
private:
|
|
QMap<int, ObjectTrainingArea *> m_objectTrainingAreaMap;
|
|
QMap<int, ObjectMapDescription *> m_objectMapDescriptionMap;
|
|
MainHandler *m_mainHandler;
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
};
|
|
}
|