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>
45 lines
986 B
C++
45 lines
986 B
C++
/**
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
#include "mainthread.h"
|
|
#include "tcpsocket.h"
|
|
|
|
class QTcpSocket;
|
|
class QTimer;
|
|
class MainThread;
|
|
|
|
namespace DifferentialGPS
|
|
{
|
|
class TrimbleIF final : public TcpSocket
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
TrimbleIF();
|
|
~TrimbleIF();
|
|
|
|
void startThread(int threadIndex, MainThread *main);
|
|
|
|
void run() override;
|
|
|
|
protected:
|
|
void dumpDataText(const QByteArray &ba);
|
|
void dumpDataBinary(const QByteArray &ba);
|
|
protected Q_SLOTS:
|
|
void onError(QAbstractSocket::SocketError) override;
|
|
void onReadyRead() override;
|
|
void onTimeout();
|
|
|
|
protected:
|
|
MainThread *m_main;
|
|
QByteArray m_buf;
|
|
int m_rxCycle_ms; // Zyklus in ms in dem Daten empfangen werden sollten
|
|
QTimer *m_socketTimeout; // Timer zur Ueberwachung des receive-Daten-Zyklus
|
|
QTimer *m_socketReconnect; // Timer zum Reconnect-Versuch nachdem m_socketTimeout zugeschlagen hat
|
|
int m_threadIndex; // Index des Thread [0..1]
|
|
|
|
};
|
|
} // namespace DifferentialGPS
|