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

ensure gui gets measurement finished after dummy packet received from receiver/ext process

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-29 15:22:10 +01:00
parent 397344a264
commit 1edb41242c
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -58,6 +58,8 @@ int slsDetectorUtils::acquire(int delflag){
//not in the loop for real time acqusition yet,
//in the real time acquisition loop, processing thread will wait for a post each time
sem_init(&sem_newRTAcquisition,1,0);
//in the real time acquistion loop, main thread will wait for processing thread to be done each time (which in turn waits for receiver/ext process)
sem_init(&sem_endRTAcquisition,1,0);
bool receiver = (setReceiverOnline()==ONLINE_FLAG);
@ -351,6 +353,11 @@ int slsDetectorUtils::acquire(int delflag){
else{
if (stopReceiver() == FAIL)
*stoppedFlag = 1;
else {
if (*threadedProcessing && dataReady) // threaded processing
sem_wait(&sem_endRTAcquisition); // waits for receiver's external process to be done sending data to gui
}
// cout<<"***********receiver stopped"<<endl;
}
pthread_mutex_unlock(&mg);//cout << "unlock"<< endl;
@ -504,13 +511,15 @@ int slsDetectorUtils::acquire(int delflag){
cout << "acquisition finished callback done " << endl;
#endif
setAcquiringFlag(false);
sem_destroy(&sem_newRTAcquisition);
sem_destroy(&sem_endRTAcquisition);
#ifdef VERBOSE
clock_gettime(CLOCK_REALTIME, &end);
cout << "Elapsed time for acquisition:" << (( end.tv_sec - begin.tv_sec ) + ( end.tv_nsec - begin.tv_nsec ) / 1000000000.0) << " seconds" << endl;
#endif
setAcquiringFlag(false);
return OK;
}