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>
58 lines
1.4 KiB
C++
58 lines
1.4 KiB
C++
#include <nglapplication/nglapplication.h>
|
|
#include <QDesktopWidget>
|
|
#include <QtCore/QSettings>
|
|
#include <QNetworkProxy>
|
|
#ifndef WIN32
|
|
#include <unistd.h>
|
|
#endif
|
|
#include "LogViewGui.hpp"
|
|
#include "logger.h"
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
std::string logConfigFileName;
|
|
std::string dir;
|
|
|
|
#ifdef WIN32
|
|
dir = argv[0];
|
|
#else
|
|
std::stringstream s;
|
|
s << "/proc/" << getpid() << "/exe";
|
|
char buf[1024];
|
|
ssize_t len = readlink(s.str().c_str(), buf, 1024);
|
|
if(len > 0) {
|
|
buf[len] = '\0';
|
|
dir = buf;
|
|
} else {
|
|
// fallback
|
|
dir = argv[0];
|
|
}
|
|
#endif
|
|
|
|
std::string::size_type pos = dir.find_last_of('/');
|
|
if (std::string::npos != pos)
|
|
logConfigFileName += dir.substr(0, pos + 1);;
|
|
logConfigFileName += "LogView_log4cxx.props";
|
|
|
|
qputenv("TDS_DEVEL", QByteArray::number(1));
|
|
NGLApplication app(argc, argv);
|
|
QNetworkProxy::setApplicationProxy(QNetworkProxy());
|
|
app.createLogger("LogView", logConfigFileName.c_str());
|
|
|
|
QCoreApplication::setOrganizationName(QLatin1String("RME"));
|
|
QCoreApplication::setApplicationName(QLatin1String("LogView"));
|
|
|
|
QSettings settings;
|
|
settings.beginGroup(N_LogView::LogViewGui::WINDOW_GROUP);
|
|
int screenNbr = settings.value(N_LogView::LogViewGui::SCREEN, 0).toInt();
|
|
settings.endGroup();
|
|
|
|
N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(QApplication::desktop()->screen(screenNbr));
|
|
logViewGui->show();
|
|
int ret = app.exec();
|
|
|
|
delete logViewGui;
|
|
return ret;
|
|
}
|
|
|