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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-22 18:02:45 +01:00
commit 0b45d73e0c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -5947,16 +5947,17 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
if(cmd=="receiver"){ if(cmd=="receiver"){
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
// switch off data streaming to prevent extra images in zmq gui buffer if(!strcasecmp(args[1],"start")) {
if (r_online == ONLINE_FLAG) { // switch off data streaming to prevent extra images in zmq gui buffer
if (myDet->enableDataStreamingFromReceiver() != 0) { if (r_online == ONLINE_FLAG) {
if (myDet->enableDataStreamingFromReceiver(0) != 0) { if (myDet->enableDataStreamingFromReceiver() != 0) {
std::cout << "Error: Unable to switch off data streaming in receiver. If GUI on, extra image(s) in zmq GUI buffer" << std::endl; if (myDet->enableDataStreamingFromReceiver(0) != 0) {
std::cout << "Error: Unable to switch off data streaming in receiver. If GUI on, extra image(s) in zmq GUI buffer" << std::endl;
}
} }
} }
}
if(!strcasecmp(args[1],"start"))
myDet->startReceiver(); myDet->startReceiver();
}
else if(!strcasecmp(args[1],"stop")) else if(!strcasecmp(args[1],"stop"))
myDet->stopReceiver(); myDet->stopReceiver();
else else