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,90 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Interface of MineField
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "abstract_multi_point_map_object.h"
|
||||
#include <Map/abstract_effect_simulation.h>
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
/**
|
||||
* @brief The MineField class supports MineFields with Activated and DeActivated mines.
|
||||
*/
|
||||
class MineField : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
|
||||
{
|
||||
|
||||
using BaseClass = AbstractMapObject;
|
||||
|
||||
public:
|
||||
enum class MineState
|
||||
{
|
||||
Activated, ///< live, aimed
|
||||
DeActivated ///<
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
* Don't use "= default" because of bug in VS2015 JT 2016/11/7
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
|
||||
MineField() : AbstractMultiPointMapObject(), AbstractEffectSimulation() { ; }
|
||||
virtual ~MineField() = default; ///< Destructor
|
||||
|
||||
|
||||
/*! \name Segments */
|
||||
//@{
|
||||
virtual PositionCont segment(int key) const = 0;
|
||||
/**
|
||||
* @brief Set positions of one segment.
|
||||
* @param key of segment to be set.
|
||||
* @param posCont positions of segment.
|
||||
* @note: is key is negativ, no fill pattern is aplied.
|
||||
* If key is >=0, the pattern of the segments take over the main pattern.
|
||||
*/
|
||||
virtual void setSegment(int key, const PositionCont &posCont) = 0;
|
||||
|
||||
/**
|
||||
* @brief Remove one segment
|
||||
* @param key to be removed.
|
||||
*/
|
||||
virtual void removeSegment(int key) = 0;
|
||||
|
||||
/**
|
||||
* @brief Remove all segments.
|
||||
*/
|
||||
virtual void removeSegments() = 0;
|
||||
|
||||
/**
|
||||
* @brief Get a list of keys in use.
|
||||
* @return List of keys in use.
|
||||
*/
|
||||
virtual QList<int> keysInUse() const = 0;
|
||||
|
||||
|
||||
/*! \name Positions of Mines */
|
||||
//@{
|
||||
/**
|
||||
* @brief Set all positions of mines (of all states)
|
||||
* @param mineState to be set.
|
||||
* @param posCont positions of mines to be set.
|
||||
*/
|
||||
virtual void setPositionsMine(MineState mineState, const PositionCont &posCont) = 0;
|
||||
//@}
|
||||
|
||||
virtual bool mineVisibility(MineState mineState) const = 0;
|
||||
virtual void setMineVisibility(MineState mineState, bool visible) = 0;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
} // namespace SituationMap
|
||||
Reference in new issue
Block a user