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,76 @@
|
||||
/**
|
||||
* Types to be used for transparent OC communication
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLSE, 2018-02-20
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
namespace OcSituation
|
||||
{
|
||||
|
||||
enum TelegramId
|
||||
{
|
||||
DemandSituation = 131,
|
||||
SituationData = 132,
|
||||
StateInformation = 133,
|
||||
SituationDataInitial = 134,
|
||||
CentralAesData = 135,
|
||||
CentralAesDataInitial = 136,
|
||||
|
||||
DemandEvaluationSchema = 111,
|
||||
EvaluationSchema = 148,
|
||||
Evaluation = 112,
|
||||
|
||||
Message = 130,
|
||||
|
||||
DemandAesItems = 114,
|
||||
AesItems = 166,
|
||||
|
||||
EquipmentErrorRegistration = 113,
|
||||
EquipmentRegistration = 115,
|
||||
|
||||
SingleMine = 117,
|
||||
MineClearancePositions = 167,
|
||||
MineClearanceArea = 168
|
||||
};
|
||||
|
||||
enum CentralAesChangeType
|
||||
{
|
||||
AddMod = 1,
|
||||
Remove = 2
|
||||
};
|
||||
|
||||
enum ModificationFlag
|
||||
{
|
||||
eNone = 0, // == Player is out of range -> do not display
|
||||
ePosition2D = (1 << 0), // x,y,sampleTime
|
||||
ePosition3D = (1 << 1), // x,y,z,sampleTime
|
||||
eVBG = (1 << 2), // injuryState, partei_zustand_aenderung, sampleTime
|
||||
eState = (1 << 3), // bits, totalStateInformationBits
|
||||
eStructure = (1 << 4), // equipmentNumber, typeId, partyId
|
||||
eDesignator = (1 << 5), // designator, tacticalIdentifier
|
||||
eSymbol = (1 << 6), // SIDC string (20Bytes)
|
||||
|
||||
eAll = (ePosition3D | eVBG | eState | eStructure | eDesignator | eSymbol)
|
||||
};
|
||||
typedef int ModificationBits;
|
||||
|
||||
enum AesType
|
||||
{
|
||||
Ied = 1,
|
||||
IedPositions = 2,
|
||||
ExplosionSingleSMart = 11,
|
||||
ExplosionAreaSMart = 12,
|
||||
DusMineArea = 13,
|
||||
DangerArea = 14,
|
||||
};
|
||||
|
||||
enum SituationCenterType
|
||||
{
|
||||
Equipment = 1,
|
||||
Position = 2
|
||||
};
|
||||
|
||||
} // namespace OcSituation
|
||||
Reference in new issue
Block a user