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,104 @@
|
||||
/**
|
||||
* @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 <ExerciseManagement/exm.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QSet>
|
||||
#include <QThread>
|
||||
#include <QVector>
|
||||
#include <string>
|
||||
|
||||
|
||||
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("ExerciseManagement::Exercise|Participant::Participant"),
|
||||
QLatin1String("doType"),
|
||||
QLatin1String("ExerciseManagement::Exercise") } );
|
||||
}
|
||||
|
||||
int maxSamples() const { return isSet(QLatin1String("s")) ? value(QLatin1String("s")).toInt() : -1; }
|
||||
|
||||
QString getDoType() const
|
||||
{
|
||||
return value(QLatin1String("t"));
|
||||
}
|
||||
|
||||
bool init()
|
||||
{
|
||||
LtsCommandLineParser::init(false);
|
||||
if (isSet(QLatin1String("h")))
|
||||
{
|
||||
fprintf(stdout, "\ndoType: ExerciseManagement::Exercise\n");
|
||||
fprintf(stdout, "\ndoType: Participant::Participant\n");
|
||||
fprintf(stdout, "\n\n");
|
||||
showHelp();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
int main ( int argc, char**argv )
|
||||
{
|
||||
NGLCoreApplication app ( argc, argv );
|
||||
app.createLogger("DataSampleGenerator.main", "log4cxx_tdsg.props");
|
||||
|
||||
CmdLineParser options;
|
||||
if (!options.init())
|
||||
return -1;
|
||||
|
||||
// TODO: Use plugins of services
|
||||
const auto doType = options.getDoType();
|
||||
DEBUG_LOG(app.baseLogger()) << "Using doType (" << doType << ")";
|
||||
|
||||
DataSampleGenerator::Initialisation *initTDGen = new DataSampleGenerator::Initialisation(options.domainId(), options.exerciseId());
|
||||
if (!initTDGen->init())
|
||||
{
|
||||
delete initTDGen;
|
||||
return -2;
|
||||
}
|
||||
|
||||
STARTUP_LOG(app.baseLogger());
|
||||
|
||||
// if maxSamples == 0 => infinite loop
|
||||
long maxSamples = options.maxSamples();
|
||||
|
||||
int receive_period = 4;
|
||||
for (long i = 0; (maxSamples == 0) || (i < maxSamples) ; ++i)
|
||||
{
|
||||
initTDGen->generateTestData(doType);
|
||||
QThread::sleep(receive_period);
|
||||
}
|
||||
|
||||
delete initTDGen;
|
||||
|
||||
SHUTDOWN_LOG(app.baseLogger());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user