Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,66 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* main for BuildingControlUnit
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-01-27
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <BSM/bsm_api.h>
|
||||
#include <Json/json_api.h>
|
||||
#include <VWM/vwm_api.h>
|
||||
//#include <EGCU/egcu_api.h>
|
||||
#include <ControlEffects/handeleffects.h>
|
||||
#include "handle_http_request.h"
|
||||
#include "logger.h"
|
||||
|
||||
class QWebSocket;
|
||||
namespace BuildingControlUnit
|
||||
{
|
||||
class MainHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
MainHandler();
|
||||
~MainHandler();
|
||||
|
||||
bool init(const QString &ammuXml,
|
||||
const QString &bldCfgXml,
|
||||
const QString &vwmXml,
|
||||
unsigned short listenPort,
|
||||
const bool initBuilding,
|
||||
const QString &controlEffectsCfg);
|
||||
|
||||
private Q_SLOTS:
|
||||
void onHitResult(const HitResult &result, const QMap<int, ContaminationState> &contaminationStates, bool playSound);
|
||||
void setInitialOverrides(const QString &hostname);
|
||||
void onUnknownDirectHit(int sensorId);
|
||||
void onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEffectState> &effectStates);
|
||||
void onSwitchRelayRequest(const QString &hostname, const SwitchRelayValues &switchRelayValues);
|
||||
void webSocketSendInitialData(QWebSocket *ws);
|
||||
private:
|
||||
QVector<int> getAffectedRoomIds(const QVector<HitRoom> &allHitRooms) const;
|
||||
QVector<int> getSegmentDamage(const QVector<HitRoom> &allHitRooms, const int damagePercentNew) const;
|
||||
int getHitRoomId(const QVector<HitRoom> &allHitRooms) const;
|
||||
void flashBuildingDestructionIndicator(int egcu);
|
||||
void cleanup();
|
||||
private:
|
||||
BSM::Api *m_bsmApi;
|
||||
//EGCU::Api *m_egcuApi;
|
||||
Json::Api *m_jsonApi;
|
||||
VWM::Api *m_vwmApi;
|
||||
HandelEffects * m_handelEffectsBsm;
|
||||
HandleHttpRequest * m_handleHttpRequest;
|
||||
BuildingEgcuConfig m_egcuConfig;
|
||||
QVector<HandelEffects*> m_handelEffectsVec;
|
||||
QMap< QString, QVector<BcuEffectState>> m_effectStates;
|
||||
BcuEffectOverride m_bsmFlash;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // BuildingControlUnit
|
||||
Reference in new issue
Block a user