detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

WIP, except qdrawplot

Browse Source
This commit is contained in:
maliakal_d 2019-06-18 18:06:27 +02:00
parent 3f4dda9d33
commit 332e83d43c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/src/qServer.cpp
View File

@ -89,7 +89,7 @@ void qServer::ServerThread(bool isControlServer) {
try{ try{
auto socket = (isControlServer ? controlSocket->accept() : stopSocket->accept()); auto socket = (isControlServer ? controlSocket->accept() : stopSocket->accept());
try{ try{
decode_function(socket); DecodeFunction(socket);
} catch(const sls::NonCriticalError &e) { } catch(const sls::NonCriticalError &e) {
if (strstr(e.what(), "exit")) { if (strstr(e.what(), "exit")) {
@ -98,7 +98,7 @@ void qServer::ServerThread(bool isControlServer) {
} }
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
sls::strcpy_safe(mess, e.what()); sls::strcpy_safe(mess, e.what());
socket.Send(FAIL); socket.Send(qDefs::FAIL);
socket.Send(mess); socket.Send(mess);
} }
} catch (const sls::NonCriticalError &e) { } catch (const sls::NonCriticalError &e) {
@ -125,7 +125,7 @@ void qServer::GetStatus(sls::ServerInterface2 &socket) {
progress = mainTab->GetProgress(); progress = mainTab->GetProgress();
int retvals[2] = {static_cast<int>(status), progress}; int retvals[2] = {static_cast<int>(status), progress};
socket.SendResult(retvals); socket.sendResult(retvals);
} }
void qServer::StartAcquisition(sls::ServerInterface2 &socket) { void qServer::StartAcquisition(sls::ServerInterface2 &socket) {