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>
69 lines
1.7 KiB
C++
69 lines
1.7 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* SquishTest
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include <nglapplication/nglapplication.h>
|
|
#include <NGLLogger/INGLLogger.h>
|
|
|
|
#include "mainwindow.h"
|
|
|
|
#include <QDesktopWidget>
|
|
#include <QMessageBox>
|
|
|
|
// -------------------------------------------------------------------
|
|
int main (int argc, char* argv[])
|
|
{
|
|
NGLApplication app ( argc, argv );
|
|
|
|
// under windows for ArcGIS 10.2.6 and higher
|
|
#ifdef Q_OS_WIN
|
|
QCoreApplication::setAttribute( Qt::AA_UseOpenGLES );
|
|
#endif
|
|
|
|
app.createLogger("sitMapTestApp", "log4cxx_sitMapTestApp.props");
|
|
TRACE_LOG(app.baseLogger()) << LOGFUNCTION << " START";
|
|
|
|
STARTUP_LOG(app.baseLogger());
|
|
|
|
app.setOrganizationName(QLatin1String("Rheinmetall Defence Electronics"));
|
|
app.setApplicationName(QLatin1String("Situation Map Test Application"));
|
|
|
|
MainWindow *mw = new MainWindow();
|
|
/*
|
|
QDesktopWidget *desktopWidget = QApplication::desktop();
|
|
QRect geom;
|
|
|
|
// DEBUG_LOG(app.baseLogger()) << LOGFUNCTION << " desktopWidget->screenCount() = " << desktopWidget->screenCount();
|
|
|
|
if (desktopWidget->screenCount() > 1)
|
|
geom = desktopWidget->screenGeometry(1);
|
|
else
|
|
geom = desktopWidget->screenGeometry();
|
|
|
|
int width = mw->frameGeometry().width();
|
|
int height = mw->frameGeometry().height();
|
|
int screenWidth = geom.width();
|
|
int screenHeight = geom.height();
|
|
int screenWidth = 1024;
|
|
int screenHeight = 768;
|
|
mw->setGeometry((screenWidth/2)-(width/2),(screenHeight/2)-(height/2),width,height);
|
|
*/
|
|
mw->setGeometry(0,0,1024,768);
|
|
// mw->setWindowState(Qt::WindowMaximized);
|
|
mw->show();
|
|
|
|
app.setQuitOnLastWindowClosed(true);
|
|
|
|
int retval = app.exec();
|
|
|
|
delete mw;
|
|
|
|
SHUTDOWN_LOG(app.baseLogger());
|
|
|
|
return retval;
|
|
}
|