Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
256 files changed
+1170
-610
No files matched your search
+19
-3
@@ -48,9 +48,17 @@ ENDIF()
|
||||
IF(BUILD_RTI)
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
ENDIF()
|
||||
# generate ism_[d|f]tc.h
|
||||
IF(BUILD_RTI)
|
||||
# Generate ism_[d|f]tc.h
|
||||
IF(BUILD_GRANTLEE)
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
ELSEIF(BUILD_RTI)
|
||||
# Use pre-generated files when BUILD_GRANTLEE=OFF
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h COPYONLY)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_ftc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h COPYONLY)
|
||||
LIST(APPEND SRCS_common
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common})
|
||||
@@ -83,8 +91,16 @@ SET(SRCS_client
|
||||
parse_building_xml.h
|
||||
)
|
||||
# generate ism_[d|f]tc_impl.[cpp|h]
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_GRANTLEE)
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
ELSEIF(BUILD_RTI)
|
||||
# Use pre-generated files when BUILD_GRANTLEE=OFF
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.cpp ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp COPYONLY)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h COPYONLY)
|
||||
LIST(APPEND SRCS_client
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client})
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <Core/pacemaker.h>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <Core/topic_lock_master.h>
|
||||
#include <InfrastructureManagement/ism_dts.h>
|
||||
#include <InfrastructureManagement/ism_fts.h>
|
||||
#include "logger.h"
|
||||
|
||||
@@ -10,8 +10,16 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QMap>
|
||||
#include "ism_enums.hpp"
|
||||
#include "ParticipantManagement/ppm_enums.hpp"
|
||||
|
||||
// Using-declaration for DataModification
|
||||
using DataModification = ParticipantManagement::DataModification;
|
||||
|
||||
namespace InfrastructureManagement {
|
||||
|
||||
@@ -53,7 +61,7 @@ private:
|
||||
// StructureElement Stub-Klasse
|
||||
class StructureElement {
|
||||
public:
|
||||
StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined) {}
|
||||
StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined), mountingPointId_(0) {}
|
||||
|
||||
int32_t id() const { return id_; }
|
||||
void id(int32_t v) { id_ = v; }
|
||||
@@ -64,6 +72,14 @@ public:
|
||||
MountingPointType mountingPointTypeId() const { return mountingPointTypeId_; }
|
||||
void mountingPointTypeId(MountingPointType v) { mountingPointTypeId_ = v; }
|
||||
|
||||
// Für Kompatibilität: structureElementTypeId() als Alias
|
||||
MountingPointType structureElementTypeId() const { return mountingPointTypeId_; }
|
||||
void structureElementTypeId(MountingPointType v) { mountingPointTypeId_ = v; }
|
||||
|
||||
// mountingPointId() für Sub-ID
|
||||
int32_t mountingPointId() const { return mountingPointId_; }
|
||||
void mountingPointId(int32_t v) { mountingPointId_ = v; }
|
||||
|
||||
Core::GeoPosition geoPosition() const { return geoPosition_; }
|
||||
void geoPosition(const Core::GeoPosition& v) { geoPosition_ = v; }
|
||||
|
||||
@@ -79,17 +95,138 @@ public:
|
||||
std::string displayName() const { return displayName_; }
|
||||
void displayName(const std::string& v) { displayName_ = v; }
|
||||
|
||||
// path() returns vector of IDs im Hierarchie-Pfad
|
||||
const std::vector<int32_t>& path() const { return path_; }
|
||||
void path(const std::vector<int32_t>& v) { path_ = v; }
|
||||
|
||||
private:
|
||||
int32_t id_;
|
||||
int32_t mainStructureElementId_;
|
||||
MountingPointType mountingPointTypeId_;
|
||||
int32_t mountingPointId_;
|
||||
Core::GeoPosition geoPosition_;
|
||||
Core::RelativePosition relPosition_;
|
||||
std::string properties_;
|
||||
std::string name_;
|
||||
std::string displayName_;
|
||||
std::vector<int32_t> path_;
|
||||
};
|
||||
|
||||
// MainStructureElement - Stub für DDS-generierten Typ
|
||||
class MainStructureElement {
|
||||
public:
|
||||
MainStructureElement() : id_(0), groupId_(0) {}
|
||||
|
||||
int32_t id() const { return id_; }
|
||||
void id(int32_t v) { id_ = v; }
|
||||
|
||||
int32_t groupId() const { return groupId_; }
|
||||
void groupId(int32_t v) { groupId_ = v; }
|
||||
|
||||
std::string name() const { return name_; }
|
||||
void name(const std::string& v) { name_ = v; }
|
||||
|
||||
std::string displayName() const { return displayName_; }
|
||||
void displayName(const std::string& v) { displayName_ = v; }
|
||||
|
||||
Core::GeoPosition geoPosition() const { return geoPosition_; }
|
||||
void geoPosition(const Core::GeoPosition& v) { geoPosition_ = v; }
|
||||
|
||||
// For compatibility: elements() returns empty vector by default
|
||||
const std::vector<StructureElement>& elements() const { return elements_; }
|
||||
void elements(const std::vector<StructureElement>& v) { elements_ = v; }
|
||||
|
||||
private:
|
||||
int32_t id_;
|
||||
int32_t groupId_;
|
||||
std::string name_;
|
||||
std::string displayName_;
|
||||
Core::GeoPosition geoPosition_;
|
||||
std::vector<StructureElement> elements_;
|
||||
};
|
||||
|
||||
// MountingPointAsset - Stub für DDS-generierten Typ
|
||||
class MountingPointAsset {
|
||||
public:
|
||||
MountingPointAsset() : id_(0), mountingPointId_(0), assetId_(0) {}
|
||||
|
||||
int32_t id() const { return id_; }
|
||||
void id(int32_t v) { id_ = v; }
|
||||
|
||||
int32_t mountingPointId() const { return mountingPointId_; }
|
||||
void mountingPointId(int32_t v) { mountingPointId_ = v; }
|
||||
|
||||
int32_t assetId() const { return assetId_; }
|
||||
void assetId(int32_t v) { assetId_ = v; }
|
||||
|
||||
std::string name() const { return name_; }
|
||||
void name(const std::string& v) { name_ = v; }
|
||||
|
||||
// For compatibility: structureElementId() alias for mountingPointId()
|
||||
int32_t structureElementId() const { return mountingPointId_; }
|
||||
void structureElementId(int32_t v) { mountingPointId_ = v; }
|
||||
|
||||
private:
|
||||
int32_t id_;
|
||||
int32_t mountingPointId_;
|
||||
int32_t assetId_;
|
||||
std::string name_;
|
||||
};
|
||||
|
||||
// Forward declaration - full definition in ism_mounting_point.h
|
||||
class MountingPoint;
|
||||
|
||||
// FootprintElement - für Footprint-Daten
|
||||
class FootprintElement {
|
||||
public:
|
||||
FootprintElement() : isGroundLevel_(false) {}
|
||||
|
||||
bool isGroundLevel() const { return isGroundLevel_; }
|
||||
void isGroundLevel(bool v) { isGroundLevel_ = v; }
|
||||
|
||||
Core::RelativePosition relPosition() const { return relPosition_; }
|
||||
void relPosition(const Core::RelativePosition& v) { relPosition_ = v; }
|
||||
|
||||
private:
|
||||
bool isGroundLevel_;
|
||||
Core::RelativePosition relPosition_;
|
||||
};
|
||||
|
||||
// MainFootprint - Footprint-Daten für MainStructureElement
|
||||
class MainFootprint {
|
||||
public:
|
||||
MainFootprint() : id_(0) {}
|
||||
|
||||
int32_t id() const { return id_; }
|
||||
void id(int32_t v) { id_ = v; }
|
||||
|
||||
const std::vector<FootprintElement>& elements() const { return elements_; }
|
||||
void elements(const std::vector<FootprintElement>& v) { elements_ = v; }
|
||||
|
||||
private:
|
||||
int32_t id_;
|
||||
std::vector<FootprintElement> elements_;
|
||||
};
|
||||
|
||||
// InstrumentationAsset - Stub für DDS-generierten Typ
|
||||
class InstrumentationAsset {
|
||||
public:
|
||||
InstrumentationAsset() : id_(0) {}
|
||||
|
||||
int32_t id() const { return id_; }
|
||||
void id(int32_t v) { id_ = v; }
|
||||
|
||||
std::string name() const { return name_; }
|
||||
void name(const std::string& v) { name_ = v; }
|
||||
|
||||
private:
|
||||
int32_t id_;
|
||||
std::string name_;
|
||||
};
|
||||
|
||||
// StructureElementType Enum (Alias für MountingPointType für Kompatibilität)
|
||||
using StructureElementType = MountingPointType;
|
||||
|
||||
} // namespace InfrastructureManagement
|
||||
|
||||
#endif // ISM_HPP
|
||||
@@ -1,10 +1,36 @@
|
||||
|
||||
#pragma once
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
namespace InfrastructureManagement {
|
||||
struct FtcData {
|
||||
std::string name;
|
||||
uint32_t id;
|
||||
};
|
||||
}
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsftc generiert
|
||||
// Für die Migration erstellen wir minimale Implementierungen
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include "ism.hpp"
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
|
||||
// Ftc - Function Transfer Component
|
||||
class Ftc : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Ftc(QObject* parent = nullptr) : QObject(parent) {}
|
||||
~Ftc() override = default;
|
||||
|
||||
// MainStructureElement operations
|
||||
virtual void setMainStructureElement(const MainStructureElement& data) = 0;
|
||||
virtual void removeMainStructureElement(int32_t id) = 0;
|
||||
|
||||
// MainSchedule operations
|
||||
virtual void setMainSchedule(const MainSchedule& data) = 0;
|
||||
virtual void removeMainSchedule(int32_t id) = 0;
|
||||
|
||||
// MountingPointAsset operations
|
||||
virtual void setMountingPointAsset(const MountingPointAsset& data) = 0;
|
||||
virtual void removeMountingPointAsset(int32_t id) = 0;
|
||||
};
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace InfrastructureManagement
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include "settings.h"
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <Core/pacemaker.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <QtCore/QMap>
|
||||
#include <QJsonArray>
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
#include <InfrastructureManagement/object_main_structure_element.h>
|
||||
|
||||
Reference in new issue
Block a user