Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,141 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* main (TopicDataGenerator)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include "initialisation.h"
|
||||
|
||||
#include <DDS/Generic/generic_base.h>
|
||||
#include <DDS/Generic/topic_type_plugin.h>
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QSet>
|
||||
|
||||
// static
|
||||
static QVector<DDSGeneric::TopicDescription> getAvailableTopicTypes() // get topicTypes per plugin mechanism
|
||||
{
|
||||
QVector<DDSGeneric::TopicDescription> topicTypeDescs;
|
||||
|
||||
LtsPluginManager::LtsPluginLoader::getInstance()->loadPlugins(LtsPluginManager::PluginType::TOPIC_TYPE, [&](const LtsPluginManager::PluginInstance &pi)
|
||||
{
|
||||
DDSGeneric::TopicTypePlugin *typePlugin = qobject_cast<DDSGeneric::TopicTypePlugin*>(pi.plugin);
|
||||
if (!typePlugin)
|
||||
return false;
|
||||
|
||||
QMap<std::string,DDSGeneric::TopicDescription> topics = typePlugin->getDataTopics();
|
||||
topics.unite(typePlugin->getFunctionTopics());
|
||||
|
||||
QMap<std::string, DDSGeneric::TopicDescription>::iterator it = topics.begin();
|
||||
for( ; it != topics.end(); ++it)
|
||||
{
|
||||
topicTypeDescs.append(it.value());
|
||||
}
|
||||
|
||||
return false; // we don't need the plugins anymore -> unload
|
||||
});
|
||||
|
||||
return topicTypeDescs;
|
||||
}
|
||||
|
||||
|
||||
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
|
||||
{
|
||||
public:
|
||||
CmdLineParser()
|
||||
: LtsCommandLineParser()
|
||||
{
|
||||
addOption( { QStringList() << QLatin1String("s") << QLatin1String("maxSamples"),
|
||||
QLatin1String("Default: 0 (infinite loop)"),
|
||||
QLatin1String("Max Samples"),
|
||||
QLatin1String("0") } );
|
||||
|
||||
addOption( { QStringList() << QLatin1String("t") << QLatin1String("doType"),
|
||||
QLatin1String("Default: all, can be a list of doTypes, i.e. 1,2,5 (more Infos on doType, use -h)"),
|
||||
QLatin1String("doType"),
|
||||
QLatin1String("0") } );
|
||||
}
|
||||
|
||||
int maxSamples() const { return isSet(QLatin1String("s")) ? value(QLatin1String("s")).toInt() : -1; }
|
||||
|
||||
QVector<DDSGeneric::TopicDescription> getDoTypes(NGL::INGLLogger &logger) const
|
||||
{
|
||||
const QVector<DDSGeneric::TopicDescription> availDataTopics = getAvailableDoTypes();
|
||||
if (!isSet(QLatin1String("t")))
|
||||
return availDataTopics;
|
||||
|
||||
// Convert list of DoTypes, separated by comma (given by user)
|
||||
const QString doTypeStr = value(QLatin1String("t"));
|
||||
const QVector<QStringRef> strList = doTypeStr.splitRef(QLatin1Char(','), QString::SkipEmptyParts);
|
||||
|
||||
if (strList.isEmpty())
|
||||
return availDataTopics;
|
||||
|
||||
QVector<DDSGeneric::TopicDescription> vDt;
|
||||
vDt.reserve(strList.size());
|
||||
for (const QStringRef &doTypeStr : strList)
|
||||
{
|
||||
bool ok = false;
|
||||
int doTypeInt = doTypeStr.toInt(&ok);
|
||||
INFO_LOG(logger) << "doType: " << doTypeInt;
|
||||
if (ok && doTypeInt >= 0 && doTypeInt < availDataTopics.size())
|
||||
vDt.append(availDataTopics.at(doTypeInt));
|
||||
else
|
||||
WARNING_LOG(logger) << doTypeStr.toString() << " is not a valid DoType, skipping.. ";
|
||||
}
|
||||
return vDt;
|
||||
}
|
||||
|
||||
QVector<DDSGeneric::TopicDescription> getAvailableDoTypes() const
|
||||
{
|
||||
return getAvailableTopicTypes();
|
||||
}
|
||||
|
||||
bool init()
|
||||
{
|
||||
LtsCommandLineParser::init(false);
|
||||
if (isSet(QLatin1String("h")))
|
||||
{
|
||||
QVector<DDSGeneric::TopicDescription> doTypes = getAvailableDoTypes();
|
||||
auto it = doTypes.begin();
|
||||
for(int i=0 ; it != doTypes.end(); ++it, ++i)
|
||||
fprintf(stdout, "\ndoType(%d): %s ", i, (*it).name.c_str());
|
||||
fprintf(stdout, "\n\n");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
int main ( int argc, char**argv )
|
||||
{
|
||||
NGLCoreApplication app ( argc, argv );
|
||||
app.createLogger("DataSampleGenerator.main", "log4cxx_tdsr.props");
|
||||
|
||||
CmdLineParser options;
|
||||
if (!options.init())
|
||||
return -1;
|
||||
|
||||
QVector<DDSGeneric::TopicDescription> doTypes = options.getDoTypes(app.baseLogger());
|
||||
INFO_LOG(app.baseLogger()) << "size vDoTypes: " << doTypes.size();
|
||||
DataSampleReceiver::Initialisation* initDtcr = new DataSampleReceiver::Initialisation(options.domainId(), options.exerciseId(), doTypes);
|
||||
if (!initDtcr->init())
|
||||
return -2;
|
||||
|
||||
STARTUP_LOG(app.baseLogger());
|
||||
|
||||
app.exec();
|
||||
delete initDtcr;
|
||||
|
||||
SHUTDOWN_LOG(app.baseLogger());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user