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,79 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* Subscriber (DataSampleReceiver)
|
||||
* Uses DDTCs to subscribe to data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#include "subscriber.h"
|
||||
#include "telegrammodel.h"
|
||||
|
||||
namespace DdsView
|
||||
{
|
||||
|
||||
Subscriber::Subscriber(const dds::domain::DomainParticipant &domainParticipant,
|
||||
const std::string &partition,
|
||||
TelegramModel *tm)
|
||||
: DDSConnector::Subscriber(domainParticipant, partition)
|
||||
, m_telegramModel(tm)
|
||||
, m_logger(DdsView::getLogger("Subscriber"))
|
||||
{}
|
||||
|
||||
Subscriber::~Subscriber()
|
||||
{
|
||||
qDeleteAll(m_ddtcMap);
|
||||
m_ddtcMap.clear();
|
||||
}
|
||||
|
||||
void Subscriber::processData(const dds::core::xtypes::DynamicData &data, const QString &topicName, DataModification modType)
|
||||
{
|
||||
m_telegramModel->processData(data, topicName, modType);
|
||||
}
|
||||
|
||||
bool Subscriber::initDDTCs(const QVector<DDSGeneric::TopicDescription> &vDro)
|
||||
{
|
||||
// TODO: remove old droEntries
|
||||
|
||||
QMap<std::string, ddtc *> newTopics;
|
||||
|
||||
for (const DDSGeneric::TopicDescription &ti : vDro)
|
||||
{
|
||||
auto it = m_ddtcMap.find(ti.name);
|
||||
if (it != m_ddtcMap.end())
|
||||
{
|
||||
// already there
|
||||
newTopics.insert(it.key(), it.value());
|
||||
m_ddtcMap.erase(it);
|
||||
continue;
|
||||
}
|
||||
|
||||
DTC::Ddtc<DDSGeneric::DynamicDataReader> *ddtc = this->create(
|
||||
[this](const dds::core::xtypes::DynamicData & data, const std::string & topicName, DataModification modType)
|
||||
{ processData(data, QString::fromStdString(topicName), modType); },
|
||||
ti.type,
|
||||
nullptr /* Use SubscriberListener from DdsConnector */,
|
||||
ti.name
|
||||
);
|
||||
if (ddtc == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can't create ddtc for Topic (" << ti.name << "), TypeName (" << ti.typeName << ")";
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ddtc->hasSamples())
|
||||
{
|
||||
for (const auto &data : ddtc->readAlive())
|
||||
processData(data.data(), QString::fromStdString(ti.name), DataModification::eAdded);
|
||||
}
|
||||
newTopics.insert(ti.name, ddtc);
|
||||
}
|
||||
qDeleteAll(m_ddtcMap);
|
||||
m_ddtcMap = newTopics;
|
||||
|
||||
return true;
|
||||
} // end initDDTCs()
|
||||
|
||||
} // Namespace DdsView
|
||||
Reference in new issue
Block a user