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>
59 lines
1.5 KiB
C++
59 lines
1.5 KiB
C++
/**
|
|
* Settings for OcSituationClient
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "settings.h"
|
|
|
|
#include <QtCore/QSettings>
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <ngltools/ngltools_filesystem.h>
|
|
|
|
namespace OcSituationClient
|
|
{
|
|
class NGLSettingsClass : public NGL::Settings
|
|
{
|
|
public:
|
|
NGLSettingsClass()
|
|
: NGL::Settings(s_iniFile.isEmpty() ? NGL::findProjectConfigFile() : s_iniFile)
|
|
{}
|
|
static void setIniFile(const QString &fn)
|
|
{
|
|
s_iniFile = fn;
|
|
}
|
|
static QString s_iniFile;
|
|
};
|
|
QString NGLSettingsClass::s_iniFile;
|
|
Q_GLOBAL_STATIC(NGLSettingsClass, s)
|
|
|
|
//-----------------------------------------------------------------------------
|
|
NGL::Settings *Settings::settings()
|
|
{
|
|
return s();
|
|
}
|
|
//-----------------------------------------------------------------------------
|
|
void Settings::setIniFile(const QString &ini)
|
|
{
|
|
NGLSettingsClass::setIniFile(ini);
|
|
}
|
|
//-----------------------------------------------------------------------------
|
|
|
|
int32_t Settings::unitOffset()
|
|
{
|
|
return settings()->settings()->value(QLatin1String("OcSituationParameter/AliveTimeout"), 0x40000000).toInt();
|
|
}
|
|
|
|
int32_t Settings::situationRequestCycleTime()
|
|
{
|
|
return settings()->settings()->value(QLatin1String("OcSituationParameter/SituationRequestCycleTime"), 4).toInt() * 60 * 1000; // 4 minutes
|
|
}
|
|
|
|
const QString Settings::baseCoord()
|
|
{
|
|
return settings()->settings()->value(QLatin1String("Canag/BaseCoord"), QStringLiteral("32UMD00000000000000")).toString();
|
|
}
|
|
|
|
} // namespace OcSituationClient
|