Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -51,7 +51,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
Qt6::Network
|
||||
LtsMultiMonitor
|
||||
LtsSessionData
|
||||
ddsconnector
|
||||
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
|
||||
LtsNotification
|
||||
svcCoreClient # Core Ftc - for TLH
|
||||
@@ -67,6 +66,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
LtsSessionDataDds
|
||||
)
|
||||
|
||||
@@ -699,6 +699,7 @@ void LtsSession::slotStapleTopicLockHandler(LtsWidgets::LtsDialog *widget)
|
||||
}
|
||||
widget->setProperty("topicLockStapled", true);
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
connectOnlineHelpButton(widget);
|
||||
if (m_coreFtc == nullptr)
|
||||
{
|
||||
@@ -736,6 +737,10 @@ void LtsSession::slotStapleTopicLockHandler(LtsWidgets::LtsDialog *widget)
|
||||
|
||||
|
||||
connectOnlineHelpButton(widget);
|
||||
#else
|
||||
Q_UNUSED(widget)
|
||||
DEBUG_LOG(m_logger) << "BUILD_RTI=OFF, skipping TopicLockHandler setup";
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <DDS/Core/core_ftc.h>
|
||||
@@ -104,3 +106,9 @@ private:
|
||||
|
||||
|
||||
} // namespace LtsSession
|
||||
|
||||
#else // BUILD_RTI
|
||||
|
||||
#include "lts_session_lock_handler_stub.h"
|
||||
|
||||
#endif // BUILD_RTI
|
||||
@@ -0,0 +1,81 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Stub header for lts_session_lock_handler.h when BUILD_RTI=OFF
|
||||
* Provides minimal declarations to allow compilation without RTI Connext DDS
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
#include <QPointer>
|
||||
#include <memory>
|
||||
#include <QObject>
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
|
||||
// Stub TopicLockHandler class - minimal version without DDS functionality
|
||||
class LTSSESSION_EXPORT TopicLockHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit TopicLockHandler(QObject *parent = nullptr) : QObject(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler"))
|
||||
{}
|
||||
~TopicLockHandler() override = default;
|
||||
|
||||
bool init(const void * /*coreFtc*/, int /*exerciseId*/) { return false; }
|
||||
|
||||
bool isLocked() const { return false; }
|
||||
LtsWidgets::TopicInfo getTopicInfo() const { return LtsWidgets::TopicInfo(); }
|
||||
|
||||
public slots:
|
||||
void slotTryLock(const LtsWidgets::TopicInfo & /*topicInfo*/) {}
|
||||
bool slotUnlock() { return false; }
|
||||
void slotFinalize() { deleteLater(); }
|
||||
|
||||
signals:
|
||||
void signalLockDialog(const QString & /*lockedBy*/) {}
|
||||
void signalUnlockDialog() {}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
class LTSSESSION_EXPORT TopicLockHanderData : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit TopicLockHanderData(QObject *parent = nullptr) : QObject(parent) {}
|
||||
~TopicLockHanderData() override = default;
|
||||
|
||||
void init(const void * /*coreFtc*/, int /*exerciseId*/) {}
|
||||
|
||||
void unlock() {}
|
||||
void slotTryLock(const LtsWidgets::TopicInfo & /*topicInfo*/) {}
|
||||
bool isLocked() const { return false; }
|
||||
LtsWidgets::TopicInfo getTopicInfo() const { return LtsWidgets::TopicInfo(); }
|
||||
const QString &getLockedBy() const { return m_lockedBy; }
|
||||
|
||||
Q_SIGNALS:
|
||||
void lockDataChanged();
|
||||
|
||||
private Q_SLOTS:
|
||||
void slotLock(const QString & /*lockedBy*/) {}
|
||||
void slotUnlock() {}
|
||||
|
||||
public:
|
||||
QString m_debugName;
|
||||
private:
|
||||
QPointer<TopicLockHandler> m_topicLockHandler;
|
||||
QString m_lockedBy;
|
||||
};
|
||||
|
||||
|
||||
} // namespace LtsSession
|
||||
@@ -19,7 +19,9 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#ifdef BUILD_RTI
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
Reference in new issue
Block a user