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:
6 files changed
+253
-69
No files matched your search
@@ -8,13 +8,12 @@
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-02-27
|
||||
*/
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
|
||||
#include "lts_session_data_dds.h"
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/DTC/generic_dtc_impl.h>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QDebug>
|
||||
#include <QSet>
|
||||
@@ -245,19 +244,19 @@ bool LtsSessionDataDds::init(const dds::domain::DomainParticipant& dp, const Dds
|
||||
m_qosFileList.clear();
|
||||
|
||||
#ifdef WIN_32
|
||||
DDS::QosProfile::ConnectionType type = DDS::QosProfile::ConnectionType::Tablet;
|
||||
DDS::QosProfile::ConnectionType type = DDS::QosProfile::ConnectionType::Tablet;
|
||||
#else
|
||||
DDS::QosProfile::ConnectionType type = DDS::QosProfile::ConnectionType::Client;
|
||||
DDS::QosProfile::ConnectionType type = DDS::QosProfile::ConnectionType::Client;
|
||||
#endif
|
||||
|
||||
if (m_ddsConnector == nullptr)
|
||||
{
|
||||
m_ddsConnector =
|
||||
std::make_shared<DDSConnector::DdsConnector>(dp, connParams.partitionType, type, connParams.partitionId);
|
||||
if (m_ddsConnector == nullptr)
|
||||
{
|
||||
m_ddsConnector =
|
||||
std::make_shared<DDSConnector::DdsConnector>(dp, connParams.partitionType, type, connParams.partitionId);
|
||||
|
||||
s_ddsConnections()->insertConnection(connParams, m_ddsConnector);
|
||||
}
|
||||
return initInternal();
|
||||
s_ddsConnections()->insertConnection(connParams, m_ddsConnector);
|
||||
}
|
||||
return initInternal();
|
||||
}
|
||||
|
||||
Fetcher* LtsSessionDataDds::fetcher(const QString& yourPluginsName)
|
||||
@@ -268,19 +267,19 @@ Fetcher* LtsSessionDataDds::fetcher(const QString& yourPluginsName)
|
||||
return m_fetcher;
|
||||
}
|
||||
|
||||
QString LtsSessionDataDds::partitionTypeString(IDL::PartitionType partitionType)
|
||||
QString LtsSessionDataDds::partitionTypeString(PartitionType partitionType)
|
||||
{
|
||||
switch (partitionType)
|
||||
{
|
||||
case IDL::PartitionType::AllExercises:
|
||||
case PartitionType::AllExercises:
|
||||
return QStringLiteral("AllExercises");
|
||||
case IDL::PartitionType::Any:
|
||||
case PartitionType::Any:
|
||||
return QStringLiteral("Any");
|
||||
case IDL::PartitionType::Exercise:
|
||||
case PartitionType::Exercise:
|
||||
return QStringLiteral("Exercise");
|
||||
case IDL::PartitionType::Global:
|
||||
case PartitionType::Global:
|
||||
return QStringLiteral("Global");
|
||||
case IDL::PartitionType::Replay:
|
||||
case PartitionType::Replay:
|
||||
return QStringLiteral("Replay");
|
||||
}
|
||||
|
||||
@@ -312,9 +311,9 @@ int LtsSessionDataDds::partitionId() const
|
||||
return m_ddsConnector ? m_ddsConnector->getPartitionId() : -1;
|
||||
}
|
||||
|
||||
IDL::PartitionType LtsSessionDataDds::partitionType() const
|
||||
PartitionType LtsSessionDataDds::partitionType() const
|
||||
{
|
||||
return m_ddsConnector ? m_ddsConnector->getPartitionType() : IDL::PartitionType::Global;
|
||||
return m_ddsConnector ? m_ddsConnector->getPartitionType() : PartitionType::Global;
|
||||
}
|
||||
|
||||
QStringList LtsSessionDataDds::qosFile() const
|
||||
@@ -388,4 +387,90 @@ void LtsSessionDataDds::addAvailablaeDataPluginInterfaces(
|
||||
|
||||
} // namespace LtsSession
|
||||
|
||||
#endif // BUILD_RTI
|
||||
#else // !BUILD_RTI - Stub implementation for non-RTI builds
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
|
||||
LtsSessionDataDds::LtsSessionDataDds(QObject* parent)
|
||||
: QObject(parent), m_exerciseId(-1), m_emittedTime(0), m_curMSecSinceEpoch(0), m_active(true), m_fetcher(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
LtsSessionDataDds::~LtsSessionDataDds()
|
||||
{
|
||||
// m_fetcher is void* in stub mode, no deletion needed
|
||||
}
|
||||
|
||||
bool LtsSessionDataDds::init(const DdsConnectionParams& /*connParams*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool LtsSessionDataDds::init(const void* /*dp*/, const DdsConnectionParams& /*connParams*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void* LtsSessionDataDds::fetcher(const QString& /*yourPluginsName*/)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
QString LtsSessionDataDds::partitionTypeString(PartitionType /*partitionType*/)
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
|
||||
QString LtsSessionDataDds::toString() const
|
||||
{
|
||||
return QStringLiteral("(LtsSessionDataDds: STUB - no RTI support)");
|
||||
}
|
||||
|
||||
int LtsSessionDataDds::domainId() const
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
int LtsSessionDataDds::exerciseId() const
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
int LtsSessionDataDds::partitionId() const
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
PartitionType LtsSessionDataDds::partitionType() const
|
||||
{
|
||||
return PartitionType::Global;
|
||||
}
|
||||
|
||||
QStringList LtsSessionDataDds::qosFile() const
|
||||
{
|
||||
return QStringList();
|
||||
}
|
||||
|
||||
QUrl LtsSessionDataDds::tcpConnectionUrl() const
|
||||
{
|
||||
return QUrl();
|
||||
}
|
||||
|
||||
DdsConnectionParams LtsSessionDataDds::connParams() const
|
||||
{
|
||||
return DdsConnectionParams();
|
||||
}
|
||||
|
||||
bool LtsSessionDataDds::initInternal()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void LtsSessionDataDds::onPartitionTimeChangedInternal()
|
||||
{
|
||||
}
|
||||
|
||||
} // namespace LtsSession
|
||||
|
||||
#endif // BUILD_RTI
|
||||
Reference in new issue
Block a user