- 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>
88 lines
1.6 KiB
C++
88 lines
1.6 KiB
C++
|
|
|
|
#pragma once
|
|
|
|
#include "tcpserver_export.h"
|
|
|
|
#include <QtCore/QByteArray>
|
|
#include <QtCore/QMap>
|
|
#include <QtCore/QObject>
|
|
#include <QtCore/QPointer>
|
|
|
|
class QAbstractSocket;
|
|
class CommandInterface;
|
|
|
|
class TCPSERVER_EXPORT WorkerBase
|
|
{
|
|
public:
|
|
typedef QMap<QByteArray, CommandInterface*> CommandMap;
|
|
|
|
public:
|
|
WorkerBase(qintptr sd, unsigned short port);
|
|
|
|
virtual ~WorkerBase() = default;
|
|
|
|
QAbstractSocket* connection();
|
|
|
|
const QAbstractSocket* connection() const;
|
|
|
|
void redirectDataHandling(bool bDoRedirect, CommandInterface* newDataHandler = nullptr);
|
|
|
|
static QByteArray formatForDebug(const QByteArray& data);
|
|
|
|
static QByteArray formatForDebug(const QAbstractSocket* dev);
|
|
|
|
CommandMap getCommands() const;
|
|
|
|
protected:
|
|
void newDataInternal();
|
|
|
|
int initCommands(unsigned short port);
|
|
|
|
void cleanupCommands();
|
|
|
|
qintptr m_socketDescriptor;
|
|
|
|
QPointer<QAbstractSocket> m_connection;
|
|
|
|
unsigned short m_port;
|
|
|
|
QByteArray m_connString;
|
|
|
|
bool m_bRedirectIncomingData;
|
|
|
|
CommandInterface* m_bRedirectDataHandler;
|
|
|
|
CommandMap m_registeredCommands;
|
|
};
|
|
|
|
class WorkerInstance final : public QObject, public WorkerBase
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
WorkerInstance(qintptr sd, unsigned short port, QObject* parent = nullptr);
|
|
virtual ~WorkerInstance();
|
|
|
|
bool isRunning() const;
|
|
|
|
bool isFinished() const;
|
|
|
|
public Q_SLOTS:
|
|
|
|
void quit();
|
|
|
|
void doWork();
|
|
|
|
protected Q_SLOTS:
|
|
|
|
void newData();
|
|
|
|
void connectionDisconnected();
|
|
|
|
Q_SIGNALS:
|
|
void finished();
|
|
|
|
private:
|
|
bool m_bFinished;
|
|
};
|