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,112 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Interface of NineLiner
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "abstract_multi_point_map_object.h"
|
||||
#include <Map/abstract_effect_simulation.h>
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
/**
|
||||
* @brief The NineLiner class supports NineLiners of different agents.
|
||||
* The method setPositions() should never be called.
|
||||
*/
|
||||
struct NineLiner : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
|
||||
{
|
||||
class NineLinerData
|
||||
{
|
||||
public:
|
||||
Point3D initialPoint;
|
||||
Point3D targetPosition;
|
||||
|
||||
int friendliesBearing = -1; // friendlies is optional
|
||||
double friendliesDistance = -1; // friendlies is optional
|
||||
|
||||
int fah = 0; //finalAttackHeading
|
||||
int fahLow = 0; //finalAttackHeading-SectorLow
|
||||
int fahHigh = 0; //finalAttackHeading-SectorHigh
|
||||
|
||||
/**
|
||||
* @brief operator== Compare two objects
|
||||
* @param other to be compared with
|
||||
* @return true if identical, otherwise false.
|
||||
*/
|
||||
bool operator==(const NineLinerData &other) const
|
||||
{
|
||||
return ((this->initialPoint == other.initialPoint) &&
|
||||
(this->targetPosition == other.targetPosition) &&
|
||||
|
||||
(this->friendliesBearing == other.friendliesBearing) &&
|
||||
(this->friendliesDistance == other.friendliesDistance) &&
|
||||
|
||||
(this->fah == other.fah) &&
|
||||
(this->fahLow == other.fahLow) &&
|
||||
(this->fahHigh == other.fahHigh)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief operator!= Compare two objects
|
||||
* @param other to be compared with
|
||||
* @return true if NOT identical, otherwise false.
|
||||
*/
|
||||
bool operator!=(const NineLinerData &other) const
|
||||
{
|
||||
return !(*this == other);
|
||||
}
|
||||
|
||||
QString toString() const
|
||||
{
|
||||
QString str;
|
||||
|
||||
std::ostringstream stream;
|
||||
stream << " initialPoint = " << initialPoint
|
||||
<< " targetPosition = " << targetPosition;
|
||||
str.append(QLatin1String(stream.str().c_str()));
|
||||
|
||||
str.append(QStringLiteral(", friendliesBearing=%1").arg(friendliesBearing));
|
||||
str.append(QStringLiteral(", friendliesDistance=%1").arg(friendliesDistance));
|
||||
|
||||
str.append(QStringLiteral(", fah=%1").arg(fah));
|
||||
str.append(QStringLiteral(", fahLow=%1").arg(fahLow));
|
||||
str.append(QStringLiteral(", fahHigh=%1").arg(fahHigh));
|
||||
return str;
|
||||
}
|
||||
}; // class NineLinerData
|
||||
|
||||
|
||||
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
* Don't use "= default" because of bug in VS2015 JT 2016/11/7
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
|
||||
NineLiner() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;} ///< Contructor
|
||||
|
||||
virtual ~NineLiner() = default; ///< Destructor
|
||||
|
||||
|
||||
/*! \name Specific data*/
|
||||
//@{
|
||||
|
||||
virtual void setNineLinerData(const NineLinerData &data) = 0;
|
||||
|
||||
// virtual PositionCont impacts() const = 0;
|
||||
|
||||
//@}
|
||||
|
||||
|
||||
// void setPositions(const PositionCont& posCont) //SHOULD NEVER BE CALLED
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
} // namespace SituationMap
|
||||
Reference in new issue
Block a user