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>
86 lines
2.5 KiB
C++
86 lines
2.5 KiB
C++
/**
|
|
* Settings for VideoOverlayManagement
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by hjl, SLSE, 2016-06-30
|
|
*/
|
|
|
|
#include "settings.h"
|
|
|
|
#include <QtCore/QSettings>
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <nglsettings/nglsettings_connections.h>
|
|
#include <ngltools/ngltools_filesystem.h>
|
|
|
|
namespace VideoOverlayManagement
|
|
{
|
|
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)
|
|
|
|
//---------------------------------------------------------------------
|
|
|
|
QString Settings::getAvsHostname()
|
|
{
|
|
return NGL::Connections::hostName(NGL::Connections::eConnection::AVS_AVA);
|
|
}
|
|
//---------------------------------------------------------------------
|
|
|
|
quint16 Settings::getAvsAvaPort()
|
|
{
|
|
return NGL::Connections::port(NGL::Connections::eConnection::AVS_AVA);
|
|
}
|
|
//---------------------------------------------------------------------
|
|
|
|
quint16 Settings::getAvsKeepAliveTriggerRequestTime()
|
|
{
|
|
// Info: AVS schickt alle 20 sec '298 KEEPALIVE' aufgrund eines KEEPALIVE Requesttrigger aus MainHandler!
|
|
quint16 keepAliveTriggerRequestTime = settings()->settings()->value(QLatin1String("zwav_connection/keepAliveTriggerRequestTime"), 1000 * 20).toUInt();
|
|
return keepAliveTriggerRequestTime;
|
|
}
|
|
//---------------------------------------------------------------------
|
|
|
|
quint16 Settings::getAvsKeepAliveTime()
|
|
{
|
|
// Mit dieser Timeoutzeit wird beim Ausbleiben von '298 KEEPALIVE' der Fehlerfall dedektiert.
|
|
quint16 keepAliveTime = settings()->settings()->value(QLatin1String("zwav_connection/keepAliveTime"), 1000 * 25).toUInt();
|
|
return keepAliveTime;
|
|
}
|
|
//---------------------------------------------------------------------
|
|
|
|
QString Settings::getOverlayTemplateName()
|
|
{
|
|
return QLatin1String("bottomcenter");
|
|
}
|
|
//---------------------------------------------------------------------
|
|
|
|
QString Settings::getContextName()
|
|
{
|
|
// ToDo: Nach Umstellung von AVS den 'EXCON' Namen 'ex_' verwenden!
|
|
return QLatin1String("uebung_");
|
|
}
|
|
//---------------------------------------------------------------------
|
|
NGL::Settings *Settings::settings()
|
|
{
|
|
return s();
|
|
}
|
|
//---------------------------------------------------------------------
|
|
void Settings::setIniFile(const QString &ini)
|
|
{
|
|
NGLSettingsClass::setIniFile(ini);
|
|
}
|
|
|
|
} // namespace VideoOverlayManagement
|