From 094b8aa2bbb8b90dff9da199873cbc6b36549eb6 Mon Sep 17 00:00:00 2001 From: Thomas Vanbesien Date: Wed, 11 Mar 2026 15:25:11 +0100 Subject: Refactor: three XPL2 ports, EchoServer class, dark debug console, qmllint clean - Xpl2Client: replace single port with commandPort/imagingPort/statusPort (9110/9111/9112) - Mock server: extract EchoServer class from lambda-based listenOn() - Demo: dark debug console matching BobinkQtOpcUa style, 2-column connection layout - Fix qmlls module resolution via IMPORT_PATH in qt_add_qml_module() - Add pragma ComponentBehavior: Bound, fix all qmllint warnings --- src/Xpl2Client.h | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 25 deletions(-) (limited to 'src/Xpl2Client.h') diff --git a/src/Xpl2Client.h b/src/Xpl2Client.h index f052962..d339bc3 100644 --- a/src/Xpl2Client.h +++ b/src/Xpl2Client.h @@ -8,46 +8,62 @@ #include #include -class Xpl2Client : public QObject { +class Xpl2Client : public QObject +{ Q_OBJECT QML_ELEMENT QML_SINGLETON - Q_PROPERTY(QString host READ host WRITE setHost NOTIFY hostChanged) - Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged) - Q_PROPERTY(bool connected READ isConnected NOTIFY connectedChanged) + Q_PROPERTY (QString host READ host WRITE setHost NOTIFY hostChanged) + Q_PROPERTY (quint16 commandPort READ commandPort WRITE setCommandPort NOTIFY + commandPortChanged) + Q_PROPERTY (quint16 imagingPort READ imagingPort WRITE setImagingPort NOTIFY + imagingPortChanged) + Q_PROPERTY (quint16 statusPort READ statusPort WRITE setStatusPort NOTIFY + statusPortChanged) + Q_PROPERTY (bool connected READ isConnected NOTIFY connectedChanged) public: - explicit Xpl2Client(QObject *parent = nullptr); + explicit Xpl2Client (QObject *parent = nullptr); - QString host() const; - void setHost(const QString &host); + QString host () const; + void setHost (const QString &host); - quint16 port() const; - void setPort(quint16 port); + quint16 commandPort () const; + void setCommandPort (quint16 port); - bool isConnected() const; + quint16 imagingPort () const; + void setImagingPort (quint16 port); - Q_INVOKABLE void connectToServer(); - Q_INVOKABLE void disconnectFromServer(); - Q_INVOKABLE void sendCommand(const QString &command); + quint16 statusPort () const; + void setStatusPort (quint16 port); + + bool isConnected () const; + + Q_INVOKABLE void connectToServer (); + Q_INVOKABLE void disconnectFromServer (); + Q_INVOKABLE void sendCommand (const QString &command); signals: - void hostChanged(); - void portChanged(); - void connectedChanged(); - void responseReceived(const QString &response); - void errorOccurred(const QString &error); - void statusMessage(const QString &message); + void hostChanged (); + void commandPortChanged (); + void imagingPortChanged (); + void statusPortChanged (); + void connectedChanged (); + void responseReceived (const QString &response); + void errorOccurred (const QString &error); + void statusMessage (const QString &message); private slots: - void onConnected(); - void onDisconnected(); - void onReadyRead(); - void onErrorOccurred(QAbstractSocket::SocketError error); + void onConnected (); + void onDisconnected (); + void onReadyRead (); + void onErrorOccurred (QAbstractSocket::SocketError error); private: QTcpSocket m_socket; - QString m_host = QStringLiteral("127.0.0.1"); - quint16 m_port = 5000; + QString m_host = QStringLiteral ("127.0.0.1"); + quint16 m_commandPort = 9110; + quint16 m_imagingPort = 9111; + quint16 m_statusPort = 9112; }; -- cgit v1.2.3