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>
60 lines
1.6 KiB
C++
60 lines
1.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* TrainingArea
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, NLE, 2019-08-02
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "WebSocketInterface/Messages/reply_message.h"
|
|
#include "logger.h"
|
|
#include <vector>
|
|
|
|
namespace AssetManagement
|
|
{
|
|
namespace Interface
|
|
{
|
|
class Dtc;
|
|
}
|
|
}
|
|
|
|
namespace InfrastructureManagement
|
|
{
|
|
namespace Interface
|
|
{
|
|
class Dtc;
|
|
}
|
|
}
|
|
|
|
namespace CombatNetRadio
|
|
{
|
|
|
|
/**
|
|
* Collects the data for the TrainingArea and the RadioStations.
|
|
* There is one instance for all active Exercises as they must share the same TrainingArea then.
|
|
*
|
|
* @author Christian Fröbel
|
|
*/
|
|
class TrainingArea
|
|
{
|
|
public:
|
|
explicit TrainingArea(int trainingAreaId, AssetManagement::Interface::Dtc *asmDtc, InfrastructureManagement::Interface::Dtc *ismDtc);
|
|
virtual ~TrainingArea() = default;
|
|
|
|
const WebSocketInterface::Messages::TrainingAreaMessage::TrainingAreaData &trainingArea() const { return m_trainingAreaData; }
|
|
const std::vector<WebSocketInterface::Messages::RadioStationMessage::RadioStationData> &radioStations() const { return m_radioStations; }
|
|
|
|
private:
|
|
void getTrainingArea(int trainingAreaId, AssetManagement::Interface::Dtc *asmDtc);
|
|
void getRadioStations(InfrastructureManagement::Interface::Dtc *ismDtc);
|
|
|
|
WebSocketInterface::Messages::TrainingAreaMessage::TrainingAreaData m_trainingAreaData;
|
|
std::vector<WebSocketInterface::Messages::RadioStationMessage::RadioStationData> m_radioStations;
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
} // namespace CombatNetRadio
|