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>
52 lines
1.0 KiB
C++
52 lines
1.0 KiB
C++
/**
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
#include <QtCore/QObject>
|
|
#include <QtCore/QMutex>
|
|
#include <QtCore/QTime>
|
|
#include <QtNetwork/QHostAddress>
|
|
#include "logger.h"
|
|
#include "dds_handler.h"
|
|
|
|
class QTimer;
|
|
|
|
namespace DifferentialGPS
|
|
{
|
|
class TetraImpl;
|
|
class TrimbleIF;
|
|
|
|
class MainThread final : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit MainThread(QObject *parent = nullptr);
|
|
~MainThread();
|
|
|
|
bool init(int domainId);
|
|
|
|
void addNewData(const QByteArray &ba, int trimbleIfNum);
|
|
bool getNewData(QByteArray &ba);
|
|
|
|
Q_SIGNALS:
|
|
void newDataAvailable();
|
|
protected:
|
|
std::shared_ptr<DdsHandler> m_ddsHandler;
|
|
QByteArray m_dgpsData;
|
|
QTimer *m_dgpsTimer;
|
|
QMutex m_mutex;
|
|
|
|
TetraImpl *m_tetraIF[2];
|
|
int m_tetraIfNum; // Nummer des Tetra IF-es, an das Daten gesendet werden.
|
|
|
|
TrimbleIF *m_trimbleIF[2];
|
|
int m_trimbleIfNum; // Nummer des Trimble IF-es, von dem Daten erwartet werden.
|
|
|
|
NGL::INGLLogger &m_logger;
|
|
QTime m_broadcastTime;
|
|
int m_broadcastCycle_ms;
|
|
};
|
|
} // namespace DifferentialGPS
|