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,70 @@
|
||||
/**
|
||||
* Controler interface for the DMF vehicle terminal
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Florian Schult, NLSE, 2018-06-06
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
#include "handler_vehicle.h"
|
||||
#include "esc_helper.h"
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
|
||||
class ConnectionHandler;
|
||||
|
||||
class ControlUnitHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
public:
|
||||
explicit ControlUnitHandler(QObject *parent = nullptr);
|
||||
~ControlUnitHandler();
|
||||
|
||||
bool init();
|
||||
|
||||
// Commands to the controler
|
||||
bool send(const CommandSignal command, const unsigned int roundCount = 0);
|
||||
|
||||
signals:
|
||||
// Messages from the control unit to main/vehicle/etc
|
||||
void safetyStatus(const SafetyConfirmation_e &safetyConfirmation);
|
||||
void safetyWarnings(const SafetyStatus &safetyWarning);
|
||||
void vehicleType(const EffectShowManagement::Feature_e &type);
|
||||
void vehicleBattery(double battery);
|
||||
void vehicleRoundCount(int loadedRunds);
|
||||
void vehilceSmokeAmmunition(int ammunition);
|
||||
void vehicleShutDown();
|
||||
void vehicleConnected();
|
||||
void vehicleSafetyRevoked();
|
||||
void vehicleFinshedVolley(int rounds);
|
||||
void vehicleStoppedVolley(int rounds);
|
||||
void vehicleFireUnits(const CardRidges &cardRidge);
|
||||
void vehicleErrorStatus(const CardRidges &cardRidge);
|
||||
void vehicleSmokeCardridgesStatus(const CardRidges &cardRidge);
|
||||
void vehicleSmokeCardridgesFireStatus(const CardRidges &cardRidge);
|
||||
|
||||
private slots:
|
||||
void onDataReceived(const QByteArray &ba);
|
||||
void onConnectedToSerialConveter();
|
||||
void onDisconnectedFromSerialConveter();
|
||||
|
||||
private:
|
||||
ConnectionHandler *m_connectionHandler;
|
||||
QTimer *m_timer;
|
||||
EffectShowManagement::Feature_e m_feature;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
|
||||
};
|
||||
} // namespace EffectShowClient
|
||||
|
||||
Reference in new issue
Block a user