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

get progress when acquisition is over to show 100 percent

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@363 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-30 09:51:05 +00:00
parent 6b935f3bd2
commit e490f437a2
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -20,6 +20,8 @@ slsDetectorUtils::slsDetectorUtils() {
acqFinished_p=NULL; acqFinished_p=NULL;
measurement_finished=NULL; measurement_finished=NULL;
measFinished_p=NULL; measFinished_p=NULL;
progress_call=0;
pProgressCallArg=0;
registerGetPositionCallback(&defaultGetPosition, NULL); registerGetPositionCallback(&defaultGetPosition, NULL);
registerConnectChannelsCallback(&defaultConnectChannels,NULL); registerConnectChannelsCallback(&defaultConnectChannels,NULL);
registerDisconnectChannelsCallback(&defaultDisconnectChannels,NULL); registerDisconnectChannelsCallback(&defaultDisconnectChannels,NULL);
@ -431,6 +433,10 @@ void slsDetectorUtils::acquire(int delflag){
} }
if(progress_call)
progress_call(getCurrentProgress(),pProgressCallArg);
if (connectChannels) { if (connectChannels) {
if (disconnect_channels) if (disconnect_channels)
disconnect_channels(DCarg); disconnect_channels(DCarg);

4
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -545,7 +545,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
void registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){acquisition_finished=func; acqFinished_p=pArg;}; void registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){acquisition_finished=func; acqFinished_p=pArg;};
void registerMeasurementFinishedCallback(int( *func)(int,int, void*), void *pArg){measurement_finished=func; measFinished_p=pArg;}; void registerMeasurementFinishedCallback(int( *func)(int,int, void*), void *pArg){measurement_finished=func; measFinished_p=pArg;};
void registerProgressCallback(int( *func)(double,void*), void *pArg){progress_call=func; pProgressCallArg=pArg;};
/** /**
@ -671,6 +671,8 @@ virtual int exitReceiver()=0;
int (*measurement_finished)(int,int,void*); int (*measurement_finished)(int,int,void*);
void *acqFinished_p, *measFinished_p; void *acqFinished_p, *measFinished_p;
int (*progress_call)(double,void*);
void *pProgressCallArg;
}; };

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -37,8 +37,6 @@ postProcessing::postProcessing(): expTime(NULL), ang(NULL), val(NULL), err(NULL)
rawDataReady = 0; rawDataReady = 0;
pRawDataArg = 0; pRawDataArg = 0;
progress_call=0;
pProgressCallArg=0;
#ifdef VERBOSE #ifdef VERBOSE
registerDataCallback(&defaultDataReadyFunc, NULL); registerDataCallback(&defaultDataReadyFunc, NULL);
#endif #endif
@ -407,8 +405,6 @@ void* postProcessing::processData(int delflag) {
else newData=false; else newData=false;
prevCaught=caught; prevCaught=caught;
if (checkJoinThread()) break; if (checkJoinThread()) break;
//if(progress_call)
// progress_call(getCurrentProgress(),pProgressCallArg);
if(newData){ if(newData){
pthread_mutex_lock(&mg); pthread_mutex_lock(&mg);
int* receiverData = readFrameFromReceiver(currentfName,currentfIndex); int* receiverData = readFrameFromReceiver(currentfName,currentfIndex);

5
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -240,8 +240,6 @@ s
void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;}; void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
void registerProgressCallback(int( *func)(double,void*), void *pArg){progress_call=func; pProgressCallArg=pArg;};
virtual double getRateCorrectionTau()=0; virtual double getRateCorrectionTau()=0;
@ -334,9 +332,6 @@ s
int (*rawDataReady)(double*,int,void*); int (*rawDataReady)(double*,int,void*);
void *pRawDataArg; void *pRawDataArg;
int (*progress_call)(double,void*);
void *pProgressCallArg;
postProcessingFuncs *ppFun; postProcessingFuncs *ppFun;
detectorData *thisData; detectorData *thisData;