detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 10:44:39 +01:00
Code Issues Actions Packages Releases Activity

removed data streaming shutdown from command line to allow external gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-23 11:52:46 +01:00
parent 34908edd6a
commit 2ac170db98
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -2339,13 +2339,13 @@ string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action) {
int r_online = myDet->setReceiverOnline(ONLINE_FLAG); int r_online = myDet->setReceiverOnline(ONLINE_FLAG);
// switch off data streaming to prevent extra images in zmq gui buffer // switch off data streaming to prevent extra images in zmq gui buffer
if (r_online == ONLINE_FLAG) { /*if (r_online == ONLINE_FLAG) {
if (myDet->enableDataStreamingFromReceiver() != 0) { if (myDet->enableDataStreamingFromReceiver() != 0) {
if (myDet->enableDataStreamingFromReceiver(0) != 0) { 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; 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->acquire() == FAIL) if(myDet->acquire() == FAIL)
return string("acquire unsuccessful"); return string("acquire unsuccessful");
@@ -5948,14 +5948,14 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
if(cmd=="receiver"){ if(cmd=="receiver"){
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if(!strcasecmp(args[1],"start")) { if(!strcasecmp(args[1],"start")) {
// switch off data streaming to prevent extra images in zmq gui buffer /*// switch off data streaming to prevent extra images in zmq gui buffer
if (r_online == ONLINE_FLAG) { if (r_online == ONLINE_FLAG) {
if (myDet->enableDataStreamingFromReceiver() != 0) { if (myDet->enableDataStreamingFromReceiver() != 0) {
if (myDet->enableDataStreamingFromReceiver(0) != 0) { 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; std::cout << "Error: Unable to switch off data streaming in receiver. If GUI on, extra image(s) in zmq GUI buffer" << std::endl;
} }
} }
} }*/
myDet->startReceiver(); myDet->startReceiver();
} }
else if(!strcasecmp(args[1],"stop")) else if(!strcasecmp(args[1],"stop"))