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

gui progress of receiver should be of frame index and not frames caught

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@690 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-11-14 12:35:36 +00:00
parent 15f8ba344b
commit 6faf3621d5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -262,12 +262,14 @@ void slsDetectorUtils::acquire(int delflag){
setFileName(fileIO::getFileName());
if(setReceiverOnline()==OFFLINE_FLAG){
stopReceiver();
*stoppedFlag=1;
pthread_mutex_unlock(&mg);
break;
}
//start receiver
if((startReceiver() == FAIL) || (setReceiverOnline()==OFFLINE_FLAG)){
if(startReceiver() == FAIL) {
stopReceiver();
*stoppedFlag=1;
pthread_mutex_unlock(&mg);
break;
}
@ -275,12 +277,12 @@ void slsDetectorUtils::acquire(int delflag){
}
#ifdef VERBOSE
cout << "Acquiring " << endl;
#endif
#endif
startAndReadAll();
#ifdef VERBOSE
cout << "finished " << endl;
cout << "returned! " << endl;
#endif
#endif
@ -333,13 +335,14 @@ void slsDetectorUtils::acquire(int delflag){
pthread_mutex_unlock(&mg);
}else{
pthread_mutex_lock(&mg);
cout<<"going to start transmit"<<endl;
if(startReceiverReadout() == TRANSMITTING){
while(getReceiverStatus() != RUN_FINISHED){
pthread_mutex_unlock(&mg);
usleep(50000);
pthread_mutex_lock(&mg);
}
}
}cout<<"going to stop receiver"<<endl;
stopReceiver();
pthread_mutex_unlock(&mg);
}

7
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -452,11 +452,14 @@ void* postProcessing::processData(int delflag) {
//get progress
pthread_mutex_lock(&mg);
if(setReceiverOnline()==ONLINE_FLAG)
prog=getFramesCaughtByReceiver();//caught=getReceiverCurrentFrameIndex();
prog=getReceiverCurrentFrameIndex();//getFramesCaughtByReceiver();//caught=getReceiverCurrentFrameIndex();
pthread_mutex_unlock(&mg);
if(setReceiverOnline()==OFFLINE_FLAG)
prog=prevCaught;
setCurrentProgress(prog);
if(prevCaught == -1)
setCurrentProgress(0);
else
setCurrentProgress(prog);
if (checkJoinThread()) break;