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>
90 lines
2.1 KiB
C++
90 lines
2.1 KiB
C++
/**
|
|
* ModuleTests for Msg
|
|
* $Id: ces_tests_gas_pipe.h 49256 2020-01-06 14:09:14Z ehrlicher $
|
|
* $HeadURL: svn://slssvn/TDS/branches/product/features/3dws_devel/Lts/Services/FeedGeoJson/ModuleTests/ces_tests_gas_pipe.h $
|
|
* $Author: ehrlicher $
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "websocket_server.h"
|
|
|
|
#include <AreaEffectSimulation/aes_dtc.h>
|
|
#include <FeedGeoJson/logger.h>
|
|
#include <ProjectDataManagement/pdm_dtc.h>
|
|
#include <ParticipantManagement/ppm_dtc.h>
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <LtsCoordTrans/lts_coord_trans.h>
|
|
#include <QPointF>
|
|
|
|
namespace FeedGeoJson
|
|
{
|
|
class FeedGeoJson : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit FeedGeoJson(QObject *parent = nullptr);
|
|
|
|
~FeedGeoJson();
|
|
|
|
bool init(const int domainId, const int exerciseId, WebSocketServer &webSocketServer);
|
|
|
|
bool testsSuccessful() const
|
|
{
|
|
return m_bTestsSuccessful;
|
|
}
|
|
|
|
|
|
private slots:
|
|
/**
|
|
* Handle the signals from 'ParticipantManagement'
|
|
*/
|
|
void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType);
|
|
void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
|
|
|
|
|
|
protected Q_SLOTS:
|
|
|
|
void failExit();
|
|
void ExitSuccess();
|
|
|
|
protected:
|
|
|
|
private: // methods
|
|
QString getGeoJsonPosition(const ParticipantManagement::ParticipantPosition &data);
|
|
|
|
|
|
private: // structs
|
|
struct Participant
|
|
{
|
|
int participantId;
|
|
int participantTypeId;
|
|
int equipmentNumber;
|
|
int partyId;
|
|
int buildingId;
|
|
int roomId;
|
|
int relX;
|
|
int relY;
|
|
};
|
|
|
|
|
|
private:
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector42;
|
|
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
|
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
|
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
|
|
|
bool m_bTestsSuccessful;
|
|
|
|
LtsCoordTrans::UtmCoordinate m_refPos;
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
QVector<Participant> m_participants;
|
|
WebSocketServer* m_websocketServer;
|
|
};
|
|
|
|
} // namespace FeedGeoJson
|