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,86 @@
|
||||
// /**
|
||||
// * Object class for Effector
|
||||
// * $Id$
|
||||
// * $HeadURL$
|
||||
// * $Author$
|
||||
// */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "logger.h"
|
||||
#include "effector_state_machine.h"
|
||||
#include "Trajectory/trajectory_transform.h"
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
class MainHandler;
|
||||
class AbstractFiringStrategy;
|
||||
|
||||
class ObjectEffector : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
ObjectEffector(MainHandler *mainHandler, QObject *parent);
|
||||
bool init(int participantId);
|
||||
int assignedAesItemId(){return m_aesItemId;}
|
||||
AesEffectorState currentEffectorState();
|
||||
|
||||
MainHandler *mainHandler() const;
|
||||
int aesItemId() const;
|
||||
int participantId() const;
|
||||
QVector<TrajectoryPoint> intendendTrajectory() const;
|
||||
EffectorData effectorData() const;
|
||||
|
||||
public slots:
|
||||
void assignAesItemRequest(int aesItemId);
|
||||
bool reportFireReadinessRequest(); // Feuerbereitschaft melden
|
||||
void fireOrderRequest(); // Feuerbefehl
|
||||
void fireRequest(); // Feuern
|
||||
bool reportFiredRequest(); // Abgefeuert melden
|
||||
void reportEmptyChargeRequest(bool emptyCharge);
|
||||
bool overrideReadynessTimerMinMax(int newMillisecondsMin, int newMillisecondsMax);
|
||||
void resetReadynessTimer();
|
||||
|
||||
void setEffectorData(const EffectorData& effectorData);
|
||||
|
||||
signals:
|
||||
void signalNotReadyToFire(int participantId, int aesItemId);
|
||||
void signalReadyToFire(int participantId, int aesItemId);
|
||||
void signalReceivedOrder(int participantId, int aesItemId);
|
||||
void signalReportedFired(int participantId, int aesItemId);
|
||||
void signalFired(int participantId, int aesItemId, const QVector<int> &chargeEffectIds);
|
||||
|
||||
public: // methods
|
||||
void assignAesItem(int aesItemId);
|
||||
void deleteAssignmentAesItem();
|
||||
|
||||
private slots:
|
||||
// Achtung:!!!
|
||||
// die Punkte in geometry sind im SAA-Format prich relativ zum Abschusspunkt in Metern.
|
||||
// x = lon
|
||||
// y = lat
|
||||
// Die Zeit ist bereits relativ zum Abschusspunkt.
|
||||
void setIndendedTrajectory(const std::vector<Core::RelativePositionRelativeTime> &geometryRelativeToLaunchOrigin);
|
||||
|
||||
void sendEffectorToDds();
|
||||
void onEffectorFired();
|
||||
void logMessage(QString message);
|
||||
|
||||
private: // attributes
|
||||
MainHandler *m_mainHandler;
|
||||
EffectorStateMachine *m_effectorStateMachine {nullptr};
|
||||
int m_aesItemId {0};
|
||||
int m_participantId {0};
|
||||
|
||||
QVector<TrajectoryPoint> m_intendendTrajectory; // Original
|
||||
EffectorData m_effectorData;
|
||||
AbstractFiringStrategy *m_firingStrategy {nullptr};
|
||||
LOGGER_T &m_logger;
|
||||
}; // class ObjectEffector
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user