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

zmq connect earlier in gui to prevent losing first messages

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-29 12:13:02 +01:00
parent ba71529ff2
commit 712c9a4524
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5778,17 +5778,9 @@ void multiSlsDetector::readFrameFromReceiver(){
int* multiframe=new int[nel](); int* multiframe=new int[nel]();
int nch; int nch;
bool runningList[numSockets]; bool runningList[numSockets];
bool connectList[numSockets]; bool connectList[numSockets];
int numRunning = 0;
//wait for real time acquisition to start
bool running = true;
sem_wait(&sem_newRTAcquisition);
if(checkJoinThread())
running = false;
for(int i = 0; i < numSockets; ++i) { for(int i = 0; i < numSockets; ++i) {
if(!zmqSocket[i]->Connect()) { if(!zmqSocket[i]->Connect()) {
connectList[i] = true; connectList[i] = true;
@ -5799,8 +5791,14 @@ void multiSlsDetector::readFrameFromReceiver(){
runningList[i] = false; runningList[i] = false;
} }
} }
int numRunning = numSockets;
numRunning = numSockets;
//wait for real time acquisition to start
bool running = true;
sem_wait(&sem_newRTAcquisition);
if(checkJoinThread())
running = false;
//exit when last message for each socket received //exit when last message for each socket received