From 332e83d43c582e2e67c145c3539065c4f84ea083 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 18 Jun 2019 18:06:27 +0200 Subject: [PATCH] WIP, except qdrawplot --- slsDetectorGui/src/qServer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorGui/src/qServer.cpp b/slsDetectorGui/src/qServer.cpp index b4d70e5f2..8ee37e763 100755 --- a/slsDetectorGui/src/qServer.cpp +++ b/slsDetectorGui/src/qServer.cpp @@ -89,7 +89,7 @@ void qServer::ServerThread(bool isControlServer) { try{ auto socket = (isControlServer ? controlSocket->accept() : stopSocket->accept()); try{ - decode_function(socket); + DecodeFunction(socket); } catch(const sls::NonCriticalError &e) { if (strstr(e.what(), "exit")) { @@ -98,7 +98,7 @@ void qServer::ServerThread(bool isControlServer) { } char mess[MAX_STR_LENGTH]; sls::strcpy_safe(mess, e.what()); - socket.Send(FAIL); + socket.Send(qDefs::FAIL); socket.Send(mess); } } catch (const sls::NonCriticalError &e) { @@ -125,7 +125,7 @@ void qServer::GetStatus(sls::ServerInterface2 &socket) { progress = mainTab->GetProgress(); int retvals[2] = {static_cast(status), progress}; - socket.SendResult(retvals); + socket.sendResult(retvals); } void qServer::StartAcquisition(sls::ServerInterface2 &socket) {