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
+78
@@ -0,0 +1,78 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Effects (plural) handler, handles all effects at one EGCU or BSM
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Gerlinde Rudolphus, SLTE, 2021-06-02
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "xmlreader.h"
|
||||
|
||||
#include <ControlEffects/controleffects_export.h>
|
||||
#include <BSM/bsm_types.h>
|
||||
#include <logger.h>
|
||||
#include "handle_http_request.h"
|
||||
class QTimer;
|
||||
|
||||
namespace BuildingControlUnit
|
||||
{
|
||||
|
||||
class CONTROLEFFECTS_EXPORT HandelEffects: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandelEffects(QObject *parent = nullptr, const QString &loggerchannel = QString());
|
||||
~HandelEffects();
|
||||
|
||||
void init(const QString &controlEffectsCfg, const QString &hostname, EffectType et);
|
||||
void startEffects(int damagePercent);
|
||||
void playHitSound(const int hitSoundId);
|
||||
void switchRelay(const SwitchRelayValues &switchRelayValues);
|
||||
QString hostname() const { return m_hostname; }
|
||||
void setOverrides(const QVector<BcuEffectState> &effectStates);
|
||||
QVector<BcuEffectState> getOverrides();
|
||||
|
||||
public slots:
|
||||
void handleEgcuReply(const QString &host, const QByteArray &data);
|
||||
|
||||
private slots:
|
||||
void onEffectReady();
|
||||
void sendHttpRequest(const QUrl &url);
|
||||
void onRelayStateTimerTimeout();
|
||||
|
||||
private:
|
||||
void handleEgcuReplyObject(const QString &host, const QByteArray &data);
|
||||
void handleEgcuReplyArray(const QString &host, const QByteArray &data);
|
||||
|
||||
|
||||
signals:
|
||||
void newHttpRequest(const QUrl &url, HandleHttpQueueMessageStatus status);
|
||||
void triggerAllFlashlights(int numberOfFlashes,
|
||||
int pauseDuration,
|
||||
int choppedConfiguration,
|
||||
int flashDuration);
|
||||
void sendRelayState (const RelayState &relayState);
|
||||
|
||||
private:
|
||||
XmlContents contents() const { return m_xmlReader.contents(); }
|
||||
int m_lastDamage = -1;
|
||||
XmlReader m_xmlReader;
|
||||
EffectType m_effectType; // BSM or Sound/Relay [EGCU]
|
||||
QString m_hostname;
|
||||
EffectOverride m_sounds;
|
||||
QTimer *m_getRelayStateTimer;
|
||||
RelayState m_relayState;
|
||||
int m_offlineCounter = 0;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
QVector<BcuEffectState> m_effectStates;
|
||||
bool m_overridesSend = false;
|
||||
//bool m_reconnected = false; // New Connection to EGCU => restore the target state of the EGCU
|
||||
bool m_offlineState = true;
|
||||
void createEffectHandler(Effect *e, const Range *range);
|
||||
};
|
||||
|
||||
} // BuildingControlUnit
|
||||
Reference in new issue
Block a user