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

some changes for quitting gui and continuing with acquire from command line

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-07 11:40:56 +02:00
parent 59f3aef703
commit 831bd8e160
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1672,8 +1672,8 @@ void UDPStandardImplementation::startDataCallback(){
//socket details //socket details
void *context = zmq_ctx_new(); void *context = zmq_ctx_new();
void *zmqsocket = zmq_socket(context, ZMQ_PUB); // create a publisher void *zmqsocket = zmq_socket(context, ZMQ_PUSH); // create a publisher
int val = 100; int val = -1;
zmq_setsockopt(zmqsocket, ZMQ_LINGER, &val,sizeof(val)); // wait for the unsent packets before closing socket zmq_setsockopt(zmqsocket, ZMQ_LINGER, &val,sizeof(val)); // wait for the unsent packets before closing socket
zmq_bind(zmqsocket,hostName); // bind zmq_bind(zmqsocket,hostName); // bind
FILE_LOG(logINFO) << "Thread" << ithread << ": ZMQ Server at " << hostName; FILE_LOG(logINFO) << "Thread" << ithread << ": ZMQ Server at " << hostName;
@ -1746,6 +1746,7 @@ void UDPStandardImplementation::startDataCallback(){
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send data //send data
zmq_send(zmqsocket, buffer, oneframesize, 0); zmq_send(zmqsocket, buffer, oneframesize, 0);
cout<<"sent last dummy"<<endl;
newFrame = false; newFrame = false;
} }

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2295,7 +2295,7 @@ int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
int slsReceiverTCPIPInterface::start_readout(){ int slsReceiverTCPIPInterface::start_readout(){cprintf(BLUE,"In start readout!\n");
ret=OK; ret=OK;
enum runStatus retval; enum runStatus retval;