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>
141 lines
3.7 KiB
C++
141 lines
3.7 KiB
C++
/**
|
|
* Settings for TetraRadio
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
|
*/
|
|
|
|
#include "settings.h"
|
|
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <ngltools/ngltools_filesystem.h>
|
|
#include <QtCore/QSettings>
|
|
#include <QJsonDocument>
|
|
|
|
#include "LtsUtilsCore/lts_portrange.h"
|
|
|
|
namespace TrainingAreaBase
|
|
{
|
|
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);
|
|
}
|
|
|
|
QString Settings::rxDir()
|
|
{
|
|
return s()->zsks_rxPath();
|
|
}
|
|
|
|
QString Settings::txDir()
|
|
{
|
|
return s()->zsks_txPath();
|
|
}
|
|
|
|
qint64 Settings::timeDelayAhead()
|
|
{
|
|
// msec
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/TimeDelayAhead"), 60000).toLongLong();
|
|
}
|
|
|
|
qint64 Settings::timeDelayBack()
|
|
{
|
|
// msec
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/TimeDelayBack"), 660000).toLongLong();
|
|
}
|
|
|
|
bool Settings::useTetraScramling()
|
|
{
|
|
#ifdef GUEZ_MODE
|
|
const bool bDefault = true;
|
|
#else
|
|
const bool bDefault = false;
|
|
#endif
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/UseTetraScrambling"), bDefault).toBool();
|
|
}
|
|
|
|
bool Settings::usePvSan()
|
|
{
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool();
|
|
}
|
|
|
|
qint64 Settings::explosionToEffectDelayInMSec()
|
|
{
|
|
// [s]
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/ExplosionToEffectDelayMsec"), 3000).toInt();
|
|
}
|
|
|
|
qint64 Settings::distanceIpsToGps()
|
|
{
|
|
// [m]
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/DistanceIpsToGps"), 0).toLongLong();
|
|
}
|
|
|
|
qint64 Settings::distanceOpsToGps()
|
|
{
|
|
// [m]
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/DistanceOpsToGps"), 0).toLongLong();
|
|
}
|
|
|
|
double Settings::maxSoldierSpeed()
|
|
{
|
|
// [m/s]
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/MaxSoldierSpeed"), 4.0).toDouble();
|
|
}
|
|
|
|
qint64 Settings::maxSpeedCheckTimeout()
|
|
{
|
|
// [s]
|
|
return settings()->settings()->value(QLatin1String("TrainingAreaBase/MaxSpeedCheckTimeout"), 120).toInt();
|
|
}
|
|
|
|
|
|
// Resolve Jira NLDEVCTRL-631 Gesundschiessen durch Laser Range Finder
|
|
qint64 Settings::laserRangeCode()
|
|
{
|
|
return settings()->settings()->value(QLatin1String("BuildingControlUnit/laserRangeCode"), 0).toLongLong();
|
|
}
|
|
|
|
QJsonObject Settings::remainingEffects()
|
|
{
|
|
QByteArray defaultValue = "{\"5\": { \"20\": 1, \"40\": 2, \"60\": 3, \"80\": 4, \"100\": 5 }, \
|
|
\"4\": { \"30\": 1, \"50\": 2, \"70\": 3, \"90\": 4, \"100\": 5 }, \
|
|
\"3\": { \"30\": 0, \"100\": 1 }, \
|
|
\"2\": { \"50\": 0, \"100\": 1 }, \
|
|
\"1\": { \"90\": 0, \"100\": 1 }, \
|
|
\"0\": { \"100\": 0 } }";
|
|
|
|
QByteArray ba = settings()->settings()->value(QLatin1String("TrainingAreaBase/remainingEffects"), defaultValue).toByteArray();
|
|
|
|
return QJsonDocument::fromJson(ba).object();
|
|
}
|
|
|
|
QPair<quint16, quint16> Settings::getWebSocketServerPortRange(int type)
|
|
{
|
|
return LtsUtils::fromQPoint(settings()->settings()->value(QString(QStringLiteral("TAB/webSocketServerPortRange/%1")).arg(type), QPoint()).toPoint());
|
|
}
|
|
|
|
} // namespace TrainingAreaBase
|