LtsSession: STUB-Unterstützung und Build-Fixes

- lts_session_data_dds.h/cpp: BUILD_RTI guards für STUB/Real-Implementation
- Include-Pfad fix: DDS/QosProfile/DDS_DefaultQos (ohne .h)
- CMakeLists.txt: qtservice_export.h Includer Pfad korrigiert
- AdvancedSymbology/Data: Qt6 Core5Compat Verlinkung

RTI License: ~/swy/sandbox/rti_license.dat (leer, vom Installer)
ArcGIS SDK: ./external/ArcGIS/MapsSDK_Qt_300.0.0/

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-21 01:49:35 +02:00
1 parent 05095c6813
commit e22dd98040
6 files changed
+253 -69

No files matched your search

@@ -10,14 +10,28 @@
#pragma once
#ifdef BUILD_RTI
#include <QObject>
#include <QMap>
#include <QUrl>
#include <QStringList>
#include <QUrl>
#include <memory>
#include <QMap>
// Export macro for shared library
#include "ltssessiondatadds_export.h"
#ifdef BUILD_RTI
#include <dds/domain/DomainParticipant.hpp>
namespace DDSConnector { class DdsConnector; }
namespace DTC { template<typename T> class GenericDTCImpl; }
namespace Core { struct PartitionTime; }
namespace NGL { class INGLLogger; }
class Fetcher;
#else
// Forward declarations for stub types
namespace DataPluginBase { struct Interface; }
#endif
namespace LtsSession
{
@@ -25,7 +39,10 @@ namespace LtsSession
enum class PartitionType {
Any = 0,
Exercise,
Replay
Replay,
AllExercises,
Global,
Invalid = -1
};
struct DdsConnectionParams
@@ -69,37 +86,91 @@ struct DdsConnectionParams
return partitionType < o.partitionType;
return tcpConnectionUrl.toString() < o.tcpConnectionUrl.toString();
}
#ifdef BUILD_RTI
bool hasSameDomainParams(const DdsConnectionParams& o) const
{
return domainId == o.domainId && partitionType == o.partitionType;
}
#endif
};
// Stub base class - inherits QObject for compatibility
class LtsSessionDataDds : public QObject
// Base class for session DDS data - always compiled, but RTI functionality guarded
class LTSSESSIONDATADDS_EXPORT LtsSessionDataDds : public QObject
{
Q_OBJECT
protected:
explicit LtsSessionDataDds(QObject* parent = nullptr) : QObject(parent) {}
public:
~LtsSessionDataDds() = default;
explicit LtsSessionDataDds(QObject* parent = nullptr);
~LtsSessionDataDds();
int domainId() const { return -1; }
int exerciseId() const { return 0; }
int partitionId() const { return 0; }
QStringList qosFile() const { return QStringList(); }
PartitionType partitionType() const { return PartitionType::Any; }
static QString partitionTypeString(PartitionType partitionType) { return QString::number(static_cast<int>(partitionType)); }
// Initialization
#ifdef BUILD_RTI
bool init(const DdsConnectionParams& connParams);
bool init(const dds::domain::DomainParticipant& dp, const DdsConnectionParams& connParams);
Fetcher* fetcher(const QString& yourPluginsName);
#else
virtual bool init(const DdsConnectionParams& connParams);
virtual bool init(const void* dp, const DdsConnectionParams& connParams);
virtual void* fetcher(const QString& yourPluginsName);
#endif
bool isExercisePartition() const { return false; }
bool isReplayPartition() const { return false; }
// Accessors
int domainId() const;
int exerciseId() const;
int partitionId() const;
PartitionType partitionType() const;
static QString partitionTypeString(PartitionType partitionType);
QStringList qosFile() const;
QUrl tcpConnectionUrl() const;
DdsConnectionParams connParams() const;
QString toString() const { return QStringLiteral("LtsSessionDataDds(stub)"); }
bool isExercisePartition() const { return partitionType() == PartitionType::Exercise; }
bool isReplayPartition() const { return partitionType() == PartitionType::Replay; }
qint64 partitionTime() const { return 0; }
QString toString() const;
signals:
qint64 partitionTime() const { return m_emittedTime; }
// Data plugin interfaces
#ifdef BUILD_RTI
QMap<QString, std::shared_ptr<DataPluginBase::Interface>> availableDataPluginInterfaces() const;
void addAvailablaeDataPluginInterfaces(const QMap<QString, std::shared_ptr<DataPluginBase::Interface>>& dataPlugins);
#else
// Stub returns empty map - void* doesn't work well in QMap template
QMap<QString, void*> availableDataPluginInterfaces() const { return QMap<QString, void*>(); }
void addAvailablaeDataPluginInterfaces(const QMap<QString, void*>& /*dataPlugins*/) {}
#endif
signals:
void partitionTimeChanged(qint64 newPartitionTime);
void partitionTimeChangedInternal();
protected:
#ifdef BUILD_RTI
bool initInternal();
void onPartitionTimeChangedInternal();
// Member variables - only with RTI
int m_exerciseId;
qint64 m_emittedTime;
qint64 m_curMSecSinceEpoch;
bool m_active;
Fetcher* m_fetcher;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnectorGlobal;
std::shared_ptr<DTC::GenericDTCImpl<Core::PartitionTime>> m_dtcPartitionTime;
NGL::INGLLogger& m_logger;
#else
// Stub implementation - minimal members
bool initInternal();
void onPartitionTimeChangedInternal();
int m_exerciseId;
qint64 m_emittedTime;
qint64 m_curMSecSinceEpoch;
bool m_active;
void* m_fetcher;
#endif
};
} // namespace LtsSession
#endif // BUILD_RTI