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,75 @@
|
||||
/**
|
||||
* Object class for ChargeEffect
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <aes_db.h>
|
||||
#include <aes_dtc.h>
|
||||
#include <aes_ftc.h>
|
||||
#include <aes_enums.hpp>
|
||||
|
||||
class QTimer;
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
class MainHandler;
|
||||
|
||||
class ObjectChargeEffect : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ObjectChargeEffect(const Database::AesChargeEffect &data, MainHandler *mainHandler, QObject *parent); // creation from database
|
||||
ObjectChargeEffect(MainHandler *mainHandler, QObject *parent);
|
||||
|
||||
Core::FunctionReplyObject create(const ChargeEffectModifyRequest &data); // creation from function topic
|
||||
Core::FunctionReplyObject update(const ChargeEffectModifyRequest &data); // from function topic
|
||||
void updatedProperties(const Database::AesChargeEffect &dbData);
|
||||
bool remove();
|
||||
|
||||
// conversion methods
|
||||
static Database::AesChargeEffect functionTopicToDatabase(const ChargeEffectModifyRequest &data);
|
||||
ChargeEffect dataBaseToDataTopic(const Database::AesChargeEffect &data);
|
||||
|
||||
void publish();
|
||||
|
||||
void init();
|
||||
QDateTime getEffectStart() const;
|
||||
qint32 id() const;
|
||||
bool isFinished() const;
|
||||
|
||||
static qint32 s_afterglowMsecs;
|
||||
|
||||
Q_SIGNALS:
|
||||
void finished(qint32 chargeEffectId);
|
||||
void chargeEffectStateChanged(const int id, const AesEffectState state);
|
||||
|
||||
private Q_SLOTS:
|
||||
void onStateTimerTimeout();
|
||||
|
||||
private: // methods
|
||||
void setNextState();
|
||||
void calculateInitEffectState();
|
||||
void startStateTimer();
|
||||
bool hasChanges(const Database::AesChargeEffect newData) const;
|
||||
|
||||
private: // attributes
|
||||
MainHandler *m_mainHandler;
|
||||
Database::AesChargeEffect m_data;
|
||||
int m_trajectoryId;
|
||||
AesEffectState m_state;
|
||||
bool m_stateChanged;
|
||||
QTimer *m_stateTimer;
|
||||
LOGGER_T &m_logger;
|
||||
}; // class ObjectChargeEffect
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user