detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

kept the same client interface:tb changed when fixing error codes/exceptions, modified multi print, fixed roi bug in indexing to sls

Browse Source
This commit is contained in:
maliakal_d
2018-10-31 14:30:30 +01:00
parent 3d40d5d058
commit aec8c031de
8 changed files with 238 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -648,16 +648,19 @@ void slsDetector::disconnectControl() {
controlSocket->Disconnect();
}
void slsDetector::connectDataError() {
FILE_LOG(logERROR) << "Cannot connect to receiver";
setErrorMask((getErrorMask())|(CANNOT_CONNECT_TO_RECEIVER));
}
int slsDetector::connectData() {
if (dataSocket) {
if (dataSocket->Connect() >= 0)
return OK;
else {
FILE_LOG(logERROR) << "Cannot connect to receiver";
setErrorMask((getErrorMask())|(CANNOT_CONNECT_TO_RECEIVER));
return FAIL;}
connectDataError();
return FAIL;
}
}
return UNDEFINED;
}

5
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -353,6 +353,11 @@ public:
*/
void disconnectControl();
/**
* Could not connect to receiver, log error
*/
void connectDataError();
/**
* Connect to the data port
* @returns OK, FAIL or undefined