From 42f1580c4f7a8775ebfdf6f802b9a17f64c56937 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Fri, 18 Apr 2025 21:17:36 +0200 Subject: [PATCH] server visa clean up visa code add s_data_ready signal --- server/VISA/visa.cpp | 9 ++++++--- server/VISA/visa.hpp | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/VISA/visa.cpp b/server/VISA/visa.cpp index cbbdb1e..25eeae2 100644 --- a/server/VISA/visa.cpp +++ b/server/VISA/visa.cpp @@ -17,9 +17,10 @@ Visa::Visa(QObject *parent) m_reconnect = false; } }); - QObject::connect(&m_client, &Tcp_client::data_ready, this, [=, this](QString data) { - m_data = data; + QObject::connect(m_tcp_socket, &QTcpSocket::readyRead, this, [=, this] { + m_data = QString::fromUtf8(m_tcp_socket->read(1024)); m_data_ready = true; + emit s_data_ready(m_data); }); } Visa::~Visa() @@ -53,7 +54,9 @@ bool Visa::connected() const void Visa::send(QString data) { - m_client.tcp_send(data); + data.append('\n'); + m_tcp_socket->write(data.toUtf8()); + m_tcp_socket->waitForBytesWritten(); } QString Visa::querry(QString data) diff --git a/server/VISA/visa.hpp b/server/VISA/visa.hpp index 714b3b3..ec7fbe3 100644 --- a/server/VISA/visa.hpp +++ b/server/VISA/visa.hpp @@ -21,6 +21,7 @@ class Visa : public QObject signals: void s_disconnected(); void s_connected(); + void s_data_ready(QString data); private: Tcp_client m_client;