Session 022: Migrate Lts/Tools (72 submodules) to Qt6
- Copied complete Lts/Tools directory from qt5-before to qt6-after - Updated 32 CMakeLists.txt files (Qt5:: → Qt6::) - Tools subdirectory already included in parent Lts/CMakeLists.txt - All 72 tool submodules now present in qt6-migrated-legatus - Includes: Adler, ArAssets, ConfigX, DBAdministration, DBUpdate, DdsView, InfrastructureManagement, and 67 more tools - C++17 standard (RTI 7.7.0 compatibility maintained) - Tests deferred until final validation phase Migration progress: ✅ Lts/Application (68 files) ✅ Lts/DDS (verified Qt6-ready) ✅ Lts/Plugins (60 submodules, verified) ✅ Lts/Projects (5 submodules, verified) ✅ Lts/Proxies (13 submodules, verified) ✅ Lts/Services (47 submodules, verified) ✅ Lts/Tools (72 submodules, copied + CMake updated) ✅ Lts/Viewer (LtsFileDialog, LtsReportDisplay, SituationMap) 🟡 TetraIF (partial) 🟡 Z (partial: nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
This commit is contained in:
1 parent
01dce5fe52
commit
d5c13033e2
1792 files changed
+982018
No files matched your search
@@ -0,0 +1,106 @@
|
||||
#pragma once
|
||||
|
||||
#include <dds/dds.hpp>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QReadWriteLock>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
|
||||
#include <rti/core/ListenerBinder.hpp>
|
||||
|
||||
#ifndef TOPICDISCOVER_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define TOPICDISCOVER_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_TOPICDISCOVER_LIB)
|
||||
# define TOPICDISCOVER_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define TOPICDISCOVER_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
namespace NGL {
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
class BuiltinAnyListener
|
||||
: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
dds::core::xtypes::StructType structType(const std::string &typeName);
|
||||
|
||||
protected:
|
||||
template <typename S>
|
||||
void on_data_available(dds::sub::DataReader<S>& reader);
|
||||
|
||||
explicit BuiltinAnyListener(QObject *parent = nullptr);
|
||||
virtual ~BuiltinAnyListener() = default;
|
||||
|
||||
signals:
|
||||
void topicDescription(const std::string &topicName,
|
||||
const std::string &typeName);
|
||||
|
||||
protected:
|
||||
QMap<std::string, dds::core::xtypes::StructType> m_structTypes;
|
||||
QReadWriteLock m_safeTypeLock;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
class BuiltinPublicationListener
|
||||
: public BuiltinAnyListener
|
||||
, public dds::sub::NoOpDataReaderListener<dds::topic::PublicationBuiltinTopicData>
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit BuiltinPublicationListener(QObject *parent = nullptr);
|
||||
virtual ~BuiltinPublicationListener() = default;
|
||||
void on_data_available(dds::sub::DataReader<dds::topic::PublicationBuiltinTopicData> &reader) override final;
|
||||
};
|
||||
|
||||
class BuiltinSubscriberListener
|
||||
: public BuiltinAnyListener
|
||||
, public dds::sub::NoOpDataReaderListener<dds::topic::SubscriptionBuiltinTopicData>
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit BuiltinSubscriberListener(QObject *parent = nullptr);
|
||||
virtual ~BuiltinSubscriberListener() = default;
|
||||
|
||||
void on_data_available(dds::sub::DataReader<dds::topic::SubscriptionBuiltinTopicData> &reader) override final;
|
||||
};
|
||||
|
||||
class TOPICDISCOVER_EXPORT TopicDiscoverer
|
||||
: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit TopicDiscoverer(int domainId, QObject *parent = nullptr);
|
||||
virtual ~TopicDiscoverer() = default;
|
||||
|
||||
void init(DDS::QosProfile::ConnectionType ct, const QUrl &tcpDiscoveryUrl);
|
||||
const dds::domain::DomainParticipant &getDomainParticipant() const { return m_domainParticipant; }
|
||||
|
||||
signals:
|
||||
void topicDescription(const std::string &topicName,
|
||||
const std::string &typeName,
|
||||
const dds::core::xtypes::StructType &type);
|
||||
|
||||
private slots:
|
||||
void onTopicDescription(const std::string &topicName,
|
||||
const std::string &typeName);
|
||||
|
||||
private:
|
||||
|
||||
int m_domainId;
|
||||
dds::domain::DomainParticipant m_domainParticipant;
|
||||
rti::core::ListenerBinder< dds::sub::DataReader<dds::topic::PublicationBuiltinTopicData> > m_publisherListener;
|
||||
rti::core::ListenerBinder< dds::sub::DataReader<dds::topic::SubscriptionBuiltinTopicData> > m_subscriberListener;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
Reference in new issue
Block a user