From 6faf3621d5e2fd321ebb67322a45bea51fdeb2c8 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Thu, 14 Nov 2013 12:35:36 +0000
Subject: [PATCH] gui progress of receiver should be of frame index and not
 frames caught

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@690 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp  | 11 +++++++----
 .../slsDetectorAnalysis/postProcessing.cpp            |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
index 484b12289..d9cb92134 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
@@ -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);
 	  }
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index d19976242..f01713217 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -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;