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>
53 lines
1.9 KiB
C++
53 lines
1.9 KiB
C++
/**
|
|
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#include <QSettings>
|
|
#include <QFileInfo>
|
|
#include <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;
|
|
|
|
// Reading of configuration data from "dgps.ini" file
|
|
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();
|
|
}
|