torstenandCopilot
7a6be7474e
- training_area_telegrams.cpp: Fixed QJsonObject initializer syntax (Qt6 requires {{}} not ({}))
- training_area_telegrams.cpp: Fixed fromJson() methods to access m_* members directly
- training_area_telegrams.cpp: Fixed brace mismatches in multiple toJson() methods
- training_area_telegrams.h: Changed Header struct to public members for consistency
- tx_mixin.cpp: Fixed getEquipmentNumber() template for direct member access
- lts_coordinate.cpp: Added missing #include <iomanip>
- MIGRATION_STATUS.md: Added migration progress tracking document
C++17 constraint enforced due to RTI Connext DDS 7.7.0 incompatibility with C++20+
Build status: BUILD_RTI=OFF successful (0 errors, warnings only)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
58 lines
1.1 KiB
C++
Executable File
58 lines
1.1 KiB
C++
Executable File
|
|
|
|
|
|
#include "settings.h"
|
|
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <ngltools/ngltools_filesystem.h>
|
|
#include <QtCore/QSettings>
|
|
#include <QtCore/QJsonDocument>
|
|
|
|
#include "LtsUtils/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();
|
|
}
|
|
|
|
QPair<quint16, quint16> Settings::getWebSocketServerPortRange(int type)
|
|
{
|
|
return LtsUtils::fromQPoint(settings()->settings()->value(QString(QStringLiteral("TAB/webSocketServerPortRange/%1")).arg(type), QPoint()).toPoint());
|
|
}
|
|
|
|
}
|