Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -3,6 +3,8 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
#include <DDS/Core/core.hpp>
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
/**
|
||||
* @file core.hpp
|
||||
* @brief Core DDS Sammel-Header
|
||||
*
|
||||
* Beinhaltet alle Core-Typen für DDS-Integration.
|
||||
*
|
||||
* STUB: Diese Datei wird normalerweise von DDS generiert.
|
||||
* Für die Qt6-Migration erstellen wir einen minimalen Stub.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Core/core_types.h>
|
||||
#include <Core/core_enums.hpp>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <ostream>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
/**
|
||||
* @brief GeoPosition - Stub für DDS GeoPosition
|
||||
*
|
||||
* Einfache Struktur für geographische Positionen.
|
||||
*/
|
||||
struct GeoPosition
|
||||
{
|
||||
double longitude = 0.0;
|
||||
double latitude = 0.0;
|
||||
double altitude = 0.0;
|
||||
|
||||
GeoPosition() = default;
|
||||
|
||||
GeoPosition(double lon, double lat, double z)
|
||||
: longitude(lon)
|
||||
, latitude(lat)
|
||||
, altitude(z)
|
||||
{
|
||||
}
|
||||
|
||||
double lon() const { return longitude; }
|
||||
double lat() const { return latitude; }
|
||||
double z() const { return altitude; }
|
||||
|
||||
void lon(double lon) { longitude = lon; }
|
||||
void lat(double lat) { latitude = lat; }
|
||||
void z(double z) { altitude = z; }
|
||||
|
||||
void setLon(double lon) { longitude = lon; }
|
||||
void setLat(double lat) { latitude = lat; }
|
||||
void setZ(double z) { altitude = z; }
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief GeoPosition2D - 2D GeoPosition (ohne Altitude)
|
||||
*
|
||||
* Wird für Koordinaten ohne Höheninformation verwendet.
|
||||
* Implizite Konversion von GeoPosition ermöglicht Downcast.
|
||||
*/
|
||||
struct GeoPosition2D
|
||||
{
|
||||
double longitude = 0.0;
|
||||
double latitude = 0.0;
|
||||
|
||||
GeoPosition2D() = default;
|
||||
|
||||
GeoPosition2D(double lon, double lat)
|
||||
: longitude(lon)
|
||||
, latitude(lat)
|
||||
{
|
||||
}
|
||||
|
||||
// Implizite Konversion von GeoPosition (Downcast ignoriert altitude)
|
||||
GeoPosition2D(const GeoPosition& pos)
|
||||
: longitude(pos.lon())
|
||||
, latitude(pos.lat())
|
||||
{
|
||||
}
|
||||
|
||||
double lon() const { return longitude; }
|
||||
double lat() const { return latitude; }
|
||||
|
||||
void lon(double lon) { longitude = lon; }
|
||||
void lat(double lat) { latitude = lat; }
|
||||
|
||||
void setLon(double lon) { longitude = lon; }
|
||||
void setLat(double lat) { latitude = lat; }
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief ostream operator für GeoPosition (Debug/Logging)
|
||||
*/
|
||||
inline std::ostream& operator<<(std::ostream& os, const GeoPosition& pos)
|
||||
{
|
||||
os << "GeoPosition(lon=" << pos.lon() << ", lat=" << pos.lat() << ", alt=" << pos.z() << ")";
|
||||
return os;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief ostream operator für GeoPosition2D (Debug/Logging)
|
||||
*/
|
||||
inline std::ostream& operator<<(std::ostream& os, const GeoPosition2D& pos)
|
||||
{
|
||||
os << "GeoPosition2D(lon=" << pos.lon() << ", lat=" << pos.lat() << ")";
|
||||
return os;
|
||||
}
|
||||
|
||||
} // namespace Core
|
||||
@@ -3,6 +3,8 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Forward-Declarations
|
||||
|
||||
namespace DDS
|
||||
{
|
||||
namespace Core
|
||||
{
|
||||
namespace Interface
|
||||
@@ -11,3 +13,4 @@ class Dtc;
|
||||
class Ftc;
|
||||
} // namespace Interface
|
||||
} // namespace Core
|
||||
} // namespace DDS
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <QtCore/QString>
|
||||
#include <QString>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
|
||||
@@ -11,8 +11,10 @@
|
||||
#include <memory>
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#if BUILD_RTI
|
||||
#include <rti/core/SampleIdentity.hpp>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
|
||||
namespace FilterManagement
|
||||
{
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#if BUILD_RTI
|
||||
#include <rti/core/SampleIdentity.hpp>
|
||||
#endif
|
||||
|
||||
namespace FilterManagement
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "gna_nasat_aircraft_participant.h"
|
||||
#include <ParticipantManagement/ppm_enums.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QList>
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
~Dtc() override = default;
|
||||
|
||||
// NasatAircraftParticipant-Liste abrufen (Callback-basiert)
|
||||
void nasatAircraftParticipants(const std::function<void(const NasatAircraftParticipant&)>& callback) const {
|
||||
void forEachNasatAircraftParticipant(const std::function<void(const NasatAircraftParticipant&)>& callback) const {
|
||||
for (const auto& nap : m_nasatAircraftParticipants) {
|
||||
callback(nap);
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
}
|
||||
|
||||
// NasatAircraft-Liste abrufen (Callback-basiert)
|
||||
void nasatAircrafts(const std::function<void(const NasatAircraft&)>& callback) const {
|
||||
void forEachNasatAircraft(const std::function<void(const NasatAircraft&)>& callback) const {
|
||||
for (const auto& na : m_nasatAircrafts) {
|
||||
callback(na);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace GuezNasat
|
||||
{
|
||||
|
||||
// STUB: NasatAircraft - wird durch echten DDS-Typ ersetzt
|
||||
struct GNACOMMON_EXPORT NasatAircraft
|
||||
struct NasatAircraft
|
||||
{
|
||||
int idValue = 0;
|
||||
QString nameValue;
|
||||
@@ -24,10 +24,13 @@ struct GNACOMMON_EXPORT NasatAircraft
|
||||
int exerciseId() const { return exerciseIdValue; }
|
||||
int nasatId() const { return nasatIdValue; }
|
||||
bool simulationActive() const { return simulationActiveValue; }
|
||||
|
||||
// Stream operator für Logger
|
||||
friend std::ostream& operator<<(std::ostream& os, const NasatAircraft& aircraft);
|
||||
};
|
||||
|
||||
// STUB: NasatAircraftParticipant - wird durch echten DDS-Typ ersetzt
|
||||
struct GNACOMMON_EXPORT NasatAircraftParticipant
|
||||
struct NasatAircraftParticipant
|
||||
{
|
||||
int idValue = 0;
|
||||
int nasatAircraftIdValue = 0;
|
||||
@@ -39,13 +42,17 @@ struct GNACOMMON_EXPORT NasatAircraftParticipant
|
||||
int nasatAircraftId() const { return nasatAircraftIdValue; }
|
||||
int exerciseId() const { return exerciseIdValue; }
|
||||
int participantId() const { return participantIdValue; }
|
||||
|
||||
// Stream operator für Logger
|
||||
friend std::ostream& operator<<(std::ostream& os, const NasatAircraftParticipant& participant);
|
||||
};
|
||||
|
||||
} // namespace GuezNasat
|
||||
|
||||
// Stream-Operatoren für Logger-Unterstützung
|
||||
#include <ostream>
|
||||
inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft& aircraft)
|
||||
// Stream-Operator Implementierung
|
||||
namespace GuezNasat
|
||||
{
|
||||
inline std::ostream& operator<<(std::ostream& os, const NasatAircraft& aircraft)
|
||||
{
|
||||
os << "NasatAircraft{id=" << aircraft.id() << ", name=" << aircraft.name().toStdString()
|
||||
<< ", exerciseId=" << aircraft.exerciseId() << ", nasatId=" << aircraft.nasatId()
|
||||
@@ -53,11 +60,12 @@ inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft
|
||||
return os;
|
||||
}
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraftParticipant& participant)
|
||||
inline std::ostream& operator<<(std::ostream& os, const NasatAircraftParticipant& participant)
|
||||
{
|
||||
os << "NasatAircraftParticipant{id=" << participant.id()
|
||||
<< ", nasatAircraftId=" << participant.nasatAircraftId()
|
||||
<< ", exerciseId=" << participant.exerciseId()
|
||||
<< ", participantId=" << participant.participantId() << "}";
|
||||
return os;
|
||||
}
|
||||
}
|
||||
} // namespace GuezNasat
|
||||
@@ -3,6 +3,7 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Forward-Declarations
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <string>
|
||||
|
||||
namespace OperatorManagement
|
||||
|
||||
Reference in new issue
Block a user