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,85 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Interface of AbstractMapObject
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// Own
|
||||
#include "situation_map_types.h"
|
||||
#include "situation_map_utils.h"
|
||||
#include <situation_map_export.h>
|
||||
|
||||
// Qt
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
class SITUATIONMAP_EXPORT BoundingBox
|
||||
{
|
||||
public:
|
||||
enum class ExtentType {Undefined, Sim, Pixel};
|
||||
static QString toString(BoundingBox::ExtentType value);
|
||||
|
||||
public:
|
||||
explicit BoundingBox(ExtentType extentType = ExtentType::Undefined);
|
||||
explicit BoundingBox(ExtentType extentType, const Point3D ¢er, double width = 0, double height = 0); ///< relative to BasePoint
|
||||
|
||||
void reset();
|
||||
|
||||
ExtentType extentType() const;
|
||||
void setExtentType(ExtentType extentType);
|
||||
|
||||
bool isValid() const;
|
||||
|
||||
Point3D center() const;
|
||||
|
||||
double width() const; ///< interpret values depending on type
|
||||
double height() const; ///< interpret values depending on type
|
||||
|
||||
Point3D topLeft() const; ///< use quadrant 1
|
||||
Point3D topRight() const; ///< use quadrant 1
|
||||
Point3D bottomLeft() const; ///< use quadrant 1
|
||||
Point3D bottomRight() const; ///< use quadrant 1
|
||||
|
||||
Point3D centerRight() const; ///< use quadrant 1
|
||||
|
||||
PositionCont positions() const;
|
||||
|
||||
|
||||
QString toString() const;
|
||||
|
||||
protected:
|
||||
ExtentType m_extentType = ExtentType::Undefined; ///< relevant for width and height
|
||||
|
||||
Point3D m_center; ///< simCoordinates
|
||||
|
||||
double m_width; ///< simCoordinates or pixel
|
||||
double m_height; ///< simCoordinates or pixel
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// output operator:
|
||||
//-----------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief Output operator
|
||||
* @param stream used to stream into.
|
||||
* @param value to be streamed.
|
||||
* @return appended stream.
|
||||
*/
|
||||
SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream,
|
||||
const BoundingBox &value);
|
||||
SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream,
|
||||
const BoundingBox::ExtentType &value);
|
||||
|
||||
|
||||
} // namespace SituationMap
|
||||
|
||||
Reference in new issue
Block a user