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,80 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Damage state transaformation from/to HLA <-> Excon, see ICD, 4.4.3.5.6 - Damage Model
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Common/identifierstruct.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <TacticalStatusStruct.h>
|
||||
#include <EntityIdentifierStruct.h>
|
||||
#include <DamageStatusEnum32.h>
|
||||
#include <HitResultEnum16.h>
|
||||
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
class QTimer;
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
class DamageModel : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit DamageModel(const IdentifierStruct &is,
|
||||
const rpr2::TacticalStatusStruct &state);
|
||||
explicit DamageModel(const rpr2::TacticalStatusStruct &state);
|
||||
explicit DamageModel(const IdentifierStruct &is)
|
||||
: DamageModel(is, {rpr2::TacticalStatusEnum8::CombatReady, 0, rpr2::TotalStatusEnum32::CombatReady})
|
||||
{}
|
||||
|
||||
const IdentifierStruct &identifierStruct() const { return m_is; }
|
||||
|
||||
rpr2::DamageStatusEnum32::ET damageState(qint64 simTimeMSec) const;
|
||||
rpr2::TotalStatusEnum32::ET totalState(qint64 simTimeMSec) const;
|
||||
ProjectDataManagement::VulnerabilityState vulnerabilityState(qint64 simTimeMSec) const;
|
||||
bool immobilized(qint64 simTimeMSec) const;
|
||||
bool firePowerDisabled(qint64 simTimeMSec) const;
|
||||
|
||||
void setTacticalStatusStruct(const rpr2::TacticalStatusStruct &state, qint64 simTimeMSec);
|
||||
void setTacticalStatus(const rpr2::HitResultEnum16::ET &state, qint64 simTimeMSec);
|
||||
|
||||
rpr2::TacticalStatusStruct tacticalStatusStruct(qint64 timeStamp) const;
|
||||
|
||||
Q_SIGNALS:
|
||||
void damageStateChanged();
|
||||
void playerManipulationChanged(int eqNo, bool playerIsManipulated, qint64 simTimeMSecs);
|
||||
|
||||
private:
|
||||
int indexForTime(qint64 simTimeMSec) const;
|
||||
void initTimer();
|
||||
|
||||
private:
|
||||
IdentifierStruct m_is;
|
||||
QTimer *m_timer = nullptr;
|
||||
|
||||
struct TacticalStatusStructWithTimeStamp
|
||||
{
|
||||
rpr2::TacticalStatusStruct tss;
|
||||
qint64 timeStamp = 0;
|
||||
TacticalStatusStructWithTimeStamp()
|
||||
{
|
||||
tss.TacticalStatus = rpr2::TacticalStatusEnum8::CombatReady;
|
||||
tss.VulnerabilityKind = 0;
|
||||
tss.TotalStatus = rpr2::TotalStatusEnum32::CombatReady;
|
||||
}
|
||||
};
|
||||
QVector<TacticalStatusStructWithTimeStamp> m_tacticalStates;
|
||||
|
||||
|
||||
static const int s_waitInterval = 100; // 100 ms
|
||||
void setTacticalStatusStructWithTimestamp(TacticalStatusStructWithTimeStamp &tssTs, const rpr2::HitResultEnum16::ET &state, qint64 simTimeMSec);
|
||||
};
|
||||
} // namespace HighLevelArchitecture
|
||||
Reference in new issue
Block a user