torstenandCopilot
ad07345480
- Changed {{ namespace }}::{{ dt.type }} to ::{{ namespace }}::{{ dt.type }}
in svc_dtc.h.grantlee, svc_dtc_impl.cpp.grantlee, svc_dtc_impl.h.grantlee
- Ensures absolute namespace resolution for Core::* types
- Fixes MOC/compilation errors for CurrentRunningState, LockedEntity, etc.
- Updated CMakeLists.txt for RTI 7.7.0 detection with DDS_PATH
- Fixed RTI include paths (ndds/hpp and ndds directories)
- Updated Lts/DDS module files for Qt6/RTI 7.7 compatibility
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
82 lines
2.0 KiB
C++
82 lines
2.0 KiB
C++
|
|
|
|
#pragma once
|
|
|
|
#include "svccoreclient_export.h"
|
|
|
|
#include <QtCore/QObject>
|
|
#include <QtCore/QThread>
|
|
|
|
// Forward declarations for moc compatibility (moc doesn't see BUILD_RTI guards)
|
|
namespace Core { enum class RunningState; enum class PortType; }
|
|
namespace DTS { class CurrentRunningStateImpl; }
|
|
|
|
#if BUILD_RTI
|
|
#include <dds/core/core_dts_types.h>
|
|
#include <dds/core/types/CurrentRunningState.h>
|
|
#endif
|
|
|
|
namespace DDSConnector
|
|
{
|
|
class DdsConnector;
|
|
}
|
|
class QTimer;
|
|
|
|
namespace NGL
|
|
{
|
|
class INGLLogger;
|
|
}
|
|
|
|
namespace Core
|
|
{
|
|
class CORE_CLIENT_EXPORT Pacemaker final : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
#if BUILD_RTI
|
|
explicit Pacemaker(const std::shared_ptr<DDSConnector::DdsConnector>& ddsConnector) : Pacemaker(ddsConnector.get())
|
|
{
|
|
}
|
|
|
|
explicit Pacemaker(DDSConnector::DdsConnector* ddsConnector);
|
|
#else
|
|
explicit Pacemaker(void* /*ddsConnector*/) {}
|
|
explicit Pacemaker() {}
|
|
#endif
|
|
~Pacemaker();
|
|
|
|
#if BUILD_RTI
|
|
void startTimer();
|
|
#endif
|
|
|
|
public Q_SLOTS:
|
|
#if BUILD_RTI
|
|
void setNewState(Core::RunningState newState, const QString& errorString = QString());
|
|
void addPort(unsigned short number, Core::PortType portType, const QString& properties = QStringLiteral(""));
|
|
|
|
void publishState();
|
|
#endif
|
|
|
|
private:
|
|
#if BUILD_RTI
|
|
NGL::INGLLogger& m_logger;
|
|
void init(DDSConnector::DdsConnector* ddsConnector);
|
|
void setNewStateInternal(Core::RunningState newState, const QString& errorString = QString());
|
|
void addPortInternal(unsigned short number, Core::PortType portType,
|
|
const QString& properties = QStringLiteral(""));
|
|
|
|
CurrentRunningState m_state;
|
|
DTS::CurrentRunningStateImpl* m_dtsCurrentRunningState = nullptr;
|
|
#else
|
|
void* m_reserved1 = nullptr;
|
|
void* m_reserved2 = nullptr;
|
|
void* m_reserved3 = nullptr;
|
|
void* m_reserved4 = nullptr;
|
|
void* m_reserved5 = nullptr;
|
|
#endif
|
|
static constexpr const int m_publishTimerDelay = 3000;
|
|
QTimer* m_publishTimer = nullptr;
|
|
QThread* m_paceThread = nullptr;
|
|
};
|
|
} // namespace Core
|