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
+107
@@ -0,0 +1,107 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* DDS View -> The "LogView" for DDS
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "nglsettings.h"
|
||||
#include "mainwindow.h"
|
||||
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
|
||||
#include <QInputDialog>
|
||||
#include <QUrl>
|
||||
|
||||
|
||||
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
|
||||
{
|
||||
public:
|
||||
CmdLineParser() : LtsCommandLineParser::LtsCommandLineParser(ProvideCommandLineParameterOptions(LtsCommandLineParser::CreateDomainIdFromIp |
|
||||
LtsCommandLineParser::DomainId |
|
||||
LtsCommandLineParser::ExerciseId |
|
||||
LtsCommandLineParser::TcpConnectionUrl))
|
||||
{}
|
||||
const char *langCode() const { return m_langCode.data(); }
|
||||
|
||||
bool init()
|
||||
{
|
||||
setDomainId(-1);
|
||||
QCommandLineOption langCodeOption(QStringList() << QLatin1String("l") << QLatin1String("langCode"),
|
||||
QLatin1String("Language."),
|
||||
QLatin1String("en_US|de_DE"),
|
||||
QLatin1String("en_US"));
|
||||
addOption(langCodeOption);
|
||||
|
||||
if (!LtsCommandLineParser::init())
|
||||
return false;
|
||||
|
||||
if (isSet(langCodeOption))
|
||||
m_langCode = value(langCodeOption).toLatin1();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
QByteArray m_langCode;
|
||||
};
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
NGLApplication app(argc, argv);
|
||||
app.createLogger("DdsView", "log4cxx_ddsview.props");
|
||||
NGL::INGLLogger &logger = app.baseLogger();
|
||||
QCoreApplication::setApplicationName(QLatin1String("DDS View"));
|
||||
QCoreApplication::setOrganizationName(QLatin1String("RME"));
|
||||
|
||||
// load style plugin to get access to icons
|
||||
LtsPluginManager::LtsPluginLoader::getInstance()->loadPlugins(LtsPluginManager::PluginType::STYLE, nullptr, {QStringLiteral("rme.light")});
|
||||
|
||||
CmdLineParser options;
|
||||
if (!options.init())
|
||||
return -1;
|
||||
|
||||
// NGL::Settings settings(app.organizationName(), app.applicationName());
|
||||
|
||||
STARTUP_LOG(logger);
|
||||
|
||||
// NGL::init_translator(options.langCode());
|
||||
|
||||
int exerciseId = options.exerciseId();
|
||||
// TODO: max-Domain-Id? Prüfen...
|
||||
int domainId = options.domainId();
|
||||
if (domainId < 0)
|
||||
{
|
||||
bool bOk = false;
|
||||
domainId = QInputDialog::getInt(nullptr,
|
||||
QObject::tr("Select DDS Domain"),
|
||||
QObject::tr("Domain Id"),
|
||||
NGLSettings::instance()->ddsDomain(), 0, 999, 1, &bOk);
|
||||
if (!bOk)
|
||||
{
|
||||
printf("Startup canceled by user\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
NGLSettings::instance()->setDdsDomain(domainId);
|
||||
MainWindow *mw = new MainWindow(domainId, exerciseId, options.useTcpConnection() ?
|
||||
DDS::QosProfile::ConnectionType::Tcp :
|
||||
DDS::QosProfile::ConnectionType::Client,
|
||||
options.tcpConnectionUrl());
|
||||
|
||||
mw->show();
|
||||
|
||||
app.setQuitOnLastWindowClosed(true);
|
||||
|
||||
int retval = app.exec();
|
||||
|
||||
SHUTDOWN_LOG(logger);
|
||||
|
||||
return retval;
|
||||
}
|
||||
Reference in new issue
Block a user