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>
51 lines
1.2 KiB
C++
51 lines
1.2 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Access Data from TRIMBLE and emit contents as QByteArray
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QtCore/QThread>
|
|
#include <QtNetwork/QAbstractSocket>
|
|
namespace NGL {
|
|
class INGLLogger;
|
|
}
|
|
class QTcpSocket;
|
|
|
|
/*********************************************************
|
|
* HOWTO: *
|
|
* *
|
|
* - Instantiate this Class without parent(!), *
|
|
* - call init() to establish the connection, on success: *
|
|
* - call start() to move it to the thread *
|
|
*********************************************************/
|
|
namespace HighLevelArchitecture {
|
|
|
|
class SocketReader : public QThread
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit SocketReader(QObject *parent = nullptr);
|
|
bool init(const QString &host, quint16 port, int id);
|
|
void stopThread();
|
|
~SocketReader();
|
|
|
|
signals:
|
|
void newData(const QByteArray &content, int id);
|
|
|
|
protected:
|
|
QTcpSocket *m_socket;
|
|
int m_hlaRequestIdentifier;
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
private slots:
|
|
void onReadyRead();
|
|
void onSocketError(const QAbstractSocket::SocketError &error);
|
|
|
|
};
|
|
|
|
|
|
} // Namespace HLA
|