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>
94 lines
3.3 KiB
C++
94 lines
3.3 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* main for SituationReplay
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, SLSE, 2016-01-13
|
|
*/
|
|
|
|
#include <nglapplication/nglcoreapplication.h>
|
|
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
|
|
|
#include "dds_handler.h"
|
|
#include "main_handler.h"
|
|
#include "logger.h"
|
|
#include "settings.h"
|
|
|
|
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
|
|
{
|
|
public:
|
|
CmdLineParser()
|
|
: LtsCommandLineParser(ProvideCommandLineParameterOptions(CreateDomainIdFromIp|DomainId|ExerciseId))
|
|
{
|
|
addOption({ QStringList() << QLatin1String("input"),
|
|
QLatin1String("information for the input side (domainId,exerciseId,<tcpConnectionParams>"),
|
|
QLatin1String("1,42,tcpv4lan://srv:port"),
|
|
QString()
|
|
});
|
|
addOption({ QStringList() << QLatin1String("output"),
|
|
QLatin1String("information for the output side (domainId,replayId,<tcpConnectionParams>"),
|
|
QLatin1String("2,1,tcpv4lan://srv:port"),
|
|
QString()
|
|
});
|
|
}
|
|
|
|
QString inputParams() const { return isSet(QLatin1String("input")) ? value(QLatin1String("input")) : QString(); }
|
|
QString outputParams() const { return isSet(QLatin1String("output")) ? value(QLatin1String("output")) : QString(); }
|
|
};
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
NGLCoreApplication app(argc, argv);
|
|
|
|
CmdLineParser options;
|
|
if (!options.init())
|
|
return -1;
|
|
|
|
SituationReplay::ConnectionParams input, output;
|
|
if (!SituationReplay::DdsHandler::parseOptions(options.inputParams(), input))
|
|
{
|
|
app.createLogger("SRP", options.exerciseId());
|
|
ERROR_LOG(app.baseLogger()) << "Can not parse input params: '" << options.inputParams() << "'";
|
|
return -2;
|
|
}
|
|
|
|
if (!SituationReplay::DdsHandler::parseOptions(options.outputParams(), output))
|
|
{
|
|
app.createLogger("SRP", options.exerciseId());
|
|
ERROR_LOG(app.baseLogger()) << "Can not parse output params: '" << options.outputParams() << "'";
|
|
return -3;
|
|
}
|
|
//set output exercise id = input exercise id
|
|
input.exerciseId = input.partitionId;
|
|
output.exerciseId = input.partitionId;
|
|
app.createLogger("SRP", input.partitionId, output.partitionId);
|
|
|
|
SituationReplay::Settings::setIniFile(options.iniFile());
|
|
|
|
int iRet = -4;
|
|
{
|
|
std::unique_ptr<SituationReplay::MainHandler> mainHandler(new SituationReplay::MainHandler);
|
|
|
|
NOTICE_LOG(app.baseLogger()) << "Input domainId: " << input.domainId
|
|
<< ", partition id: " << input.partitionId
|
|
<< ", exercise id: " << input.exerciseId
|
|
<< (input.discoveryPeer.isEmpty() ? QString() : QStringLiteral(", discovery: ") + input.discoveryPeer.toString());
|
|
NOTICE_LOG(app.baseLogger()) << "Output domainId: " << output.domainId
|
|
<< ", replayId: " << output.partitionId
|
|
<< ", exerciseid: " << output.exerciseId
|
|
<< (output.discoveryPeer.isEmpty() ? QString() : QStringLiteral(", discovery: ") + output.discoveryPeer.toString());
|
|
|
|
|
|
if (!mainHandler->init(input, output))
|
|
return iRet;
|
|
|
|
STARTUP_LOG(app.baseLogger());
|
|
iRet = app.exec();
|
|
|
|
SHUTDOWN_LOG(app.baseLogger());
|
|
}
|
|
|
|
return iRet;
|
|
}
|