Files
torstenandCopilot 7a6be7474e Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase
- 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>
2026-08-23 20:49:23 +02:00

49 lines
1.8 KiB
C++
Executable File

#include <QtCore/QSettings>
#include <QtCore/QFileInfo>
#include <QtCore/QCoreApplication>
#include "dgps_config.h"
using namespace DifferentialGPS;
DgpsConfig::DgpsConfig()
{
}
DgpsConfig &DgpsConfig::instance()
{
static DgpsConfig instance;
return instance;
}
void DgpsConfig::readIniData(QString iniFileName)
{
QFileInfo fi(iniFileName);
if (!fi.isAbsolute())
iniFileName = QCoreApplication::applicationDirPath() + QLatin1Char('/') + iniFileName;
QSettings iniData(iniFileName, QSettings::IniFormat);
m_trimbleConfig.rxCycle_ms = iniData.value(QLatin1String("Trimble/RxCycle_ms"), 0).toInt();
m_trimbleConfig.ip[0] = iniData.value(QLatin1String("Trimble0/IP"), QString()).toString();
m_trimbleConfig.port[0] = iniData.value(QLatin1String("Trimble0/Port"), 11).toInt();
m_trimbleConfig.ip[1] = iniData.value(QLatin1String("Trimble1/IP")).toString();
m_trimbleConfig.port[1] = iniData.value(QLatin1String("Trimble1/Port"), 11).toInt();
m_tetraConfig.feedbackTimeout_ms = iniData.value(QLatin1String("Tetra/FeedbackTimeout_ms"), 0).toInt();
m_tetraConfig.ip[0] = iniData.value(QLatin1String("Tetra0/IP"), QString()).toString();
m_tetraConfig.port[0] = iniData.value(QLatin1String("Tetra0/Port"), 0).toInt();
m_tetraConfig.issi[0] = iniData.value(QLatin1String("Tetra0/ISSI"), 11).toInt();
m_tetraConfig.broadcastIssi[0] = iniData.value(QLatin1String("Tetra0/ISSIBroadcast"), 5000).toInt();
m_tetraConfig.ip[1] = iniData.value(QLatin1String("Tetra1/IP"), QString()).toString();
m_tetraConfig.port[1] = iniData.value(QLatin1String("Tetra1/Port"), 0).toInt();
m_tetraConfig.issi[1] = iniData.value(QLatin1String("Tetra1/ISSI"), 11).toInt();
m_tetraConfig.broadcastIssi[1] = iniData.value(QLatin1String("Tetra1/ISSIBroadcast"), 5000).toInt();
}