torstenandCopilot
7173785915
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>
75 lines
2.4 KiB
C++
75 lines
2.4 KiB
C++
/*
|
|
* @RDE_HEADER@
|
|
* Main for AdlerSimulation
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Patric Karwat, ESZS, 2025-03-03
|
|
*/
|
|
|
|
#include <QtCore/QCoreApplication>
|
|
#include <QtCore/QPointF>
|
|
|
|
#include <QSettings>
|
|
#include <QNetworkProxy>
|
|
|
|
#include <nglapplication/nglapplication.h>
|
|
#include <nglapplication/nglloggerhandler.h>
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <ngltranslator/ngltranslator.h>
|
|
#include <NGLLogger/INGLLogger.h>
|
|
#include <nglapplication/nglcoreapplication.h>
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
|
|
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
|
|
|
|
|
#include "awss_base_layout.h"
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
QCoreApplication::setApplicationName(QLatin1String("ADLER Websocket Simulator"));
|
|
QCoreApplication::setOrganizationName(QLatin1String("RME"));
|
|
|
|
NGLApplication app(argc, argv);
|
|
QApplication::setQuitOnLastWindowClosed(true); // we are cool enough to handle it ourselves 8)
|
|
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
|
QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere!
|
|
|
|
app.createLogger("awss", "log4cxx_adlerWebSocketSimulator.props");
|
|
NGL::INGLLogger &logger = app.baseLogger();
|
|
QScopedPointer<QSettings> settings(new QSettings(app.organizationName(), app.applicationName()));
|
|
|
|
ERROR_LOG(logger) << "Settings Directory: " << settings->fileName();
|
|
|
|
LtsCommandLineParser::LtsCommandLineParser options(LtsCommandLineParser::LtsCommandLineParser::CustomConfigFile);
|
|
|
|
options.addOption({ QStringList() << QLatin1String("p") << QLatin1String("port")
|
|
, QLatin1String("port to connect to server")
|
|
, QLatin1String("Default value")
|
|
, QLatin1String("2300")
|
|
});
|
|
|
|
options.addOption({ QStringList() << QLatin1String("s") << QLatin1String("server")
|
|
, QLatin1String("hostname or Ip of the server")
|
|
, QLatin1String("Default value")
|
|
, QLatin1String("exctds01")
|
|
});
|
|
|
|
if (!options.init())
|
|
{
|
|
options.showHelp();
|
|
return -1;
|
|
}
|
|
QSettings serverSettings(app.applicationDirPath() + QLatin1String("/") + options.iniFile(), QSettings::IniFormat);
|
|
|
|
DEBUG_LOG(logger) << "Starting Server";
|
|
AdlerWebSocketSimulator::BaseLayout *bl = new AdlerWebSocketSimulator::BaseLayout();
|
|
bl->show();
|
|
int ret = app.exec();
|
|
|
|
// delete s;
|
|
|
|
return ret;
|
|
}
|